- (djm) Disable PAM kbd-int auth if privsep is turned on (it doesn't work)

diff --git a/ChangeLog b/ChangeLog
index 0f42a58f77c3f88fda27ddc977e90e4b988e1e29..901185df6cfb2b1f398b77563d912797e1a18dcd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+20020508
+ - (djm) Disable PAM kbd-int auth if privsep is turned on (it doesn't work)
+
 20020507
  - (tim) [openbsd-compat/bsd-arc4random.c] fix logic on when seed_rng() is
    called. Report by Chris Maxwell <maxwell@cs.dal.ca>

diff --git a/auth2.c b/auth2.c
index 4c18d232d9c5ffe7e1138364392cc4ebe3014769..61fd0a738e8afc24dd9d3a05aef820a79b0a0956 100644 (file)
--- a/auth2.c
+++ b/auth2.c
@@ -121,6 +121,8 @@ do_authentication2(void)
                options.kbd_interactive_authentication = 1;
        if (options.pam_authentication_via_kbd_int)
                options.kbd_interactive_authentication = 1;
+       if (use_privsep)
+               options.pam_authentication_via_kbd_int = 0;
 
        dispatch_init(&dispatch_protocol_error);
        dispatch_set(SSH2_MSG_SERVICE_REQUEST, &input_service_request);