diff options
author | Michael Catanzaro <mcatanzaro@igalia.com> | 2015-11-23 18:41:26 -0600 |
---|---|---|
committer | Michael Catanzaro <mcatanzaro@igalia.com> | 2016-01-05 15:52:01 -0600 |
commit | 0113cecae244352f1797f59862ef79cde34ce3c8 (patch) | |
tree | 0bbc084daa6d8e64db2b28b78af66e096da1ec4d | |
parent | 0079b7844acd70c50e463a4fa8239ab2c7648902 (diff) | |
download | gdm-0113cecae244352f1797f59862ef79cde34ce3c8.tar.gz |
session-worker: Don't override prompt from PAM when setting new password
During the PAM authorize step, if pam_acct_mgmt returns
PAM_NEW_AUTHTOK_REQD, gdm displays the message "Your password has
expired, please change it now." But pam_unix has already displayed the
message "You are required to change your password immediately (root
enforced)." This causes the message from PAM to flash very briefly on
the screen, then be replaced by the message from gdm. The user will be
confused by the disappearing message.
There's no value in gdm presenting its own message here, since the
message from PAM is fine.
https://bugzilla.gnome.org/show_bug.cgi?id=758571
-rw-r--r-- | daemon/gdm-session-worker.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c index 5ae5b3f2..2862a624 100644 --- a/daemon/gdm-session-worker.c +++ b/daemon/gdm-session-worker.c @@ -1139,7 +1139,6 @@ gdm_session_worker_authorize_user (GdmSessionWorker *worker, */ if (error_code == PAM_NEW_AUTHTOK_REQD && !worker->priv->is_program_session) { g_debug ("GdmSessionWorker: authenticated user requires new auth token"); - gdm_session_worker_report_problem (worker, _("Your password has expired, please change it now.")); error_code = pam_chauthtok (worker->priv->pam_handle, PAM_CHANGE_EXPIRED_AUTHTOK); gdm_session_worker_get_username (worker, NULL); |