Add warning flags where they are missing and fix the resulting warnings.

Approved by Robert Ancell, PS Jenkins bot.

diff --git a/src/session-child.c b/src/session-child.c
index 01eb1c37adc97fec1e482a9ff16d8bf3d4789ca3..84f9b3b046e8c5206d3d77ce61e51bf0c615e03c 100644 (file)
--- a/src/session-child.c
+++ b/src/session-child.c
@@ -334,7 +334,7 @@ session_child_run (int argc, char **argv)
         if (authentication_result == PAM_SUCCESS)
             authentication_result = pam_acct_mgmt (pam_handle, 0);
         if (authentication_result == PAM_NEW_AUTHTOK_REQD)
-            authentication_result = pam_chauthtok (pam_handle, 0);
+            authentication_result = pam_chauthtok (pam_handle, PAM_CHANGE_EXPIRED_AUTHTOK);
     }
     else
         authentication_result = PAM_SUCCESS;

diff --git a/tests/scripts/login-new-authtok.conf b/tests/scripts/login-new-authtok.conf
index 7b0ed973a6e2362edc9d61d728b9cfb94cc970c8..3be4af7fe9e7ee94309a6f43462d4f7a9c0ee0ad 100644 (file)
--- a/tests/scripts/login-new-authtok.conf
+++ b/tests/scripts/login-new-authtok.conf
@@ -24,7 +24,7 @@ user-session=default
 
 # Log into account that requires as password change
 #?*GREETER-X-0 AUTHENTICATE USERNAME=new-authtok
-#?GREETER-X-0 SHOW-PROMPT TEXT="Enter new password:"
+#?GREETER-X-0 SHOW-PROMPT TEXT="Enter new password \(expired\):"
 #?*GREETER-X-0 RESPOND TEXT="New password"
 #?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=new-authtok AUTHENTICATED=TRUE
 #?*GREETER-X-0 START-SESSION

diff --git a/tests/src/libsystem.c b/tests/src/libsystem.c
index d8e7be033725b00771dbd50d72762868f157bcfd..157bb993efe08e67606e2442a8d85a0c3454863c 100644 (file)
--- a/tests/src/libsystem.c
+++ b/tests/src/libsystem.c
@@ -1210,7 +1210,10 @@ pam_chauthtok (pam_handle_t *pamh, int flags)
     msg = malloc (sizeof (struct pam_message *) * 1);
     msg[0] = malloc (sizeof (struct pam_message));
     msg[0]->msg_style = PAM_PROMPT_ECHO_OFF;
-    msg[0]->msg = "Enter new password:";
+    if ((flags & PAM_CHANGE_EXPIRED_AUTHTOK) != 0)
+        msg[0]->msg = "Enter new password (expired):";
+    else
+        msg[0]->msg = "Enter new password:";
     result = pamh->conversation.conv (1, (const struct pam_message **) msg, &resp, pamh->conversation.appdata_ptr);
     free (msg[0]);
     free (msg);