summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2002-05-09 15:59:13 +1000
committerDamien Miller <djm@mindrot.org>2002-05-09 15:59:13 +1000
commitffc868ff836100ad41fe18a0e48e2705a211c417 (patch)
treedb88d0dfd5de5868f367e36a126a9d40461992b8
parent0502a471e02b1b6e8ec5b0134766b28694b760a8 (diff)
- (djm) Disable PAM kbd-int auth if privsep is turned on (it doesn't work)
-rw-r--r--ChangeLog5
-rw-r--r--auth2.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d71072f3f..48ef2d2e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
120020508
2 - (djm) Disable PAM kbd-int auth if privsep is turned on (it doesn't work)
3
120020507 420020507
2 - (tim) [openbsd-compat/bsd-arc4random.c] fix logic on when seed_rng() is 5 - (tim) [openbsd-compat/bsd-arc4random.c] fix logic on when seed_rng() is
3 called. Report by Chris Maxwell <maxwell@cs.dal.ca> 6 called. Report by Chris Maxwell <maxwell@cs.dal.ca>
@@ -544,4 +547,4 @@
544 - (stevesk) entropy.c: typo in debug message 547 - (stevesk) entropy.c: typo in debug message
545 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 548 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
546 549
547$Id: ChangeLog,v 1.2098 2002/05/08 23:04:14 tim Exp $ 550$Id: ChangeLog,v 1.2099 2002/05/09 05:59:13 djm Exp $
diff --git a/auth2.c b/auth2.c
index 4c18d232d..61fd0a738 100644
--- a/auth2.c
+++ b/auth2.c
@@ -121,6 +121,8 @@ do_authentication2(void)
121 options.kbd_interactive_authentication = 1; 121 options.kbd_interactive_authentication = 1;
122 if (options.pam_authentication_via_kbd_int) 122 if (options.pam_authentication_via_kbd_int)
123 options.kbd_interactive_authentication = 1; 123 options.kbd_interactive_authentication = 1;
124 if (use_privsep)
125 options.pam_authentication_via_kbd_int = 0;
124 126
125 dispatch_init(&dispatch_protocol_error); 127 dispatch_init(&dispatch_protocol_error);
126 dispatch_set(SSH2_MSG_SERVICE_REQUEST, &input_service_request); 128 dispatch_set(SSH2_MSG_SERVICE_REQUEST, &input_service_request);