From: djm <djm>
Date: Thu, 9 May 2002 05:59:13 +0000 (+0000)
Subject:  - (djm) Disable PAM kbd-int auth if privsep is turned on (it doesn't work)
X-Git-Tag: V_3_2_2_P1~39
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/fea8a8e8252c1c204e868d0371cb676c5c4bf3d0

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

diff --git a/ChangeLog b/ChangeLog
index 0f42a58f..901185df 100644
--- 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 4c18d232..61fd0a73 100644
--- 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);