NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove uid param from directory lookup APIs

Browse Source 
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>
This commit is contained in:
Daniel P. Berrange
2012-05-24 13:29:42 +01:00
parent 83fe3d22e2
commit 517368a377
16 changed files with 41 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
daemon/libvirtd-config.c
View File

@@ -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) {

12
daemon/libvirtd.c
View File

@@ -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"));