diff options
author | Damien Miller <djm@mindrot.org> | 2003-02-24 11:59:26 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2003-02-24 11:59:26 +1100 |
commit | 556f9315a538c9575c2fcaf2a3ca4d9c068ade78 (patch) | |
tree | a048da1fb32d11a76eaa48ec381432ea9c08f733 | |
parent | 9e51a73122fdb06c14068017d8f2a04179bf6bf6 (diff) |
- markus@cvs.openbsd.org 2003/02/06 21:22:43
[auth1.c auth2.c]
undo broken fix for #387, fixes #486
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | auth1.c | 5 | ||||
-rw-r--r-- | auth2.c | 5 |
3 files changed, 8 insertions, 7 deletions
@@ -51,6 +51,9 @@ - markus@cvs.openbsd.org 2003/02/06 09:29:18 [sftp-server.c] fix races in rename/symlink; from Tony Finch; ok djm@ + - markus@cvs.openbsd.org 2003/02/06 21:22:43 + [auth1.c auth2.c] + undo broken fix for #387, fixes #486 20030211 - (djm) Cygwin needs libcrypt too. Patch from vinschen@redhat.com @@ -1151,4 +1154,4 @@ save auth method before monitor_reset_key_state(); bugzilla bug #284; ok provos@ -$Id: ChangeLog,v 1.2607 2003/02/24 00:58:44 djm Exp $ +$Id: ChangeLog,v 1.2608 2003/02/24 00:59:26 djm Exp $ @@ -10,7 +10,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth1.c,v 1.46 2003/01/23 00:03:00 djm Exp $"); +RCSID("$OpenBSD: auth1.c,v 1.47 2003/02/06 21:22:42 markus Exp $"); #include "xmalloc.h" #include "rsa.h" @@ -328,8 +328,7 @@ do_authloop(Authctxt *authctxt) } #else /* Special handling for root */ - if (!use_privsep && - authenticated && authctxt->pw->pw_uid == 0 && + if (authenticated && authctxt->pw->pw_uid == 0 && !auth_root_allowed(get_authname(type))) authenticated = 0; #endif @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth2.c,v 1.95 2002/08/22 21:33:58 markus Exp $"); +RCSID("$OpenBSD: auth2.c,v 1.96 2003/02/06 21:22:43 markus Exp $"); #include "ssh2.h" #include "xmalloc.h" @@ -205,8 +205,7 @@ userauth_finish(Authctxt *authctxt, int authenticated, char *method) authctxt->user); /* Special handling for root */ - if (!use_privsep && - authenticated && authctxt->pw->pw_uid == 0 && + if (authenticated && authctxt->pw->pw_uid == 0 && !auth_root_allowed(method)) authenticated = 0; |