- (stevesk) [auth-pam.c] cast to avoid initialization type mismatch

   warning on pam_conv struct conversation function.

diff --git a/ChangeLog b/ChangeLog
index b69c350e618421f49c9da089dc37b6ea9c4a68ec..20254e4c466beedf7d13ebde101e88fec049011a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
    openssh-3.4p1-owl-password-changing.diff
  - (stevesk) [auth-pam.c] merge rest of solar's PAM patch;
    PAM_NEW_AUTHTOK_REQD remains in #if 0 for now.
+ - (stevesk) [auth-pam.c] cast to avoid initialization type mismatch
+   warning on pam_conv struct conversation function.
 
 20020720
  - (stevesk) [ssh-keygen.c] bug #231: always init/seed_rng().

diff --git a/auth-pam.c b/auth-pam.c
index f18309299c69589aa33647b216b2b36e0a709212..708d0ae9a903d89329ce8eca15479daafc9a9134 100644 (file)
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -51,7 +51,7 @@ static int do_pam_conversation(int num_msg, const struct pam_message **msg,
 
 /* module-local variables */
 static struct pam_conv conv = {
-       do_pam_conversation,
+       (int (*)())do_pam_conversation,
        NULL
 };
 static char *__pam_msg = NULL;