diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2001-03-19 17:07:24 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2001-03-19 17:07:24 +0000 |
| commit | ecf0cec69754e18c0909500203659818708677ff (patch) | |
| tree | 63e36ffc760c8a18e5432700394c9e549a47b71b /usr.bin/ssh/auth.c | |
| parent | 44c39f2da9d4b48e6352928a840a495de903f629 (diff) | |
undo /etc/shell and proto 2,1 change for openssh-2.5.2
Diffstat (limited to 'usr.bin/ssh/auth.c')
| -rw-r--r-- | usr.bin/ssh/auth.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/usr.bin/ssh/auth.c b/usr.bin/ssh/auth.c index df193f0760e..75cd5ca1088 100644 --- a/usr.bin/ssh/auth.c +++ b/usr.bin/ssh/auth.c @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth.c,v 1.20 2001/03/17 17:27:59 markus Exp $"); +RCSID("$OpenBSD: auth.c,v 1.21 2001/03/19 17:07:23 markus Exp $"); #include "xmalloc.h" #include "match.h" @@ -50,7 +50,7 @@ int allowed_user(struct passwd * pw) { struct stat st; - char *shell, *cp; + char *shell; int i; /* Shouldn't be called if pw is NULL, but better safe than sorry... */ @@ -63,15 +63,6 @@ allowed_user(struct passwd * pw) */ shell = (pw->pw_shell[0] == '\0') ? _PATH_BSHELL : pw->pw_shell; - /* disallow anyone who does not have a standard shell */ - setusershell(); - while ((cp = getusershell()) != NULL) - if (strcmp(cp, shell) == 0) - break; - endusershell(); - if (cp == NULL) - return 0; - /* deny if shell does not exists or is not executable */ if (stat(shell, &st) != 0) return 0; |