From: Roman Bogorodskiy <bogorodskiy@gmail.com>
Date: Thu, 21 Apr 2016 06:32:00 +0000 (+0300)
Subject: virsh: don't override connection URI from argv
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=0217089;p=libvirt.git

virsh: don't override connection URI from argv

Currently, if a connection URI was specified on the command line by the
'-c' switch, virsh connects to it, but after connecting overrides its
value with the one it tries to obtain from the VIRSH_DEFAULT_CONNECT_URI
environment variable.

This makes virsh connecting to the wrong URI if it disconnects from the
hypervisor and then tries to reconnect, and also leaks the original connname.

Fix by calling virGetEnvBlockSUID() before virshParseArgv().
---

diff --git a/tools/virsh.c b/tools/virsh.c
index 0d8ec5c80c..e14410bd5c 100644
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -962,14 +962,14 @@ main(int argc, char **argv)
     if (!vshInit(ctl, cmdGroups, NULL))
         exit(EXIT_FAILURE);
 
+    ctl->connname = vshStrdup(ctl, virGetEnvBlockSUID("VIRSH_DEFAULT_CONNECT_URI"));
+
     if (!virshParseArgv(ctl, argc, argv) ||
         !virshInit(ctl)) {
         virshDeinit(ctl);
         exit(EXIT_FAILURE);
     }
 
-    ctl->connname = vshStrdup(ctl, virGetEnvBlockSUID("VIRSH_DEFAULT_CONNECT_URI"));
-
     if (!ctl->imode) {
         ret = vshCommandRun(ctl, ctl->cmd);
     } else {