xdm: Changes to 'debian-unstable'
debian/changelog | 3 +
debian/patches/debian.diff | 23 +++++++++++
debian/patches/xdm_fixes.diff | 82 ++++++++++++++++++++----------------------
3 files changed, 66 insertions(+), 42 deletions(-)
New commits:
commit be477aa1e3de626cc87e85da67ee05c0942bdbb9
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 20 14:10:16 2008 +0200
xdm_fixes.diff: open the log file *after* BecomeDaemon()
BecomeDaemon() redirects the standard file descriptors to /dev/null,
so we ended up not logging anything (closes: #495776).
diff --git a/debian/changelog b/debian/changelog
index 61267dc..14f3205 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ xdm (1:1.1.8-4) UNRELEASED; urgency=low
* Update SELinux patch to get the correct login context (closes: #493524).
Thanks, Russell Coker!
* debian.diff: Fix remaining bad reference to the auth dir in manpage.
+ * xdm_fixes.diff: open the log file *after* BecomeDaemon(), so we don't send
+ the log to /dev/null (closes: #495776).
-- Julien Cristau <jcristau@debian.org> Mon, 11 Aug 2008 13:31:29 +0200
diff --git a/debian/patches/xdm_fixes.diff b/debian/patches/xdm_fixes.diff
index dd18d4e..5f719c9 100644
--- a/debian/patches/xdm_fixes.diff
+++ b/debian/patches/xdm_fixes.diff
@@ -6,8 +6,8 @@ Applied 002_xdm_fixes.diff
Index: xdm/auth.c
===================================================================
---- xdm.orig/auth.c 2007-04-09 05:38:43.000000000 +0200
-+++ xdm/auth.c 2007-08-13 16:35:01.000000000 +0200
+--- xdm.orig/auth.c
++++ xdm/auth.c
@@ -48,6 +48,7 @@
#include "dm_error.h"
@@ -84,8 +84,8 @@ Index: xdm/auth.c
}
Index: xdm/dm.c
===================================================================
---- xdm.orig/dm.c 2007-04-09 05:38:43.000000000 +0200
-+++ xdm/dm.c 2007-08-13 16:35:01.000000000 +0200
+--- xdm.orig/dm.c
++++ xdm/dm.c
@@ -41,6 +41,7 @@
# include "dm_error.h"
@@ -113,27 +113,25 @@ Index: xdm/dm.c
- /*
- * Only allow root to run in non-debug mode to avoid problems
- */
-- if (debugLevel == 0 && getuid() != 0)
-+ if (debugLevel == 0)
+ if (debugLevel == 0 && getuid() != 0)
{
- fprintf (stderr, "Only root wants to run %s\n", argv[0]);
-- exit (1);
-+ if (getuid() != 0)
-+ {
-+ /*
-+ * only allow root to run in non-debug mode to avoid problems
-+ */
-+ LogError ("only root run can run %s in non-debug mode; exiting\n",
-+ argv[0]);
-+ exit (1);
-+ }
+ /*
-+ * if not debugging, send messages to the log file
++ * only allow root to run in non-debug mode to avoid problems
+ */
-+ InitErrorLog ();
++ LogError ("only root run can run %s in non-debug mode; exiting\n",
++ argv[0]);
+ exit (1);
}
if (debugLevel == 0 && daemonMode)
BecomeDaemon ();
++ if (debugLevel == 0)
++ {
++ /*
++ * if not debugging, send messages to the log file
++ */
++ InitErrorLog ();
++ }
if (debugLevel >= 10)
nofork_session = 1;
- /* SUPPRESS 560 */
@@ -484,8 +482,8 @@ Index: xdm/dm.c
+#endif /* HAS_SETPROCTITLE */
Index: xdm/dm_auth.h
===================================================================
---- xdm.orig/dm_auth.h 2007-04-09 05:38:43.000000000 +0200
-+++ xdm/dm_auth.h 2007-08-13 16:35:01.000000000 +0200
+--- xdm.orig/dm_auth.h
++++ xdm/dm_auth.h
@@ -45,7 +45,7 @@
#ifdef HASXDMAUTH
extern void XdmInitAuth (unsigned short name_len, char *name);
@@ -526,8 +524,8 @@ Index: xdm/dm_auth.h
extern void SecureRPCInitAuth (unsigned short name_len, char *name);
Index: xdm/error.c
===================================================================
---- xdm.orig/error.c 2007-04-09 05:38:43.000000000 +0200
-+++ xdm/error.c 2007-08-13 16:35:01.000000000 +0200
+--- xdm.orig/error.c
++++ xdm/error.c
@@ -34,23 +34,41 @@
*
* error.c
@@ -689,8 +687,8 @@ Index: xdm/error.c
}
Index: xdm/genauth.c
===================================================================
---- xdm.orig/genauth.c 2007-04-09 05:38:43.000000000 +0200
-+++ xdm/genauth.c 2007-08-13 16:35:01.000000000 +0200
+--- xdm.orig/genauth.c
++++ xdm/genauth.c
@@ -34,14 +34,16 @@
* Author: Keith Packard, MIT X Consortium
*/
@@ -731,8 +729,8 @@ Index: xdm/genauth.c
{
Index: xdm/greeter/Login.c
===================================================================
---- xdm.orig/greeter/Login.c 2007-08-13 12:18:13.000000000 +0200
-+++ xdm/greeter/Login.c 2007-08-13 16:35:01.000000000 +0200
+--- xdm.orig/greeter/Login.c
++++ xdm/greeter/Login.c
@@ -1761,16 +1761,16 @@
#ifdef XPM
w->login.logoValid = False;
@@ -755,8 +753,8 @@ Index: xdm/greeter/Login.c
goto SkipXpmLoad;
Index: xdm/resource.c
===================================================================
---- xdm.orig/resource.c 2007-04-09 05:38:43.000000000 +0200
-+++ xdm/resource.c 2007-08-13 16:35:01.000000000 +0200
+--- xdm.orig/resource.c
++++ xdm/resource.c
@@ -36,11 +36,11 @@
* resource.c
*/
@@ -823,8 +821,8 @@ Index: xdm/resource.c
XrmDatabase DmResourceDB;
Index: xdm/server.c
===================================================================
---- xdm.orig/server.c 2007-04-09 05:38:43.000000000 +0200
-+++ xdm/server.c 2007-08-13 16:35:01.000000000 +0200
+--- xdm.orig/server.c
++++ xdm/server.c
@@ -79,7 +79,7 @@
char arg[1024];
pid_t pid;
@@ -845,8 +843,8 @@ Index: xdm/server.c
return FALSE;
Index: xdm/session.c
===================================================================
---- xdm.orig/session.c 2007-08-13 12:18:13.000000000 +0200
-+++ xdm/session.c 2007-08-13 16:35:01.000000000 +0200
+--- xdm.orig/session.c
++++ xdm/session.c
@@ -610,20 +610,22 @@
#ifndef AIXV3
@@ -925,7 +923,7 @@ Index: xdm/session.c
return 0;
default:
if (passwd != NULL)
-@@ -870,12 +874,14 @@
+@@ -874,12 +878,14 @@
open ("/dev/null", O_RDONLY);
/* make stdout follow stderr to the log file */
dup2 (2,1);
@@ -940,7 +938,7 @@ Index: xdm/session.c
if (errno != ENOENT) {
char program[1024], *e, *p, *optarg;
FILE *f;
-@@ -934,6 +940,7 @@
+@@ -938,6 +944,7 @@
while ((*av++ = *argv++))
/* SUPPRESS 530 */
;
@@ -950,8 +948,8 @@ Index: xdm/session.c
}
Index: xdm/socket.c
===================================================================
---- xdm.orig/socket.c 2007-04-09 05:38:43.000000000 +0200
-+++ xdm/socket.c 2007-08-13 16:35:01.000000000 +0200
+--- xdm.orig/socket.c
++++ xdm/socket.c
@@ -78,7 +78,7 @@
Debug ("Created chooser socket %d\n", chooserFd);
if (chooserFd == -1)
@@ -981,8 +979,8 @@ Index: xdm/socket.c
return fd;
Index: xdm/xdm.man.cpp
===================================================================
---- xdm.orig/xdm.man.cpp 2007-08-13 12:18:13.000000000 +0200
-+++ xdm/xdm.man.cpp 2007-08-13 16:35:01.000000000 +0200
+--- xdm.orig/xdm.man.cpp
++++ xdm/xdm.man.cpp
@@ -289,7 +289,7 @@
this resource to ``false'' will disable this feature.
.IP "\fBDisplayManager.pidFile\fP"
@@ -1009,8 +1007,8 @@ Index: xdm/xdm.man.cpp
.IP \fBDisplayManager.prngdSocket\fP
Index: xdm/xdmauth.c
===================================================================
---- xdm.orig/xdmauth.c 2007-04-09 05:38:43.000000000 +0200
-+++ xdm/xdmauth.c 2007-08-13 16:35:01.000000000 +0200
+--- xdm.orig/xdmauth.c
++++ xdm/xdmauth.c
@@ -45,6 +45,18 @@
static char auth_name[256];
static int auth_name_len;
@@ -1075,8 +1073,8 @@ Index: xdm/xdmauth.c
#endif /* HASXDMAUTH (covering the entire file) */
Index: xdm/xdmshell.c
===================================================================
---- xdm.orig/xdmshell.c 2007-04-09 05:38:43.000000000 +0200
-+++ xdm/xdmshell.c 2007-08-13 16:35:01.000000000 +0200
+--- xdm.orig/xdmshell.c
++++ xdm/xdmshell.c
@@ -41,6 +41,7 @@
#include <stdio.h>
#include "dm.h"
commit a72150194e71e90306b0a3644fb7e599d62f0e10
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 20 14:03:59 2008 +0200
debian.diff: Fix remaining bad reference to the auth dir in manpage.
diff --git a/debian/changelog b/debian/changelog
index c3d722e..61267dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xdm (1:1.1.8-4) UNRELEASED; urgency=low
* Update SELinux patch to get the correct login context (closes: #493524).
Thanks, Russell Coker!
+ * debian.diff: Fix remaining bad reference to the auth dir in manpage.
-- Julien Cristau <jcristau@debian.org> Mon, 11 Aug 2008 13:31:29 +0200
diff --git a/debian/patches/debian.diff b/debian/patches/debian.diff
index c21da90..88f6781 100644
--- a/debian/patches/debian.diff
+++ b/debian/patches/debian.diff
@@ -5,6 +5,8 @@
Ported parts of 905_debian_xdm.diff. Some changes are now done through
configure flags
+Index: xdm/config/Makefile.am
+===================================================================
--- xdm.orig/config/Makefile.am
+++ xdm/config/Makefile.am
@@ -55,7 +55,7 @@
@@ -16,6 +18,8 @@ configure flags
Xservers.ws: $(srcdir)/Xservers.ws.cpp
$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $(srcdir)/Xservers.ws.cpp | $(CPP_SED_MAGIC) > $@
+Index: xdm/config/Xservers.ws.cpp
+===================================================================
--- xdm.orig/config/Xservers.ws.cpp
+++ xdm/config/Xservers.ws.cpp
@@ -10,4 +10,26 @@
@@ -46,6 +50,8 @@ configure flags
+XCOMM :0 local BINDIR/X :0 vt9 -depth 15 -nolisten tcp
+XCOMM :1 local BINDIR/X :1 vt10 -depth 8 -nolisten tcp
+:0 local BINDIR/X :0 DEFAULTVT -nolisten tcp
+Index: xdm/config/Xsession.cpp
+===================================================================
--- xdm.orig/config/Xsession.cpp
+++ xdm/config/Xsession.cpp
@@ -4,84 +4,5 @@
@@ -135,6 +141,8 @@ configure flags
-fi
+# invoke global X session script
+. /etc/X11/Xsession
+Index: xdm/config/xdm-config.cpp
+===================================================================
--- xdm.orig/config/xdm-config.cpp
+++ xdm/config/xdm-config.cpp
@@ -17,22 +17,22 @@
@@ -166,6 +174,8 @@ configure flags
#ifdef XPM
DisplayManager*loginmoveInterval: 10
#endif /* XPM */
+Index: xdm/configure.ac
+===================================================================
--- xdm.orig/configure.ac
+++ xdm/configure.ac
@@ -221,6 +221,12 @@
@@ -190,6 +200,8 @@ configure flags
[Define to pathname where authentication cookie files should be stored])
# -DDEF_GREETER_LIB="$(XDMDIR)/libXdmGreet.so"
+Index: xdm/xdm.man.cpp
+===================================================================
--- xdm.orig/xdm.man.cpp
+++ xdm/xdm.man.cpp
@@ -306,7 +306,7 @@
@@ -201,6 +213,17 @@ configure flags
Can be overridden for specific displays by
DisplayManager.\fIDISPLAY\fP.authFile.
.IP \fBDisplayManager.autoRescan\fP
+@@ -1464,7 +1464,7 @@
+ .I BINDIR/xterm
+ the default session program and failsafe client
+ .TP 20
+-.I XDMDIR/A<display>\-<suffix>
++.I XDMAUTHDIR/authdir/authfiles/A<display>\-<suffix>
+ the default place for authorization files
+ .TP 20
+ .I /tmp/K5C<display>
+Index: xdm/Makefile.am
+===================================================================
--- xdm.orig/Makefile.am
+++ xdm/Makefile.am
@@ -116,6 +116,7 @@
Reply to: