summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog13
-rw-r--r--NEWS12
-rw-r--r--configure.in2
-rw-r--r--daemon/gdm.c1
-rw-r--r--daemon/slave.c7
5 files changed, 34 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8ec76cce..3b83bc21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Tue Jun 04 21:45:19 2002 George Lebl <jirka@5z.com>
+
+ * Release 2.3.90.6
+
+ * configure.in: raise version
+
+ * daemon/gdm.c: properly update the first login bool so
+ that not all logins after a slave dies are first logins.
+
+ * daemon/slave.c: SECURITY FIX! after the automatic login,
+ return from the gdm_slave_run so that the display can be
+ reinitted. Else clients may be left around. Fixes #84055
+
Mon Jun 03 11:43:25 2002 George Lebl <jirka@5z.com>
* Release 2.3.90.5
diff --git a/NEWS b/NEWS
index d00d87ae..52a28472 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,17 @@
Ahh news...
+2.3.90.6 stuff:
+
+- SECURITY FIX! After an automatic session the display wasn't reinited
+ so clients could be left hanging around. This is only present in the
+ 2.3.90.x series and only affects automatic logins.
+
+- Automatic login is actually done on the first login only and Timed
+ login is actually done only on the first display (as it all should be)
+
+- Translation updates (Germán Poo Caamaño, Jordi Mallach,
+ Hasbullah Bin Pit, Tõivo Leedjärv)
+
2.3.90.5 stuff:
- Some work on making the language setup more sane and integrating
diff --git a/configure.in b/configure.in
index 1e9db5d5..d6083db5 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ dnl
AC_PROG_INTLTOOL
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(gdm,2.3.90.5)
+AM_INIT_AUTOMAKE(gdm,2.3.90.6)
AM_MAINTAINER_MODE
GDK_PIXBUF_REQUIRED=1.3.1
diff --git a/daemon/gdm.c b/daemon/gdm.c
index 6bf1196a..5817e742 100644
--- a/daemon/gdm.c
+++ b/daemon/gdm.c
@@ -752,6 +752,7 @@ gdm_start_first_unborn_local (int delay)
* autologged in */
gdm_first_login = FALSE;
} else {
+ gdm_first_login = FALSE;
break;
}
}
diff --git a/daemon/slave.c b/daemon/slave.c
index 33898625..adab7797 100644
--- a/daemon/slave.c
+++ b/daemon/slave.c
@@ -566,6 +566,10 @@ gdm_slave_run (GdmDisplay *display)
gdm_verify_cleanup (d);
_exit (DISPLAY_REMANAGE);
}
+
+ /* return to gdm_slave_start so that the server
+ * can be reinitted and all that kind of fun stuff. */
+ return;
}
if (gdm_first_login)
@@ -615,6 +619,9 @@ gdm_slave_run (GdmDisplay *display)
gdm_slave_greeter_ctl_no_ret (GDM_ENABLE, "");
gdm_slave_greeter_ctl_no_ret (GDM_RESETOK, "");
}
+ /* Note that greet is only true if the above was no 'login',
+ * so no need to reinit the server nor rebake cookies
+ * nor such nonsense */
} while (greet);
}