On 11/28/2011 05:21 AM, Daniel P. Berrange wrote:
On Mon, Nov 28, 2011 at 01:15:25PM +0100, Christian Franke wrote:
> When spawning an ssh connection, the environment variables
> DISPLAY, SSH_ASKPASS, ... are passed. However XAUTHORITY,
> which is neccessary if the .Xauthority is in a non default
s/neccessary/necessary/
> place, was not passed.
>
> Signed-off-by: Christian Franke <nobody(a)nowhere.ws>
Cute address - it threw me for a loop on my first read.
> ---
> src/rpc/virnetsocket.c | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
> index b733095..2747f66 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)
ACK
I've pushed this, as well as adding Christian to AUTHORS; let me know if
I need to update any preferred spellings.
--
Eric Blake eblake(a)redhat.com +1-919-301-3266
Libvirt virtualization library
http://libvirt.org