summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--auth-pam.c4
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 440aa914..2847b0bd 100644
--- 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().
@@ -1403,4 +1405,4 @@
- (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@
-$Id: ChangeLog,v 1.2382 2002/07/21 17:57:01 stevesk Exp $
+$Id: ChangeLog,v 1.2383 2002/07/21 22:49:47 stevesk Exp $
diff --git a/auth-pam.c b/auth-pam.c
index 22807f1a..48d5afa0 100644
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -39,7 +39,7 @@ extern char *__progname;
extern int use_privsep;
-RCSID("$Id: auth-pam.c,v 1.49 2002/07/21 17:57:01 stevesk Exp $");
+RCSID("$Id: auth-pam.c,v 1.50 2002/07/21 22:49:47 stevesk Exp $");
#define NEW_AUTHTOK_MSG \
"Warning: Your password has expired, please change it now."
@@ -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;