summaryrefslogtreecommitdiff
path: root/daemon/verify-crypt.c
diff options
context:
space:
mode:
authorBrian Cameron <bcameron@src.gnome.org>2006-09-26 19:18:29 +0000
committerBrian Cameron <bcameron@src.gnome.org>2006-09-26 19:18:29 +0000
commit26238518374b700ff13b1fbea3dc9958ad2ca91b (patch)
tree5c3226d985f93c43e58b59f8fbe90fbd7722cfd0 /daemon/verify-crypt.c
parent4d886c3cc099400857ee731134130e96011d21e6 (diff)
downloadgdm-26238518374b700ff13b1fbea3dc9958ad2ca91b.tar.gz
Fix so that if timed login script returns an invalid user, timed login is
* daemon/slave.c, daemon/verify-crypt.c, daemon/verify-pam.c, daemon/verify-shadow.c, gui/gdmcommon.c: Fix so that if timed login script returns an invalid user, timed login is not turned on. Fixes bug #340148. Patch by Andrew (andrewz@springsrescuemission.org). * gui/gdmuser.c: Fix gdm_is_user_valid so it is more simple, like implemented in daemon/slave.c by Andrew.
Diffstat (limited to 'daemon/verify-crypt.c')
-rw-r--r--daemon/verify-crypt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/daemon/verify-crypt.c b/daemon/verify-crypt.c
index 91ccf111..ae28efef 100644
--- a/daemon/verify-crypt.c
+++ b/daemon/verify-crypt.c
@@ -108,7 +108,7 @@ gdm_verify_user (GdmDisplay *d,
gint reEnter, ret;
#endif
- if (local)
+ if (local && d->timed_login_ok)
gdm_slave_greeter_ctl_no_ret (GDM_STARTTIMER, "");
if (username == NULL) {