From f0e4beb3287ffbf3d9892b7e86d493cbd3904f1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20Tomko?= Date: Wed, 6 Apr 2016 14:57:21 +0200 Subject: [PATCH] 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. (cherry picked from commit df8964308ed3d7eeb4f15f26e17993b5f7af1c51) --- tools/virt-admin.c | 4 ---- 1 file changed, 4 deletions(-) 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);