Index: pamtester/src/app.c
===================================================================
--- pamtester/src/app.c	(revision 31166)
+++ pamtester/src/app.c	(arbetskopia)
@@ -343,11 +343,17 @@
 			}
 
 			if ((err = pam_acct_mgmt(pamh, flag))) {
-				err_msg = xstrdup(pam_strerror(pamh, err));
-				goto out;
-			} else {
-				printf("%s: account management done.\n", params->app_name);
+				if (err == PAM_NEW_AUTHTOK_REQD) {
+					err = pam_chauthtok(pamh, PAM_CHANGE_EXPIRED_AUTHTOK);
+				}
+
+				if (err) {
+					err_msg = xstrdup(pam_strerror(pamh, err));
+					goto out;
+				}
 			}
+			printf("%s: account management done.\n", params->app_name);
+
 		} else if (!strcasecmp(op->name, "open_session")) {
 			int flag = 0;