From: Ján Tomko <jtomko@redhat.com>
Date: Wed, 6 Apr 2016 12:57:21 +0000 (+0200)
Subject: virt-admin: get rid of LIBVIRT_DEFAULT_ADMIN_URI env var
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=df8964308ed3d7eeb4f15f26e17993b5f7af1c51;p=libvirt.git

virt-admin: get rid of LIBVIRT_DEFAULT_ADMIN_URI env var

There is a LIBVIRT_ADMIN_DEFAULT_URI environment variable
which is honored by virAdmConnectOpen and documented
in the virt-admin man page.

LIBVIRT_DEFAULT_ADMIN_URI is undocumented and this is its
only occurrence.
---

diff --git a/tools/virt-admin.c b/tools/virt-admin.c
index edb8690af4..f0a49a3895 100644
--- a/tools/virt-admin.c
+++ b/tools/virt-admin.c
@@ -670,7 +670,6 @@ main(int argc, char **argv)
 {
     vshControl _ctl, *ctl = &_ctl;
     vshAdmControl virtAdminCtl;
-    const char *defaultConn;
     bool ret = true;
 
     memset(ctl, 0, sizeof(vshControl));
@@ -719,9 +718,6 @@ main(int argc, char **argv)
 
     virFileActivateDirOverride(argv[0]);
 
-    if ((defaultConn = virGetEnvBlockSUID("LIBVIRT_DEFAULT_ADMIN_URI")))
-        ctl->connname = vshStrdup(ctl, defaultConn);
-
     if (!vshInit(ctl, cmdGroups, NULL))
         exit(EXIT_FAILURE);