summaryrefslogtreecommitdiff
path: root/usr.bin/login
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1996-09-18 20:39:07 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1996-09-18 20:39:07 +0000
commita9489992f2541f0d53c2261a52249ed5984b9b0d (patch)
tree46771076398dc461329a11457790298830d97e5f /usr.bin/login
parent4c0b10a8ffef6ebdf1fe4653558f6ac96175130c (diff)
block info gathering attack; netbsd pr#2768; daw@panix.com
Diffstat (limited to 'usr.bin/login')
-rw-r--r--usr.bin/login/login.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/usr.bin/login/login.c b/usr.bin/login/login.c
index 3740bd9d6f4..21f527a5ec3 100644
--- a/usr.bin/login/login.c
+++ b/usr.bin/login/login.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: login.c,v 1.6 1996/07/31 12:21:43 deraadt Exp $ */
+/* $OpenBSD: login.c,v 1.7 1996/09/18 20:39:06 deraadt Exp $ */
/* $NetBSD: login.c,v 1.13 1996/05/15 23:50:16 jtc Exp $ */
/*-
@@ -44,7 +44,7 @@ static char copyright[] =
#if 0
static char sccsid[] = "@(#)login.c 8.4 (Berkeley) 4/2/94";
#endif
-static char rcsid[] = "$OpenBSD: login.c,v 1.6 1996/07/31 12:21:43 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: login.c,v 1.7 1996/09/18 20:39:06 deraadt Exp $";
#endif /* not lint */
/*
@@ -479,12 +479,9 @@ pwcheck(user, p, salt, passwd)
{
#ifdef SKEY
if (strcasecmp(p, "s/key") == 0) {
- if (skey_haskey(user)) {
- fprintf(stderr, "You have no s/key. ");
+ if (skey_haskey(user))
return 1;
- } else {
- return skey_authenticate(user);
- }
+ return skey_authenticate(user);
}
#endif
return strcmp(crypt(p, salt), passwd);