From: Christian Franke <nobody@nowhere.ws>
Date: Mon, 28 Nov 2011 12:15:25 +0000 (+0100)
Subject: virnetsocket: pass XAUTORITY for ssh connection
X-Git-Tag: v0.9.8-rc1~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d360795d608105652d64656a93b6221c35fbaf5a;p=thirdparty%2Flibvirt.git

virnetsocket: pass XAUTORITY for ssh connection

When spawning an ssh connection, the environment variables
DISPLAY, SSH_ASKPASS, ... are passed. However XAUTHORITY,
which is necessary if the .Xauthority is in a non default
place, was not passed.

Signed-off-by: Christian Franke <nobody@nowhere.ws>
---

diff --git a/AUTHORS b/AUTHORS
index 59d94626af..b22e3a2a29 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -209,6 +209,7 @@ Patches have also been contributed by:
   Srivatsa S. Bhat     <srivatsa.bhat@linux.vnet.ibm.com>
   Chang Liu            <lingjiao.lc@taobao.com>
   Lorin Hochstein      <lorin@isi.edu>
+  Christian Franke     <nobody@nowhere.ws>
 
   [....send patches to get your name here....]
 
diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
index b733095876..2747f66c6f 100644
--- a/src/rpc/virnetsocket.c
+++ b/src/rpc/virnetsocket.c
@@ -628,6 +628,7 @@ int virNetSocketNewConnectSSH(const char *nodename,
     virCommandAddEnvPass(cmd, "SSH_AUTH_SOCK");
     virCommandAddEnvPass(cmd, "SSH_ASKPASS");
     virCommandAddEnvPass(cmd, "DISPLAY");
+    virCommandAddEnvPass(cmd, "XAUTHORITY");
     virCommandClearCaps(cmd);
 
     if (service)