- merged 2.6.0.0 from DEVEL

[packages/gdm.git] / gdm-xdmcp.patch

diff --git a/gdm-xdmcp.patch b/gdm-xdmcp.patch
index 3de7bcbdbeec293d4049f93e0f63f6760ce4248f..55b2b90d9669dff3e820a6c42ee3f428608ec535 100644 (file)
--- a/gdm-xdmcp.patch
+++ b/gdm-xdmcp.patch
@@ -1,11 +1,12 @@
---- gdm-2.2.1/daemon/server.c.orig     Sat May  5 11:05:32 2001
-+++ gdm-2.2.1/daemon/server.c  Sat May  5 11:05:46 2001
-@@ -297,7 +297,7 @@
- 
+diff -urN gdm-2.4.2.99.orig/daemon/server.c gdm-2.4.2.99/daemon/server.c
+--- gdm-2.4.2.99.orig/daemon/server.c  Fri Aug  1 01:39:23 2003
++++ gdm-2.4.2.99/daemon/server.c       Fri Aug  1 01:40:23 2003
+@@ -1013,7 +1013,7 @@
          /* Log all output from spawned programs to a file */
-       logfd = open (g_strconcat (GdmLogDir, "/", d->name, ".log", NULL),
--                    O_CREAT|O_TRUNC|O_APPEND|O_WRONLY, 0666);
-+                    O_CREAT|O_TRUNC|O_APPEND|O_WRONLY, 0660);
+       logfile = g_strconcat (GdmLogDir, "/", d->name, ".log", NULL);
+       IGNORE_EINTR (unlink (logfile));
+-      logfd = open (logfile, O_CREAT|O_TRUNC|O_WRONLY|O_EXCL, 0644);
++      logfd = open (logfile, O_CREAT|O_TRUNC|O_WRONLY|O_EXCL, 0640);
  
        if (logfd != -1) {
-               dup2 (logfd, 1);
+               IGNORE_EINTR (dup2 (logfd, 1));