diff options
| author | Ray Strode <rstrode@redhat.com> | 2012-10-05 16:52:14 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2012-10-15 22:14:54 -0400 |
| commit | 94e7e4bc51e6e8b8abc2faff66079391e3d84ae6 (patch) | |
| tree | 9a37de642432bac3cd2a3956e073a674f2020ce1 | |
| parent | a54fc2cdc129c4365237139c5614e39f98333b0e (diff) | |
| download | gdm-94e7e4bc51e6e8b8abc2faff66079391e3d84ae6.tar.gz | |
session: ignore pam info messages for automatic sessions
launch-environment sessions and autologin sessions don't have
a greeter associated with them to ask the user questions, or
to display PAM messages. It's assumed the PAM stack will be
set up in such a way that no conversing will be required.
This assumption isn't always correct, if the system pam configuration
includes something like pam_lastlog.
This commit makes us discard info messages silently rather than
fail.
(cherry picked from commit 51b03d450875e82db29f905ac7e0fa12bed79304)
| -rw-r--r-- | daemon/gdm-session.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c index f8c520bc..332e71b9 100644 --- a/daemon/gdm-session.c +++ b/daemon/gdm-session.c @@ -713,15 +713,14 @@ gdm_session_handle_info (GdmDBusWorkerManager *worker_manager_interface, const char *info, GdmSession *self) { - - g_return_val_if_fail (self->priv->user_verifier_interface != NULL, FALSE); - gdm_dbus_worker_manager_complete_info (worker_manager_interface, invocation); - gdm_dbus_user_verifier_emit_info (self->priv->user_verifier_interface, - service_name, - info); + if (self->priv->user_verifier_interface != NULL) { + gdm_dbus_user_verifier_emit_info (self->priv->user_verifier_interface, + service_name, + info); + } return TRUE; } |