From: Doug Goldstein <cardoe@cardoe.com>
Date: Sun, 16 Jun 2013 19:33:44 +0000 (-0500)
Subject: Move virGetUserEnt() to where its needed
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=b5c5f236bb75d6280ab5a092f00de626c07f77a5;p=libvirt.git

Move virGetUserEnt() to where its needed

In the first if case, virGetUserEnt() isn't necessary so don't bother
calling it before determining we need it.
---

diff --git a/src/util/virutil.c b/src/util/virutil.c
index c5246bcfb6..6fa0212e94 100644
--- a/src/util/virutil.c
+++ b/src/util/virutil.c
@@ -759,12 +759,13 @@ static char *virGetXDGDirectory(const char *xdgenvname, const char *xdgdefdir)
 {
     const char *path = getenv(xdgenvname);
     char *ret = NULL;
-    char *home = virGetUserEnt(geteuid(), VIR_USER_ENT_DIRECTORY);
+    char *home = NULL;
 
     if (path && path[0]) {
         if (virAsprintf(&ret, "%s/libvirt", path) < 0)
             goto no_memory;
     } else {
+        home = virGetUserEnt(geteuid(), VIR_USER_ENT_DIRECTORY);
         if (virAsprintf(&ret, "%s/%s/libvirt", home, xdgdefdir) < 0)
             goto no_memory;
     }