summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Lebl <jirka@5z.com>2004-04-16 22:08:58 +0000
committerGeorge Lebl <jirka@src.gnome.org>2004-04-16 22:08:58 +0000
commit99eb861105269a025e49ca3bd83a203738d17209 (patch)
treebcadb26ebcb6be20e7ef742ce56218e4ca9a39b1
parentab78d747172c66cba58b9511b9d08548fd3306af (diff)
downloadgdm-99eb861105269a025e49ca3bd83a203738d17209.tar.gz
ensure clean building even if FamilyInternetV6 is not define (define it
Fri Apr 16 15:08:25 2004 George Lebl <jirka@5z.com> * daemon/auth.c: ensure clean building even if FamilyInternetV6 is not define (define it ourselves to '6' which is what it is) * configure.in: raise version * NEWS: update
-rw-r--r--ChangeLog9
-rw-r--r--NEWS24
-rw-r--r--configure.in2
-rw-r--r--daemon/auth.c8
4 files changed, 42 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2c315978..66d5ee04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Fri Apr 16 15:08:25 2004 George Lebl <jirka@5z.com>
+
+ * daemon/auth.c: ensure clean building even if FamilyInternetV6
+ is not define (define it ourselves to '6' which is what it is)
+
+ * configure.in: raise version
+
+ * NEWS: update
+
Tue Apr 13 11:22:00 2004 George Lebl <jirka@5z.com>
* config/gdm.conf.in: stop calling 'gdm' 'genius', I'm confusing
diff --git a/NEWS b/NEWS
index 7411ff89..887d9c42 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,29 @@
Ahh news...
+2.6.0.1 stuff:
+
+- Also ensure that /tmp/.X11-unix exists as well as /tmp/.ICE-unix, and
+ do this in a way to avoid self races
+
+- Main daemon now ignores SIGPIPE which it can get which would cause
+ a crash (Jerry Wall)
+
+- Fix a file descriptor leak when closing slaves (Jerry Wall)
+
+- Fixed IPv6 authorization setting in .Xauthority (Vijaykumar Patwari)
+
+- Some typos fixed
+
+- Translation updates (Guntupalli Karunakar, Christian Rose, Gareth Owen,
+ Andras Timar, Gujarati Team, Christophe Merlet, Inaki Larranaga,
+ Changwoo Ryu, Samuel Jon Gunnarsson, Helgi, Pormar Porbjornsson,
+ Zuza Software Foundation, Ole Laursen, Jaswinder Singh Phulewala,
+ Asmund Skjaeveland, Robert Sedak, Takeshi Aihana, Mugurel Tudor,
+ Misu Moldovan, Abel Cheung, Kevin Kee, Baris Cicek, Telsa Gwynne,
+ Sayamindu Dasgupta, Indranil Dasgupta, Francisco Javier F. Serrador,
+ Arafat Medini, Indictrans team, Leonid Kanter, Dafydd Harries,
+ Alession Frusciante, Francesco Marletta)
+
2.6.0.0 stuff:
- DisplayLastLogin defaults to false since '/usr/bin/last' is stupidly
diff --git a/configure.in b/configure.in
index 8ae74ce6..70dbd0aa 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ AC_PREREQ(2.52)
AC_INIT(daemon/gdm.h)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(gdm,2.6.0.0)
+AM_INIT_AUTOMAKE(gdm,2.6.0.1)
AM_MAINTAINER_MODE
AC_PROG_INTLTOOL([0.28])
diff --git a/daemon/auth.c b/daemon/auth.c
index 535901e0..cae31eb2 100644
--- a/daemon/auth.c
+++ b/daemon/auth.c
@@ -38,6 +38,14 @@
#include "filecheck.h"
#include "auth.h"
+/* Ensure we know about FamilyInternetV6 even if what we're compiling
+ against doesn't */
+#ifdef ENABLE_IPV6
+#ifndef FamilyInternetV6
+#define FamilyInternetV6 6
+#endif /* ! FamilyInternetV6 */
+#endif /* ENABLE_IPV6 */
+
/* Local prototypes */
static FILE *gdm_auth_purge (GdmDisplay *d, FILE *af, gboolean remove_when_empty);