summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--auth-pam.c8
2 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 940edc8d3..702b6b6db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120020721
2 - (stevesk) [auth-pam.c] merge cosmetic changes from solar's
3 openssh-3.4p1-owl-password-changing.diff
4
120020720 520020720
2 - (stevesk) [ssh-keygen.c] bug #231: always init/seed_rng(). 6 - (stevesk) [ssh-keygen.c] bug #231: always init/seed_rng().
3 7
@@ -1397,4 +1401,4 @@
1397 - (stevesk) entropy.c: typo in debug message 1401 - (stevesk) entropy.c: typo in debug message
1398 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 1402 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
1399 1403
1400$Id: ChangeLog,v 1.2380 2002/07/20 19:05:40 stevesk Exp $ 1404$Id: ChangeLog,v 1.2381 2002/07/21 17:26:54 stevesk Exp $
diff --git a/auth-pam.c b/auth-pam.c
index 6bf10d2f9..f31641c28 100644
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -36,10 +36,10 @@
36 36
37extern char *__progname; 37extern char *__progname;
38 38
39RCSID("$Id: auth-pam.c,v 1.47 2002/07/02 07:08:24 djm Exp $"); 39RCSID("$Id: auth-pam.c,v 1.48 2002/07/21 17:26:54 stevesk Exp $");
40 40
41#define NEW_AUTHTOK_MSG \ 41#define NEW_AUTHTOK_MSG \
42 "Warning: Your password has expired, please change it now" 42 "Warning: Your password has expired, please change it now."
43 43
44static int do_pam_conversation(int num_msg, const struct pam_message **msg, 44static int do_pam_conversation(int num_msg, const struct pam_message **msg,
45 struct pam_response **resp, void *appdata_ptr); 45 struct pam_response **resp, void *appdata_ptr);
@@ -55,7 +55,7 @@ static const char *__pampasswd = NULL;
55 55
56/* states for do_pam_conversation() */ 56/* states for do_pam_conversation() */
57enum { INITIAL_LOGIN, OTHER } pamstate = INITIAL_LOGIN; 57enum { INITIAL_LOGIN, OTHER } pamstate = INITIAL_LOGIN;
58/* remember whether pam_acct_mgmt() returned PAM_NEWAUTHTOK_REQD */ 58/* remember whether pam_acct_mgmt() returned PAM_NEW_AUTHTOK_REQD */
59static int password_change_required = 0; 59static int password_change_required = 0;
60/* remember whether the last pam_authenticate() succeeded or not */ 60/* remember whether the last pam_authenticate() succeeded or not */
61static int was_authenticated = 0; 61static int was_authenticated = 0;
@@ -326,7 +326,7 @@ int is_pam_password_change_required(void)
326 * Have user change authentication token if pam_acct_mgmt() indicated 326 * Have user change authentication token if pam_acct_mgmt() indicated
327 * it was expired. This needs to be called after an interactive 327 * it was expired. This needs to be called after an interactive
328 * session is established and the user's pty is connected to 328 * session is established and the user's pty is connected to
329 * stdin/stout/stderr. 329 * stdin/stdout/stderr.
330 */ 330 */
331void do_pam_chauthtok(void) 331void do_pam_chauthtok(void)
332{ 332{