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

   openssh-3.4p1-owl-password-changing.diff

diff --git a/ChangeLog b/ChangeLog
index 901838693cd13a3e37f465b26634b3d7f693522a..8dabafcd6db2550daed882455448ff2b0146443e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20020721
+ - (stevesk) [auth-pam.c] merge cosmetic changes from solar's
+   openssh-3.4p1-owl-password-changing.diff
+
 20020720
  - (stevesk) [ssh-keygen.c] bug #231: always init/seed_rng().
 

diff --git a/auth-pam.c b/auth-pam.c
index ae5175272c397226bdb924ed3e10680461475c24..ff9dc0e6cfa2658d76e9e6025d8f8aee281719f6 100644 (file)
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -39,7 +39,7 @@ extern char *__progname;
 RCSID("$Id$");
 
 #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,
        struct pam_response **resp, void *appdata_ptr);
@@ -55,7 +55,7 @@ static const char *__pampasswd = NULL;
 
 /* states for do_pam_conversation() */
 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;
 /* remember whether the last pam_authenticate() succeeded or not */
 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
  * it was expired.  This needs to be called after an interactive
  * session is established and the user's pty is connected to
- * stdin/stout/stderr.
+ * stdin/stdout/stderr.
  */
 void do_pam_chauthtok(void)
 {