Author: dnusinow
Date: 2005-07-03 15:28:29 -0500 (Sun, 03 Jul 2005)
New Revision: 307
Modified:
trunk/debian/patches/078_xdm_log_sourcing_better.diff
Log:
- De-fuzz patch 078
Modified: trunk/debian/patches/078_xdm_log_sourcing_better.diff
===================================================================
--- trunk/debian/patches/078_xdm_log_sourcing_better.diff 2005-07-03
19:27:06 UTC (rev 306)
+++ trunk/debian/patches/078_xdm_log_sourcing_better.diff 2005-07-03
20:28:29 UTC (rev 307)
@@ -1,34 +1,16 @@
-$Id: 078_xdm_log_sourcing_better.diff 1214 2004-03-31 22:27:25Z branden $
-
-Improve logging of xdm's script handling.
-
-* Make execution of the session program an informational log message (with
- LogInfo()), not a Debug() message.
-* Ensure that source()d scripts (Xreset, Xsetup, Xstartup) can be
- fopen()ed before invoking runAndWait() on them. If they can, LogInfo()
- the fact. If they cannot, LogInfo() that, too, and use _SysErrorMsg() to
- report why fopen() failed.
-* Make source() complain using Debug() when it is given a null pointer in
- its file argument.
-* For clarity, make source() return from only one location.
-
-Also see Debian bug #219311.
-
-This patch by Branden Robinson.
-
diff -ruN xc-old/programs/xdm/session.c xc/programs/xdm/session.c
---- xc-old/programs/xdm/session.c 2004-04-23 19:54:42.000000000 +0000
-+++ xc/programs/xdm/session.c 2004-10-26 11:11:11.848083336 +0000
-@@ -731,7 +731,7 @@
- verify->userEnviron = setEnv(verify->userEnviron, "HOME", "/");
+--- xc-old/programs/xdm/session.c 2005-07-03 15:53:54.000000000 -0400
++++ xc/programs/xdm/session.c 2005-07-03 16:00:12.000000000 -0400
+@@ -735,7 +735,7 @@
+ verify->userEnviron = setEnv (verify->userEnviron, "HOME", "/");
}
if (verify->argv) {
- Debug ("executing session %s\n", verify->argv[0]);
+ LogInfo ("executing session %s\n", verify->argv[0]);
execute (verify->argv, verify->userEnviron);
- LogError ("Session \"%s\" execution failed (err %d)\n",
verify->argv[0], errno);
+ LogError ("session \"%s\" execution failed (err %d)\n",
verify->argv[0], errno);
} else {
-@@ -759,21 +759,28 @@
+@@ -763,21 +763,28 @@
source (char **environ, char *file)
{
char **args, *args_safe[2];
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
