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 440aa914f..2847b0bd0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
3 openssh-3.4p1-owl-password-changing.diff 3 openssh-3.4p1-owl-password-changing.diff
4 - (stevesk) [auth-pam.c] merge rest of solar's PAM patch; 4 - (stevesk) [auth-pam.c] merge rest of solar's PAM patch;
5 PAM_NEW_AUTHTOK_REQD remains in #if 0 for now. 5 PAM_NEW_AUTHTOK_REQD remains in #if 0 for now.
6 - (stevesk) [auth-pam.c] cast to avoid initialization type mismatch
7 warning on pam_conv struct conversation function.
6 8
720020720 920020720
8 - (stevesk) [ssh-keygen.c] bug #231: always init/seed_rng(). 10 - (stevesk) [ssh-keygen.c] bug #231: always init/seed_rng().
@@ -1403,4 +1405,4 @@
1403 - (stevesk) entropy.c: typo in debug message 1405 - (stevesk) entropy.c: typo in debug message
1404 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 1406 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
1405 1407
1406$Id: ChangeLog,v 1.2382 2002/07/21 17:57:01 stevesk Exp $ 1408$Id: ChangeLog,v 1.2383 2002/07/21 22:49:47 stevesk Exp $
diff --git a/auth-pam.c b/auth-pam.c
index 22807f1a9..48d5afa0f 100644
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -39,7 +39,7 @@ extern char *__progname;
39 39
40extern int use_privsep; 40extern int use_privsep;
41 41
42RCSID("$Id: auth-pam.c,v 1.49 2002/07/21 17:57:01 stevesk Exp $"); 42RCSID("$Id: auth-pam.c,v 1.50 2002/07/21 22:49:47 stevesk Exp $");
43 43
44#define NEW_AUTHTOK_MSG \ 44#define NEW_AUTHTOK_MSG \
45 "Warning: Your password has expired, please change it now." 45 "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,
51 51
52/* module-local variables */ 52/* module-local variables */
53static struct pam_conv conv = { 53static struct pam_conv conv = {
54 do_pam_conversation, 54 (int (*)())do_pam_conversation,
55 NULL 55 NULL
56}; 56};
57static char *__pam_msg = NULL; 57static char *__pam_msg = NULL;