Remove uid param from directory lookup APIs

Remove the uid param from virGetUserConfigDirectory,
virGetUserCacheDirectory, virGetUserRuntimeDirectory,
and virGetUserDirectory

These functions were universally called with the
results of getuid() or geteuid(). To make it practical
to port to Win32, remove the uid parameter and hardcode
geteuid()

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

diff --git a/daemon/libvirtd-config.c b/daemon/libvirtd-config.c
index 8b95969373176d8168bf33068faaa6e27adda1b0..6781e059eeb501ac2fee9893adf27d9e70bc2254 100644 (file)
--- a/daemon/libvirtd-config.c
+++ b/daemon/libvirtd-config.c
@@ -207,7 +207,7 @@ daemonConfigFilePath(bool privileged, char **configfile)
     } else {
         char *configdir = NULL;
 
-        if (!(configdir = virGetUserConfigDirectory(geteuid())))
+        if (!(configdir = virGetUserConfigDirectory()))
             goto error;
 
         if (virAsprintf(configfile, "%s/libvirtd.conf", configdir) < 0) {

diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c
index 943fef4834df066b4e9b138d1d9973689c88c478..c74cd43092bf97a7d6a3ed92af820e32c885c14b 100644 (file)
--- a/daemon/libvirtd.c
+++ b/daemon/libvirtd.c
@@ -242,7 +242,7 @@ daemonPidFilePath(bool privileged,
         char *rundir = NULL;
         mode_t old_umask;
 
-        if (!(rundir = virGetUserRuntimeDirectory(geteuid())))
+        if (!(rundir = virGetUserRuntimeDirectory()))
             goto error;
 
         old_umask = umask(077);
@@ -290,7 +290,7 @@ daemonUnixSocketPaths(struct daemonConfig *config,
             char *rundir = NULL;
             mode_t old_umask;
 
-            if (!(rundir = virGetUserRuntimeDirectory(geteuid())))
+            if (!(rundir = virGetUserRuntimeDirectory()))
                 goto error;
 
             old_umask = umask(077);
@@ -634,7 +634,7 @@ daemonSetupLogging(struct daemonConfig *config,
                                 LOCALSTATEDIR) == -1)
                     goto no_memory;
             } else {
-                char *logdir = virGetUserCacheDirectory(geteuid());
+                char *logdir = virGetUserCacheDirectory();
                 mode_t old_umask;
 
                 if (!logdir)
@@ -783,7 +783,7 @@ static int migrateProfile(void)
     int ret = -1;
     mode_t old_umask;
 
-    if (!(home = virGetUserDirectory(geteuid())))
+    if (!(home = virGetUserDirectory()))
         goto cleanup;
 
     if (virAsprintf(&old_base, "%s/.libvirt", home) < 0) {
@@ -791,7 +791,7 @@ static int migrateProfile(void)
     }
 
     /* if the new directory is there or the old one is not: do nothing */
-    if (!(config_dir = virGetUserConfigDirectory(geteuid())))
+    if (!(config_dir = virGetUserConfigDirectory()))
         goto cleanup;
 
     if (!virFileIsDir(old_base) || virFileExists(config_dir)) {
@@ -1112,7 +1112,7 @@ int main(int argc, char **argv) {
     if (privileged) {
         run_dir = strdup(LOCALSTATEDIR "/run/libvirt");
     } else {
-        run_dir = virGetUserRuntimeDirectory(geteuid());
+        run_dir = virGetUserRuntimeDirectory();
 
         if (!run_dir) {
             VIR_ERROR(_("Can't determine user directory"));

diff --git a/src/libvirt.c b/src/libvirt.c
index 8900011c1ee603b54b1392e0cfa964b8f3364021..ba504c0591e397f6ac13ef8dffb44e2799fa2c9e 100644 (file)
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -926,7 +926,7 @@ virConnectGetConfigFilePath(void)
                         SYSCONFDIR) < 0)
             goto no_memory;
     } else {
-        char *userdir = virGetUserConfigDirectory(geteuid());
+        char *userdir = virGetUserConfigDirectory();
         if (!userdir)
             goto error;
 

diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index cea87c24489eb5bf0564b3f679c140373e0152dd..5f3132c4cda6fc9cb398c16a49804b06d3520b4c 100644 (file)
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -260,7 +260,6 @@ networkAutostartConfigs(struct network_driver *driver) {
  */
 static int
 networkStartup(int privileged) {
-    uid_t uid = geteuid();
     char *base = NULL;
 
     if (VIR_ALLOC(driverState) < 0)
@@ -280,7 +279,7 @@ networkStartup(int privileged) {
         if ((base = strdup (SYSCONFDIR "/libvirt")) == NULL)
             goto out_of_memory;
     } else {
-        char *userdir = virGetUserCacheDirectory(uid);
+        char *userdir = virGetUserCacheDirectory();
 
         if (!userdir)
             goto error;
@@ -292,7 +291,7 @@ networkStartup(int privileged) {
         }
         VIR_FREE(userdir);
 
-        userdir = virGetUserConfigDirectory(uid);
+        userdir = virGetUserConfigDirectory();
         if (virAsprintf(&base, "%s", userdir) == -1) {
             VIR_FREE(userdir);
             goto out_of_memory;

diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c
index 3d732ab12cee4eb30d886c5ddaf0a3e74e41ffe2..efb9182fb40dec6822693cefa951e3f8f124d12d 100644 (file)
--- a/src/nwfilter/nwfilter_driver.c
+++ b/src/nwfilter/nwfilter_driver.c
@@ -86,8 +86,7 @@ nwfilterDriverStartup(int privileged) {
         if ((base = strdup (SYSCONFDIR "/libvirt")) == NULL)
             goto out_of_memory;
     } else {
-        uid_t uid = geteuid();
-        base = virGetUserConfigDirectory(uid);
+        base = virGetUserConfigDirectory();
         if (!base)
             goto error;
     }

diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c
index dc2a95f9b35d961b52bf5d05a7be8503a0d420b5..5136fbc11e78f1a881be6e3548300181eefb5490 100644 (file)
--- a/src/phyp/phyp_driver.c
+++ b/src/phyp/phyp_driver.c
@@ -977,7 +977,7 @@ openSSHSession(virConnectPtr conn, virConnectAuthPtr auth,
     int ret;
     char *pubkey = NULL;
     char *pvtkey = NULL;
-    char *userhome = virGetUserDirectory(geteuid());
+    char *userhome = virGetUserDirectory();
     struct stat pvt_stat, pub_stat;
 
     if (userhome == NULL)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 39b27b18b01505a37e9d6037e9eead380ebb0284..1864959d29b9044eee66f551fcc899b3e3ecb21b 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -523,11 +523,10 @@ qemudStartup(int privileged) {
                         "%s/lib/libvirt/qemu/dump", LOCALSTATEDIR) == -1)
             goto out_of_memory;
     } else {
-        uid_t uid = geteuid();
         char *rundir;
         char *cachedir;
 
-        cachedir = virGetUserCacheDirectory(uid);
+        cachedir = virGetUserCacheDirectory();
         if (!cachedir)
             goto error;
 
@@ -542,7 +541,7 @@ qemudStartup(int privileged) {
         }
         VIR_FREE(cachedir);
 
-        rundir = virGetUserRuntimeDirectory(uid);
+        rundir = virGetUserRuntimeDirectory();
         if (!rundir)
             goto error;
         if (virAsprintf(&qemu_driver->stateDir, "%s/qemu/run", rundir) == -1) {
@@ -551,7 +550,7 @@ qemudStartup(int privileged) {
         }
         VIR_FREE(rundir);
 
-        base = virGetUserConfigDirectory(uid);
+        base = virGetUserConfigDirectory();
         if (!base)
             goto error;
         if (virAsprintf(&qemu_driver->libDir, "%s/qemu/lib", base) == -1)

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 5c87561383600e6bcf36949845f0816a2f3f4979..299cd694345b2a1add9fc7a67049294d8f1e391e 100644 (file)
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -578,7 +578,7 @@ doRemoteOpen (virConnectPtr conn,
     case trans_unix:
         if (!sockname) {
             if (flags & VIR_DRV_OPEN_REMOTE_USER) {
-                char *userdir = virGetUserRuntimeDirectory(getuid());
+                char *userdir = virGetUserRuntimeDirectory();
 
                 if (!userdir)
                     goto failed;

diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c
index 7440c7a97a78720cf0963faf552a6dd16cbe3784..bf9208890e4ab230df9e6b77786a76e3dd9973e9 100644 (file)
--- a/src/rpc/virnettlscontext.c
+++ b/src/rpc/virnettlscontext.c
@@ -774,7 +774,7 @@ static int virNetTLSContextLocateCredentials(const char *pkipath,
         /* Check to see if $HOME/.pki contains at least one of the
          * files and if so, use that
          */
-        userdir = virGetUserDirectory(getuid());
+        userdir = virGetUserDirectory();
 
         if (!userdir)
             goto out_of_memory;

diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c
index f3fcce2332baca319673f25880c67b635113dd78..49ca29b6ee58b7a998531824830ed0ed26e362b8 100644 (file)
--- a/src/secret/secret_driver.c
+++ b/src/secret/secret_driver.c
@@ -1012,8 +1012,7 @@ secretDriverStartup(int privileged)
         if (base == NULL)
             goto out_of_memory;
     } else {
-        uid_t uid = geteuid();
-        base = virGetUserConfigDirectory(uid);
+        base = virGetUserConfigDirectory();
         if (!base)
             goto error;
     }

diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c
index fd762c0443cf758fd8eb4401e8b22dbc1306dc58..88f3809064188327eac24b9f232df1411ba797f6 100644 (file)
--- a/src/storage/storage_driver.c
+++ b/src/storage/storage_driver.c
@@ -145,8 +145,7 @@ storageDriverStartup(int privileged)
         if ((base = strdup (SYSCONFDIR "/libvirt")) == NULL)
             goto out_of_memory;
     } else {
-        uid_t uid = geteuid();
-        base = virGetUserConfigDirectory(uid);
+        base = virGetUserConfigDirectory();
         if (!base)
             goto error;
     }

diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c
index 65f9cbc9fbcf188dde2936deb11be2a75d3c1672..219246dcbb1013310c389601150262c3dc6a1104 100644 (file)
--- a/src/uml/uml_driver.c
+++ b/src/uml/uml_driver.c
@@ -392,7 +392,6 @@ cleanup:
 static int
 umlStartup(int privileged)
 {
-    uid_t uid = geteuid();
     char *base = NULL;
     char *userdir = NULL;
 
@@ -418,7 +417,7 @@ umlStartup(int privileged)
     if (!uml_driver->domainEventState)
         goto error;
 
-    userdir = virGetUserDirectory(uid);
+    userdir = virGetUserDirectory();
     if (!userdir)
         goto error;
 
@@ -434,7 +433,7 @@ umlStartup(int privileged)
                         "%s/run/libvirt/uml-guest", LOCALSTATEDIR) == -1)
             goto out_of_memory;
     } else {
-        base = virGetUserConfigDirectory(uid);
+        base = virGetUserConfigDirectory();
         if (!base)
             goto error;
 

diff --git a/src/util/util.c b/src/util/util.c
index ee48504b72fc70d8853d26e622d967a2fa6f59b9..a744ed62ae15aef3efa11b313ebc0117e3f3ff0e 100644 (file)
--- a/src/util/util.c
+++ b/src/util/util.c
@@ -2305,19 +2305,16 @@ static char *virGetGroupEnt(gid_t gid)
     return ret;
 }
 
-char *virGetUserDirectory(uid_t uid)
+char *virGetUserDirectory(void)
 {
-    return virGetUserEnt(uid, VIR_USER_ENT_DIRECTORY);
+    return virGetUserEnt(geteuid(), VIR_USER_ENT_DIRECTORY);
 }
 
-static char *virGetXDGDirectory(uid_t uid, const char *xdgenvname, const char *xdgdefdir)
+static char *virGetXDGDirectory(const char *xdgenvname, const char *xdgdefdir)
 {
-    const char *path = NULL;
+    const char *path = getenv(xdgenvname);
     char *ret = NULL;
-    char *home = virGetUserEnt(uid, VIR_USER_ENT_DIRECTORY);
-
-    if (uid == getuid())
-        path = getenv(xdgenvname);
+    char *home = virGetUserEnt(geteuid(), VIR_USER_ENT_DIRECTORY);
 
     if (path && path[0]) {
         if (virAsprintf(&ret, "%s/libvirt", path) < 0)
@@ -2335,25 +2332,22 @@ static char *virGetXDGDirectory(uid_t uid, const char *xdgenvname, const char *x
     goto cleanup;
 }
 
-char *virGetUserConfigDirectory(uid_t uid)
+char *virGetUserConfigDirectory(void)
 {
-    return virGetXDGDirectory(uid, "XDG_CONFIG_HOME", ".config");
+    return virGetXDGDirectory("XDG_CONFIG_HOME", ".config");
 }
 
-char *virGetUserCacheDirectory(uid_t uid)
+char *virGetUserCacheDirectory(void)
 {
-     return virGetXDGDirectory(uid, "XDG_CACHE_HOME", ".cache");
+     return virGetXDGDirectory("XDG_CACHE_HOME", ".cache");
 }
 
-char *virGetUserRuntimeDirectory(uid_t uid)
+char *virGetUserRuntimeDirectory(void)
 {
-    const char *path = NULL;
-
-    if (uid == getuid ())
-        path = getenv("XDG_RUNTIME_DIR");
+    const char *path = getenv("XDG_RUNTIME_DIR");
 
     if (!path || !path[0]) {
-        return virGetUserCacheDirectory(uid);
+        return virGetUserCacheDirectory();
     } else {
         char *ret;
 
@@ -2551,7 +2545,7 @@ error:
 #else /* HAVE_GETPWUID_R */
 
 char *
-virGetUserDirectory(uid_t uid ATTRIBUTE_UNUSED)
+virGetUserDirectory(void)
 {
     virUtilError(VIR_ERR_INTERNAL_ERROR,
                  "%s", _("virGetUserDirectory is not available"));

diff --git a/src/util/util.h b/src/util/util.h
index f5fa87659f0e79fa4b0b411c7ee2aeb2c8f7af37..b45f2b986b25b3d12bb62cac479fa6624d712af0 100644 (file)
--- a/src/util/util.h
+++ b/src/util/util.h
@@ -228,10 +228,10 @@ char *virGetHostname(virConnectPtr conn);
 
 int virKillProcess(pid_t pid, int sig);
 
-char *virGetUserDirectory(uid_t uid);
-char *virGetUserConfigDirectory(uid_t uid);
-char *virGetUserCacheDirectory(uid_t uid);
-char *virGetUserRuntimeDirectory(uid_t uid);
+char *virGetUserDirectory(void);
+char *virGetUserConfigDirectory(void);
+char *virGetUserCacheDirectory(void);
+char *virGetUserRuntimeDirectory(void);
 char *virGetUserName(uid_t uid);
 char *virGetGroupName(gid_t gid);
 int virGetUserID(const char *name,

diff --git a/src/util/virauth.c b/src/util/virauth.c
index 92ecb7c18a4e40f489dea129ae9b59c708d49ce1..5412ca65387fc3abf79b375477ebb306de733424 100644 (file)
--- a/src/util/virauth.c
+++ b/src/util/virauth.c
@@ -65,7 +65,7 @@ int virAuthGetConfigFilePath(virConnectPtr conn,
         }
     }
 
-    if (!(userdir = virGetUserConfigDirectory(geteuid())))
+    if (!(userdir = virGetUserConfigDirectory()))
         goto cleanup;
 
     if (virAsprintf(path, "%s/auth.conf", userdir) < 0)

diff --git a/tools/virsh.c b/tools/virsh.c
index 4492a2b539f5737311a86c8d7b47bb8accd17af3..d273c25bf9fafe33b67627c501086bec1bc249ab 100644 (file)
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -15674,8 +15674,7 @@ cmdCd(vshControl *ctl, const vshCmd *cmd)
     }
 
     if (vshCommandOptString(cmd, "dir", &dir) <= 0) {
-        uid_t uid = geteuid();
-        dir = dir_malloced = virGetUserDirectory(uid);
+        dir = dir_malloced = virGetUserDirectory();
     }
     if (!dir)
         dir = "/";
@@ -19872,7 +19871,7 @@ vshReadlineInit(vshControl *ctl)
     stifle_history(500);
 
     /* Prepare to read/write history from/to the $XDG_CACHE_HOME/virsh/history file */
-    userdir = virGetUserCacheDirectory(getuid());
+    userdir = virGetUserCacheDirectory();
 
     if (userdir == NULL) {
         vshError(ctl, "%s", _("Could not determine home directory"));