diff options
author | Damien Miller <djm@mindrot.org> | 2003-11-18 22:01:25 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2003-11-18 22:01:25 +1100 |
commit | 4bb1dd3166c2a04394e9ec55fdff6bf6ad667e39 (patch) | |
tree | 53df6882176d3a3f964348a7d5db003e6cce49d2 | |
parent | 8a1624c42df87c0dc0cad75f45bbb9eb34fcd59a (diff) |
- (djm) OpenBSD CVS Sync
- dtucker@cvs.openbsd.org 2003/11/18 00:40:05
[serverloop.c]
Correct check for authctxt->valid. ok djm@
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | serverloop.c | 4 |
2 files changed, 9 insertions, 5 deletions
@@ -2,9 +2,13 @@ | |||
2 | - (djm) Fix early exit for root auth success when UsePAM=yes and | 2 | - (djm) Fix early exit for root auth success when UsePAM=yes and |
3 | PermitRootLogin=no | 3 | PermitRootLogin=no |
4 | - (dtucker) [auth-pam.c] Convert chauthtok_conv into a generic tty_conv, | 4 | - (dtucker) [auth-pam.c] Convert chauthtok_conv into a generic tty_conv, |
5 | and use it for do_pam_session. Fixes problems like pam_motd not displaying | 5 | and use it for do_pam_session. Fixes problems like pam_motd not |
6 | anything. ok djm@ | 6 | displaying anything. ok djm@ |
7 | - (dtucker) [auth-pam.c] Only use pam_putenv if our platform has it. ok djm@ | 7 | - (dtucker) [auth-pam.c] Only use pam_putenv if our platform has it. ok djm@ |
8 | - (djm) OpenBSD CVS Sync | ||
9 | - dtucker@cvs.openbsd.org 2003/11/18 00:40:05 | ||
10 | [serverloop.c] | ||
11 | Correct check for authctxt->valid. ok djm@ | ||
8 | 12 | ||
9 | 20031117 | 13 | 20031117 |
10 | - (djm) OpenBSD CVS Sync | 14 | - (djm) OpenBSD CVS Sync |
@@ -1480,4 +1484,4 @@ | |||
1480 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 1484 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
1481 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 1485 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
1482 | 1486 | ||
1483 | $Id: ChangeLog,v 1.3115 2003/11/18 01:45:35 dtucker Exp $ | 1487 | $Id: ChangeLog,v 1.3116 2003/11/18 11:01:25 djm Exp $ |
diff --git a/serverloop.c b/serverloop.c index 98793b756..20255aaee 100644 --- a/serverloop.c +++ b/serverloop.c | |||
@@ -35,7 +35,7 @@ | |||
35 | */ | 35 | */ |
36 | 36 | ||
37 | #include "includes.h" | 37 | #include "includes.h" |
38 | RCSID("$OpenBSD: serverloop.c,v 1.112 2003/11/04 08:54:09 djm Exp $"); | 38 | RCSID("$OpenBSD: serverloop.c,v 1.113 2003/11/18 00:40:05 dtucker Exp $"); |
39 | 39 | ||
40 | #include "xmalloc.h" | 40 | #include "xmalloc.h" |
41 | #include "packet.h" | 41 | #include "packet.h" |
@@ -973,7 +973,7 @@ server_input_global_request(int type, u_int32_t seq, void *ctxt) | |||
973 | u_short listen_port; | 973 | u_short listen_port; |
974 | 974 | ||
975 | pw = the_authctxt->pw; | 975 | pw = the_authctxt->pw; |
976 | if (pw == NULL || !the_authctxt->pw) | 976 | if (pw == NULL || !the_authctxt->valid) |
977 | fatal("server_input_global_request: no/invalid user"); | 977 | fatal("server_input_global_request: no/invalid user"); |
978 | listen_address = packet_get_string(NULL); | 978 | listen_address = packet_get_string(NULL); |
979 | listen_port = (u_short)packet_get_int(); | 979 | listen_port = (u_short)packet_get_int(); |