diff options
| author | Brian Cameron <brian.cameron@sun.com> | 2007-04-12 07:37:01 +0000 |
|---|---|---|
| committer | Brian Cameron <bcameron@src.gnome.org> | 2007-04-12 07:37:01 +0000 |
| commit | f3c47295d959f4ff0d506d08ba27b052aaee921e (patch) | |
| tree | 8d20ab45c9ed7296725f8fcad2c8aa9ed420270d /common | |
| parent | 52073db208dd0ccdc84a0181c36c6d88d9fc949e (diff) | |
| download | gdm-f3c47295d959f4ff0d506d08ba27b052aaee921e.tar.gz | |
Fix for bug #428630. This was introduced by Ludwig Nussel when he rewrote
2007-04-11 Brian Cameron <brian.cameron@sun.com>
* daemon/verify-pam.c, daemon/verify-shadow.c, daemon/verify-crypt.c,
daemon/verify.h, daemon/slave.c: Fix for bug #428630. This was
introduced by Ludwig Nussel when he rewrote the way the PAM logic
works. If you call gdm_verify_user with a userid, then it will allow
you to retry 3 times without asking for password again to better
support the Face Browser. However, when we ask for root password for
the configurator, we don't want this behavior. This patch fixes
this.
* slave.c: Fix for bug #427022. The greeter was hanging when the Face
Browser was turned on because we must use the socket to send face
browser information before using the sockets for other purposes.
* daemon/gdm-daemon-config.c, common/gdm-config.c: Fix g_debug call so
we don't pass in a NULL string, which causes a SEGV on Solaris.
* gui/gdmlangugaes.[ch]: Fix so that functions that don't return any
useful information are now void, and remove meaningless debug from
gdm_lang_op_always_restart.
svn path=/trunk/; revision=4827
Diffstat (limited to 'common')
| -rw-r--r-- | common/gdm-config.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/gdm-config.c b/common/gdm-config.c index 1b6e4e44..b21ab7ff 100644 --- a/common/gdm-config.c +++ b/common/gdm-config.c @@ -769,7 +769,7 @@ key_file_get_value (GdmConfig *config, key, NULL, &error); - g_debug ("Loading locale string: %s %s", key, val); + g_debug ("Loading locale string: %s %s", key, val ? val : "(null)"); if (error != NULL) { g_debug ("%s", error->message); @@ -781,7 +781,7 @@ key_file_get_value (GdmConfig *config, group, key, &error); - g_debug ("Loading non-locale string: %s %s", key, val); + g_debug ("Loading non-locale string: %s %s", key, val ? val : "(null)"); } } else { val = g_key_file_get_value (key_file, |