- (stevesk) [auth-pam.c] merge cosmetic changes from solar's

openssh-3.4p1-owl-password-changing.diff
This commit is contained in:
Kevin Steves 2002-07-21 17:26:54 +00:00
parent 3a8819102c
commit 6cdecd0892
2 changed files with 9 additions and 5 deletions

View File

@ -1,3 +1,7 @@
20020721
- (stevesk) [auth-pam.c] merge cosmetic changes from solar's
openssh-3.4p1-owl-password-changing.diff
20020720 20020720
- (stevesk) [ssh-keygen.c] bug #231: always init/seed_rng(). - (stevesk) [ssh-keygen.c] bug #231: always init/seed_rng().
@ -1397,4 +1401,4 @@
- (stevesk) entropy.c: typo in debug message - (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@ - (djm) ssh-keygen -i needs seeded RNG; report from markus@
$Id: ChangeLog,v 1.2380 2002/07/20 19:05:40 stevesk Exp $ $Id: ChangeLog,v 1.2381 2002/07/21 17:26:54 stevesk Exp $

View File

@ -36,10 +36,10 @@
extern char *__progname; extern char *__progname;
RCSID("$Id: auth-pam.c,v 1.47 2002/07/02 07:08:24 djm Exp $"); RCSID("$Id: auth-pam.c,v 1.48 2002/07/21 17:26:54 stevesk Exp $");
#define NEW_AUTHTOK_MSG \ #define NEW_AUTHTOK_MSG \
"Warning: Your password has expired, please change it now" "Warning: Your password has expired, please change it now."
static int do_pam_conversation(int num_msg, const struct pam_message **msg, static int do_pam_conversation(int num_msg, const struct pam_message **msg,
struct pam_response **resp, void *appdata_ptr); struct pam_response **resp, void *appdata_ptr);
@ -55,7 +55,7 @@ static const char *__pampasswd = NULL;
/* states for do_pam_conversation() */ /* states for do_pam_conversation() */
enum { INITIAL_LOGIN, OTHER } pamstate = INITIAL_LOGIN; enum { INITIAL_LOGIN, OTHER } pamstate = INITIAL_LOGIN;
/* remember whether pam_acct_mgmt() returned PAM_NEWAUTHTOK_REQD */ /* remember whether pam_acct_mgmt() returned PAM_NEW_AUTHTOK_REQD */
static int password_change_required = 0; static int password_change_required = 0;
/* remember whether the last pam_authenticate() succeeded or not */ /* remember whether the last pam_authenticate() succeeded or not */
static int was_authenticated = 0; static int was_authenticated = 0;
@ -326,7 +326,7 @@ int is_pam_password_change_required(void)
* Have user change authentication token if pam_acct_mgmt() indicated * Have user change authentication token if pam_acct_mgmt() indicated
* it was expired. This needs to be called after an interactive * it was expired. This needs to be called after an interactive
* session is established and the user's pty is connected to * session is established and the user's pty is connected to
* stdin/stout/stderr. * stdin/stdout/stderr.
*/ */
void do_pam_chauthtok(void) void do_pam_chauthtok(void)
{ {