summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--auth1.c5
-rw-r--r--auth2.c5
3 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 1c00c95ca..07699b017 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,10 @@
23 - stevesk@cvs.openbsd.org 2002/08/22 20:57:19 23 - stevesk@cvs.openbsd.org 2002/08/22 20:57:19
24 [ssh-agent.c] 24 [ssh-agent.c]
25 shutdown(SHUT_RDWR) not needed before close here; ok markus@ 25 shutdown(SHUT_RDWR) not needed before close here; ok markus@
26 - markus@cvs.openbsd.org 2002/08/22 21:33:58
27 [auth1.c auth2.c]
28 auth_root_allowed() is handled by the monitor in the privsep case,
29 so skip this for use_privsep, ok stevesk@, fixes bugzilla #387/325
26 30
2720020820 3120020820
28 - OpenBSD CVS Sync 32 - OpenBSD CVS Sync
@@ -1564,4 +1568,4 @@
1564 - (stevesk) entropy.c: typo in debug message 1568 - (stevesk) entropy.c: typo in debug message
1565 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 1569 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
1566 1570
1567$Id: ChangeLog,v 1.2433 2002/09/04 06:33:31 djm Exp $ 1571$Id: ChangeLog,v 1.2434 2002/09/04 06:37:26 djm Exp $
diff --git a/auth1.c b/auth1.c
index 769fa306f..17342a658 100644
--- a/auth1.c
+++ b/auth1.c
@@ -10,7 +10,7 @@
10 */ 10 */
11 11
12#include "includes.h" 12#include "includes.h"
13RCSID("$OpenBSD: auth1.c,v 1.41 2002/06/19 00:27:55 deraadt Exp $"); 13RCSID("$OpenBSD: auth1.c,v 1.42 2002/08/22 21:33:58 markus Exp $");
14 14
15#include "xmalloc.h" 15#include "xmalloc.h"
16#include "rsa.h" 16#include "rsa.h"
@@ -301,7 +301,8 @@ do_authloop(Authctxt *authctxt)
301 } 301 }
302#else 302#else
303 /* Special handling for root */ 303 /* Special handling for root */
304 if (authenticated && authctxt->pw->pw_uid == 0 && 304 if (!use_privsep &&
305 authenticated && authctxt->pw->pw_uid == 0 &&
305 !auth_root_allowed(get_authname(type))) 306 !auth_root_allowed(get_authname(type)))
306 authenticated = 0; 307 authenticated = 0;
307#endif 308#endif
diff --git a/auth2.c b/auth2.c
index 3b47a6d0a..1cb9769ff 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.94 2002/06/30 21:54:16 deraadt Exp $"); 26RCSID("$OpenBSD: auth2.c,v 1.95 2002/08/22 21:33:58 markus Exp $");
27 27
28#include "ssh2.h" 28#include "ssh2.h"
29#include "xmalloc.h" 29#include "xmalloc.h"
@@ -205,7 +205,8 @@ 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 (authenticated && authctxt->pw->pw_uid == 0 && 208 if (!use_privsep &&
209 authenticated && authctxt->pw->pw_uid == 0 &&
209 !auth_root_allowed(method)) 210 !auth_root_allowed(method))
210 authenticated = 0; 211 authenticated = 0;
211 212