diff options
| author |   djm <djm@openbsd.org> | 2007-09-21 08:15:29 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2007-09-21 08:15:29 +0000 |
| commit | 6841e1865f0aedf6c4e2187909f9643d0d0e7be8 (patch) | |
| tree | be55a67af25255d0a6cf00fdeb4789ce88bc129d /usr.bin/ssh/auth.c | |
| parent | fix indenting (diff) | |
| download | wireguard-openbsd-6841e1865f0aedf6c4e2187909f9643d0d0e7be8.tar.xz wireguard-openbsd-6841e1865f0aedf6c4e2187909f9643d0d0e7be8.zip | |
unifdef -DBSD_AUTH
unifdef -USKEY
These options have been in use for some years;
ok markus@ "no objection" millert@
Diffstat (limited to 'usr.bin/ssh/auth.c')
| -rw-r--r-- | usr.bin/ssh/auth.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/usr.bin/ssh/auth.c b/usr.bin/ssh/auth.c index a2c28324e98..afa4209edf2 100644 --- a/usr.bin/ssh/auth.c +++ b/usr.bin/ssh/auth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: auth.c,v 1.77 2007/08/23 02:55:51 djm Exp $ */ +/* $OpenBSD: auth.c,v 1.78 2007/09/21 08:15:29 djm Exp $ */ /* * Copyright (c) 2000 Markus Friedl. All rights reserved. * @@ -383,9 +383,7 @@ struct passwd * getpwnamallow(const char *user) { extern login_cap_t *lc; -#ifdef BSD_AUTH auth_session_t *as; -#endif struct passwd *pw; parse_server_match_config(&options, user, @@ -403,7 +401,6 @@ getpwnamallow(const char *user) debug("unable to get login class: %s", user); return (NULL); } -#ifdef BSD_AUTH if ((as = auth_open()) == NULL || auth_setpwd(as, pw) != 0 || auth_approval(as, lc, pw->pw_name, "ssh") <= 0) { debug("Approval failure for %s", user); @@ -411,7 +408,6 @@ getpwnamallow(const char *user) } if (as != NULL) auth_close(as); -#endif if (pw != NULL) return (pwcopy(pw)); return (NULL); |