- merge from DEVEL

Changed files:
    gdm-xdmcp.patch -> 1.10

diff --git a/gdm-xdmcp.patch b/gdm-xdmcp.patch
index 06ed096a19dbab195e4397c632b149b872822d08..c41d087b4ae3f03421a27cd5c7ae7322d40df5aa 100644 (file)
--- a/gdm-xdmcp.patch
+++ b/gdm-xdmcp.patch
@@ -1,12 +1,11 @@
-diff -aurN gdm-2.13.0.7.orig/daemon/server.c gdm-2.13.0.7/daemon/server.c
---- gdm-2.13.0.7.orig/daemon/server.c  2006-01-19 00:32:50.000000000 +0100
-+++ gdm-2.13.0.7/daemon/server.c       2006-02-05 17:12:06.557522000 +0100
-@@ -1150,7 +1150,7 @@
-         /* Log all output from spawned programs to a file */
-       logfile = gdm_make_filename (gdm_get_value_string (GDM_KEY_LOG_DIR), d->name, ".log");
-       VE_IGNORE_EINTR (g_unlink (logfile));
--      VE_IGNORE_EINTR (logfd = open (logfile, O_CREAT|O_TRUNC|O_WRONLY|O_EXCL, 0644));
-+      VE_IGNORE_EINTR (logfd = open (logfile, O_CREAT|O_TRUNC|O_WRONLY|O_EXCL, 0640));
+--- gdm-2.24.0.orig/daemon/gdm-server.c        2008-10-03 00:53:12.000000000 +0200
++++ gdm-2.24.0/daemon/gdm-server.c     2008-10-03 00:53:57.000000000 +0200
+@@ -419,7 +419,7 @@
+         g_debug ("GdmServer: Opening logfile for server %s", log_path);
+ 
+         VE_IGNORE_EINTR (g_unlink (log_path));
+-        VE_IGNORE_EINTR (logfd = open (log_path, O_CREAT|O_TRUNC|O_WRONLY|O_EXCL, 0644));
++        VE_IGNORE_EINTR (logfd = open (log_path, O_CREAT|O_TRUNC|O_WRONLY|O_EXCL, 0640));
+ 
+         g_free (log_path);
  
-       if (logfd != -1) {
-               VE_IGNORE_EINTR (dup2 (logfd, 1));