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 @@ | |||
51 | - markus@cvs.openbsd.org 2003/02/06 09:29:18 | 51 | - markus@cvs.openbsd.org 2003/02/06 09:29:18 |
52 | [sftp-server.c] | 52 | [sftp-server.c] |
53 | fix races in rename/symlink; from Tony Finch; ok djm@ | 53 | fix races in rename/symlink; from Tony Finch; ok djm@ |
54 | - markus@cvs.openbsd.org 2003/02/06 21:22:43 | ||
55 | [auth1.c auth2.c] | ||
56 | undo broken fix for #387, fixes #486 | ||
54 | 57 | ||
55 | 20030211 | 58 | 20030211 |
56 | - (djm) Cygwin needs libcrypt too. Patch from vinschen@redhat.com | 59 | - (djm) Cygwin needs libcrypt too. Patch from vinschen@redhat.com |
@@ -1151,4 +1154,4 @@ | |||
1151 | save auth method before monitor_reset_key_state(); bugzilla bug #284; | 1154 | save auth method before monitor_reset_key_state(); bugzilla bug #284; |
1152 | ok provos@ | 1155 | ok provos@ |
1153 | 1156 | ||
1154 | $Id: ChangeLog,v 1.2607 2003/02/24 00:58:44 djm Exp $ | 1157 | $Id: ChangeLog,v 1.2608 2003/02/24 00:59:26 djm Exp $ |
@@ -10,7 +10,7 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include "includes.h" | 12 | #include "includes.h" |
13 | RCSID("$OpenBSD: auth1.c,v 1.46 2003/01/23 00:03:00 djm Exp $"); | 13 | RCSID("$OpenBSD: auth1.c,v 1.47 2003/02/06 21:22:42 markus Exp $"); |
14 | 14 | ||
15 | #include "xmalloc.h" | 15 | #include "xmalloc.h" |
16 | #include "rsa.h" | 16 | #include "rsa.h" |
@@ -328,8 +328,7 @@ do_authloop(Authctxt *authctxt) | |||
328 | } | 328 | } |
329 | #else | 329 | #else |
330 | /* Special handling for root */ | 330 | /* Special handling for root */ |
331 | if (!use_privsep && | 331 | if (authenticated && authctxt->pw->pw_uid == 0 && |
332 | authenticated && authctxt->pw->pw_uid == 0 && | ||
333 | !auth_root_allowed(get_authname(type))) | 332 | !auth_root_allowed(get_authname(type))) |
334 | authenticated = 0; | 333 | authenticated = 0; |
335 | #endif | 334 | #endif |
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: auth2.c,v 1.95 2002/08/22 21:33:58 markus Exp $"); | 26 | RCSID("$OpenBSD: auth2.c,v 1.96 2003/02/06 21:22:43 markus Exp $"); |
27 | 27 | ||
28 | #include "ssh2.h" | 28 | #include "ssh2.h" |
29 | #include "xmalloc.h" | 29 | #include "xmalloc.h" |
@@ -205,8 +205,7 @@ userauth_finish(Authctxt *authctxt, int authenticated, char *method) | |||
205 | authctxt->user); | 205 | authctxt->user); |
206 | 206 | ||
207 | /* Special handling for root */ | 207 | /* Special handling for root */ |
208 | if (!use_privsep && | 208 | if (authenticated && authctxt->pw->pw_uid == 0 && |
209 | authenticated && authctxt->pw->pw_uid == 0 && | ||
210 | !auth_root_allowed(method)) | 209 | !auth_root_allowed(method)) |
211 | authenticated = 0; | 210 | authenticated = 0; |
212 | 211 | ||