From: Cole Robinson <crobinso@redhat.com>
Date: Wed, 20 Jul 2011 18:11:43 +0000 (-0400)
Subject: rpc: Pass through DISPLAY so ssh can launch askpass
X-Git-Tag: v0.9.4-rc1~110
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0a21dfef4a6ba9d09386cbedd2322aede0114dc;p=thirdparty%2Flibvirt.git

rpc: Pass through DISPLAY so ssh can launch askpass

Though we prefer users to have SSH keys setup, virt-manager users still
depend on remote SSH connections to launch a password dialog. This fixes
launch ssh-askpass

Fix suggested by danpb
---

diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
index 4403fc47dd..6605aa3e15 100644
--- a/src/rpc/virnetsocket.c
+++ b/src/rpc/virnetsocket.c
@@ -604,6 +604,7 @@ int virNetSocketNewConnectSSH(const char *nodename,
     virCommandAddEnvPassCommon(cmd);
     virCommandAddEnvPass(cmd, "SSH_AUTH_SOCK");
     virCommandAddEnvPass(cmd, "SSH_ASKPASS");
+    virCommandAddEnvPass(cmd, "DISPLAY");
     virCommandClearCaps(cmd);
 
     if (service)