[gdm] Only retry login if user list enabled
- From: Ray Strode <halfline src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gdm] Only retry login if user list enabled
- Date: Tue, 17 Aug 2010 02:17:26 +0000 (UTC)
commit 972dcb0c965fbef6c9813dc2de2ea636a8b21d69
Author: Ray Strode <rstrode redhat com>
Date: Mon Aug 16 22:12:33 2010 -0400
Only retry login if user list enabled
The "User list disabled" codepath already handles
reselecting OTHER on failure; running retry_login()
doesn't make sense in that case.
We really only want to do a retry if:
1) The login window is still siting in AUTHENTICATION mode
from a previous failed attempt
2) The login window has a user list.
gui/simple-greeter/gdm-greeter-login-window.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/gui/simple-greeter/gdm-greeter-login-window.c b/gui/simple-greeter/gdm-greeter-login-window.c
index 2c757fc..96e6fce 100644
--- a/gui/simple-greeter/gdm-greeter-login-window.c
+++ b/gui/simple-greeter/gdm-greeter-login-window.c
@@ -702,7 +702,8 @@ gdm_greeter_login_window_ready (GdmGreeterLoginWindow *login_window)
set_focus (GDM_GREETER_LOGIN_WINDOW (login_window));
/* If we are retrying a previously selected user */
- if (login_window->priv->dialog_mode != MODE_SELECTION) {
+ if (!login_window->priv->user_list_disabled &&
+ login_window->priv->dialog_mode == MODE_AUTHENTICATION) {
retry_login (login_window);
} else {
/* If the user list is disabled, then start the PAM conversation */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]