packages: libgnomesu/libgnomesu-xauth-nolookup.patch (NEW) - merged from Op...

[hawk]

Author: hawk                         Date: Thu Nov 25 09:35:21 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merged from OpenSUSE: change xauth calls to not cause dns lookups,
  to avoid hangs

---- Files affected:
packages/libgnomesu:
   libgnomesu-xauth-nolookup.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/libgnomesu/libgnomesu-xauth-nolookup.patch
diff -u /dev/null packages/libgnomesu/libgnomesu-xauth-nolookup.patch:1.1
--- /dev/null	Thu Nov 25 10:35:21 2010
+++ packages/libgnomesu/libgnomesu-xauth-nolookup.patch	Thu Nov 25 10:35:16 2010
@@ -0,0 +1,27 @@
+diff -upr libgnomesu-1.0.0/su-backend/common.c libgnomesu-1.0.0-new/su-backend/common.c
+--- libgnomesu-1.0.0/su-backend/common.c	2005-01-28 09:12:18.000000000 -0600
++++ libgnomesu-1.0.0-new/su-backend/common.c	2005-10-17 17:13:21.000000000 -0500
+@@ -84,13 +84,12 @@ saveXauth (void)
+ 	gchar line[1024];
+ 
+ 	/* Save X authorization data for after we changed identity */
+-	p = popen ("xauth list", "r");
++	p = popen ("xauth nlist", "r");
+ 	if (!p) return;
+ 
+ 	data = g_string_new ("");
+ 	while (!feof (p) && fgets (line, sizeof (line), p))
+ 	{
+-		g_string_append (data, "add ");
+ 		g_string_append (data, line);
+ 	}
+ 	pclose (p);
+@@ -196,7 +195,7 @@ change_identity (const struct passwd *pw
+ 
+ 	/* Create a new .Xauthorization file */
+ 	if (!xauth_data) return;
+-	p = popen ("xauth -q 2>/dev/null", "w");
++	p = popen ("xauth -q nmerge - 2>/dev/null", "w");
+ 	if (!p) return;
+ 
+ 	fwrite (xauth_data, strlen (xauth_data), 1, p);
================================================================