[patch] proposed patch for auth2-chall.c

openssh.patch (text/plain), 679 bytes, created by Ulrich Müller on 2004-09-26 08:48:54 UTC

--- auth2-chall.c~	2004-06-15 02:28:25.000000000 +0200
+++ auth2-chall.c	2004-09-26 17:35:21.502489043 +0200
@@ -32,6 +32,10 @@
 #include "xmalloc.h"
 #include "dispatch.h"
 #include "log.h"
+#include "servconf.h"
+
+/* import */
+extern ServerOptions options;
 
 static int auth2_challenge_start(Authctxt *);
 static int send_userauth_info_request(Authctxt *);
@@ -82,6 +86,11 @@
 	if (strcmp(devs, "") == 0) {
 		buffer_init(&b);
 		for (i = 0; devices[i]; i++) {
+#ifdef USE_PAM
+			if (!options.use_pam &&
+			    strcmp(devices[i]->name, "pam") == 0)
+				continue;
+#endif
 			if (buffer_len(&b) > 0)
 				buffer_append(&b, ",", 1);
 			buffer_append(&b, devices[i]->name,