]> granicus.if.org Git - sudo/commitdiff
move pam_conv to be static to auth function
authorTodd C. Miller <Todd.Miller@courtesan.com>
Sun, 20 Sep 1998 23:12:21 +0000 (23:12 +0000)
committerTodd C. Miller <Todd.Miller@courtesan.com>
Sun, 20 Sep 1998 23:12:21 +0000 (23:12 +0000)
remove pam_misc.h (solaris doesn't have one)

check.c

diff --git a/check.c b/check.c
index 883d00ec24238086ff4b770336f40a782c00c22a..9a23d356f084c550ec2a9ba5ddfd024fe1b2094b 100644 (file)
--- a/check.c
+++ b/check.c
@@ -80,7 +80,6 @@ static char rcsid[] = "$Id$";
 #endif /* HAVE_KERB4 */
 #ifdef HAVE_PAM
 #  include <security/pam_appl.h>
-#  include <security/pam_misc.h>
 #endif /* HAVE_PAM */
 #ifdef HAVE_AFS
 #  include <afs/stds.h>
@@ -139,12 +138,6 @@ union config_record configure;
 #ifdef HAVE_SKEY
 struct skey skey;
 #endif
-#ifdef HAVE_PAM
-static struct pam_conv conv = {
-       misc_conv,
-       NULL
-};
-#endif
 #ifdef HAVE_OPIE
 struct opie opie;
 #endif
@@ -745,6 +738,10 @@ static void pam_attempt_auth()
     pam_handle_t *pamh=NULL;
     int retval;
     register int counter = TRIES_FOR_PASSWORD;
+    struct pam_conv conv = {
+           misc_conv,
+           NULL
+    };
 
     set_perms(PERM_ROOT, 0);
     retval = pam_start("sudo", user_name, &conv, &pamh);