summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Lebl <jirka@5z.com>2004-01-15 20:37:30 +0000
committerGeorge Lebl <jirka@src.gnome.org>2004-01-15 20:37:30 +0000
commit65038316de95563c4ff534d351fb58fcf9861a3d (patch)
tree30e5ae190d8ce2fc93711bc5da1811479afc0e62
parentae32071cba13ce6586b4799bfeb6b127864f16e4 (diff)
downloadgdm-65038316de95563c4ff534d351fb58fcf9861a3d.tar.gz
Fix #131389 where if the slave crashed the login field was not cleared
Thu Jan 15 12:35:45 2004 George Lebl <jirka@5z.com> * daemon/gdm.c: Fix #131389 where if the slave crashed the login field was not cleared
-rw-r--r--ChangeLog5
-rw-r--r--daemon/gdm.c5
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index bfd4ddfe..786097d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jan 15 12:35:45 2004 George Lebl <jirka@5z.com>
+
+ * daemon/gdm.c: Fix #131389 where if the slave crashed the
+ login field was not cleared
+
Tue Jan 06 17:39:45 2004 George Lebl <jirka@5z.com>
* configure.in: fix intltool check (move it to a better location)
diff --git a/daemon/gdm.c b/daemon/gdm.c
index 1c20b9f5..6089a53f 100644
--- a/daemon/gdm.c
+++ b/daemon/gdm.c
@@ -1304,6 +1304,8 @@ gdm_cleanup_children (void)
/* definately not logged in now */
d->logged_in = FALSE;
+ g_free (d->login);
+ d->login = NULL;
/* Declare the display dead */
d->slavepid = 0;
@@ -2422,7 +2424,8 @@ gdm_handle_message (GdmConnection *conn, const char *msg, gpointer data)
gdm_debug ("Got QUERYLOGIN %s", p);
for (li = displays; li != NULL; li = li->next) {
GdmDisplay *di = li->data;
- if (di->login != NULL &&
+ if (di->logged_in &&
+ di->login != NULL &&
strcmp (di->login, p) == 0) {
if (resp == NULL) {
resp = g_string_new (di->name);