Whoops, forgot changelog

[openssh.git] / auth-pam.c

diff --git a/auth-pam.c b/auth-pam.c
index c0973d0e88e36566c1c9b4587209b41a28cdec77..a9cd459a7355a8503630bedc0b60aa30114124fa 100644 (file)
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -83,11 +83,16 @@ static int pamconv(int num_msg, const struct pam_message **msg,
        for (count = 0; count < num_msg; count++) {
                switch ((*msg)[count].msg_style) {
                        case PAM_PROMPT_ECHO_ON:
-                               fputs((*msg)[count].msg, stderr);
-                               fgets(buf, sizeof(buf), stdin);
-                               reply[count].resp = xstrdup(buf);
-                               reply[count].resp_retcode = PAM_SUCCESS;
-                               break;
+                               if (pamstate == INITIAL_LOGIN) {
+                                       free(reply);
+                                       return PAM_CONV_ERR;
+                               } else {
+                                       fputs((*msg)[count].msg, stderr);
+                                       fgets(buf, sizeof(buf), stdin);
+                                       reply[count].resp = xstrdup(buf);
+                                       reply[count].resp_retcode = PAM_SUCCESS;
+                                       break;
+                               }
                        case PAM_PROMPT_ECHO_OFF:
                                if (pamstate == INITIAL_LOGIN) {
                                        if (pampasswd == NULL) {
@@ -95,8 +100,10 @@ static int pamconv(int num_msg, const struct pam_message **msg,
                                                return PAM_CONV_ERR;
                                        }
                                        reply[count].resp = xstrdup(pampasswd);
-                               } else
-                                       reply[count].resp = xstrdup(read_passphrase((*msg)[count].msg, 1));
+                               } else {
+                                       reply[count].resp = 
+                                               xstrdup(read_passphrase((*msg)[count].msg, 1));
+                               }
                                reply[count].resp_retcode = PAM_SUCCESS;
                                break;
                        case PAM_ERROR_MSG:
@@ -242,7 +249,7 @@ void do_pam_session(char *username, const char *ttyname)
 }
 
 /* Set PAM credentials */ 
-void do_pam_setcred()
+void do_pam_setcred(void)
 {
        int pam_retval;
  
@@ -250,17 +257,23 @@ void do_pam_setcred()
        pam_retval = pam_setcred(pamh, PAM_ESTABLISH_CRED);
        if (pam_retval != PAM_SUCCESS) {
                fatal("PAM setcred failed[%d]: %.200s", 
-                       pam_setcred, PAM_STRERROR(pamh, pam_retval));
+                       pam_retval, PAM_STRERROR(pamh, pam_retval));
        }
 }
 
+/* accessor function for file scope static variable */
+int pam_password_change_required(void)
+{
+       return password_change_required;
+}
+
 /* 
  * 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.
  */
-void do_pam_chauthtok()
+void do_pam_chauthtok(void)
 {
        int pam_retval;