diff options
| author | George Lebl <jirka@5z.com> | 2004-01-03 00:31:48 +0000 |
|---|---|---|
| committer | George Lebl <jirka@src.gnome.org> | 2004-01-03 00:31:48 +0000 |
| commit | 5e2c904be7cf0007de1f6672488d9df04cd3f149 (patch) | |
| tree | cee38a83a6532224d56412b805abae47baf2b687 /daemon | |
| parent | d436a6f6260652bc2b88f0f51dc929faf95c694c (diff) | |
| download | gdm-5e2c904be7cf0007de1f6672488d9df04cd3f149.tar.gz | |
fix bad color string
Fri Jan 02 16:31:34 2004 George Lebl <jirka@5z.com>
* config/PreSession.in: fix bad color string
* config/gdm.conf.in: add full path to the default list of modules
comment
* daemon/verify-pam.c: don't use the pam_fail_delay but rather the
fallback only. The fail delay will block at bad times when we
don't want it too.
* gui/gdmsetup.c: save the config after flicking the accessibility
modules setting and set default path on the sounds thing
to /usr/share/sounds, even though it doesn't work because the
stupid GnomeFileEntry is broken! Will file a bug/fix it later.
Diffstat (limited to 'daemon')
| -rw-r--r-- | daemon/verify-pam.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/daemon/verify-pam.c b/daemon/verify-pam.c index ae272a1c..ecde2e2f 100644 --- a/daemon/verify-pam.c +++ b/daemon/verify-pam.c @@ -504,9 +504,14 @@ authenticate_again: pam_set_item (pamh, PAM_USER_PROMPT, _("Username:")); +#if 0 + /* FIXME: this makes things wait at the wrong places! such as + when running the configurator. We wish to ourselves cancel logins + without a delay, so ... evil */ #ifdef PAM_FAIL_DELAY pam_fail_delay (pamh, GdmRetryDelay * 1000000); #endif /* PAM_FAIL_DELAY */ +#endif did_we_ask_for_password = FALSE; @@ -544,9 +549,12 @@ authenticate_again: if (started_timer) gdm_slave_greeter_ctl_no_ret (GDM_STOPTIMER, ""); if (gdm_slave_should_complain ()) { -#ifndef PAM_FAIL_DELAY + /* FIXME: see note above about PAM_FAIL_DELAY */ +/* #ifndef PAM_FAIL_DELAY */ gdm_sleep_no_signal (GdmRetryDelay); -#endif /* PAM_FAIL_DELAY */ + /* wait up to 100ms randomly */ + usleep (g_random_int_range (0, 100000)); +/* #endif */ /* PAM_FAIL_DELAY */ gdm_error (_("Couldn't authenticate user")); } goto pamerr; |