summaryrefslogtreecommitdiff
path: root/auth2.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-02-24 11:59:26 +1100
committerDamien Miller <djm@mindrot.org>2003-02-24 11:59:26 +1100
commit556f9315a538c9575c2fcaf2a3ca4d9c068ade78 (patch)
treea048da1fb32d11a76eaa48ec381432ea9c08f733 /auth2.c
parent9e51a73122fdb06c14068017d8f2a04179bf6bf6 (diff)
- markus@cvs.openbsd.org 2003/02/06 21:22:43
[auth1.c auth2.c] undo broken fix for #387, fixes #486
Diffstat (limited to 'auth2.c')
-rw-r--r--auth2.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/auth2.c b/auth2.c
index 17c58552a..1b21eb2da 100644
--- a/auth2.c
+++ b/auth2.c
@@ -23,7 +23,7 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: auth2.c,v 1.95 2002/08/22 21:33:58 markus Exp $"); 26RCSID("$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