[Pkg-fglrx-devel] Bug#625868: auth event shows secret xauth cookie on command line

[Michael Gilbert]

tag 625868 patch
thanks

can you try the following patch (now using stdin to securely pass the 
secret cookie)?

thanks,
mike

diff -Nru fglrx-driver-11-6/debian/patches/03-authatieventsd.sh.diff fglrx-driver-11-6/debian/patches/03-authatieventsd.sh.diff
--- fglrx-driver-11-6/debian/patches/03-authatieventsd.sh.diff	2010-09-16 12:01:29.000000000 -0400
+++ fglrx-driver-11-6/debian/patches/03-authatieventsd.sh.diff	2011-07-17 18:24:25.000000000 -0400
@@ -1,8 +1,9 @@
 # Make the authatieventsd.sh working on Debian.
 
-diff -Naur fglrx-driver-10-4.orig//common/etc/ati/authatieventsd.sh fglrx-driver-10-4/common/etc/ati/authatieventsd.sh
---- fglrx-driver-10-4.orig//common/etc/ati/authatieventsd.sh	2010-04-15 18:44:15.000000000 +0200
-+++ fglrx-driver-10-4/common/etc/ati/authatieventsd.sh	2010-04-29 19:16:43.000000000 +0200
+Index: fglrx-driver/common/etc/ati/authatieventsd.sh
+===================================================================
+--- fglrx-driver.orig/common/etc/ati/authatieventsd.sh	2011-07-17 17:32:20.000000000 -0400
++++ fglrx-driver/common/etc/ati/authatieventsd.sh	2011-07-17 18:19:26.000000000 -0400
 @@ -42,6 +42,16 @@
          return 0
      fi
@@ -46,13 +47,13 @@
 +	if [ `pinky -fs | awk '{ if ($3 == "'$2'" || $(NF) == "'$2'" ) { print $1; exit; } }'` ]; then
 +		user=`pinky -fs | awk '{ if ($3 == "'$2'" || $(NF) == "'$2'" ) { print $1; exit; } }'`
 +		if [ -n "$DISP_AUTH_KEY" ]; then
-+        		    su $user -c "xauth -f $3 add $2 . $DISP_AUTH_KEY" || exit -1
++		    su $user -c "xauth -f $3 merge - < \"$2 . $DISP_AUTH_KEY\"" || exit -1
 +	        else
 +        	    exit -1
 +		fi
 +	else
 +		if [ -n "$DISP_AUTH_KEY" ]; then
-+        		    xauth -f $3 add $2 . $DISP_AUTH_KEY || exit -1
++		    xauth -f $3 merge - < \"$2 . $DISP_AUTH_KEY\" || exit -1
 +	        else
 +        	    exit -1
 +		fi