diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | monitor.c | 2 |
2 files changed, 6 insertions, 2 deletions
@@ -1,4 +1,8 @@ | |||
1 | 20031117 | 1 | 20031117 |
2 | - (djm) Fix early exit for root auth success when UsePAM=yes and | ||
3 | PermitRootLogin=no | ||
4 | |||
5 | 20031117 | ||
2 | - (djm) OpenBSD CVS Sync | 6 | - (djm) OpenBSD CVS Sync |
3 | - djm@cvs.openbsd.org 2003/11/03 09:03:37 | 7 | - djm@cvs.openbsd.org 2003/11/03 09:03:37 |
4 | [auth-chall.c] | 8 | [auth-chall.c] |
@@ -1472,4 +1476,4 @@ | |||
1472 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 1476 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
1473 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 1477 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
1474 | 1478 | ||
1475 | $Id: ChangeLog,v 1.3112 2003/11/17 11:18:21 djm Exp $ | 1479 | $Id: ChangeLog,v 1.3113 2003/11/17 23:45:20 djm Exp $ |
@@ -309,7 +309,7 @@ monitor_child_preauth(Authctxt *_authctxt, struct monitor *pmonitor) | |||
309 | authenticated = 0; | 309 | authenticated = 0; |
310 | #ifdef USE_PAM | 310 | #ifdef USE_PAM |
311 | /* PAM needs to perform account checks after auth */ | 311 | /* PAM needs to perform account checks after auth */ |
312 | if (options.use_pam) { | 312 | if (options.use_pam && authenticated) { |
313 | Buffer m; | 313 | Buffer m; |
314 | 314 | ||
315 | buffer_init(&m); | 315 | buffer_init(&m); |