openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

remote: Don't check the output of virGetUserRuntimeDirectory() 

virGetUserRuntimeDirectory() *never* *ever* returns NULL, making the
checks for it completely unnecessary.

Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Fabiano Fidêncio 2019-12-19 10:21:40 +01:00
parent b0ffed92f1
commit eb945f802c
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/remote/remote_daemon.c
View File

@ -245,8 +245,7 @@ daemonUnixSocketPaths(struct daemonConfig *config,
} else {
mode_t old_umask;
if (!(rundir = virGetUserRuntimeDirectory()))
goto cleanup;
rundir = virGetUserRuntimeDirectory();
old_umask = umask(077);
if (virFileMakePath(rundir) < 0) {
@ -1208,11 +1207,6 @@ int main(int argc, char **argv) {
run_dir = g_strdup(RUNSTATEDIR "/libvirt");
} else {
run_dir = virGetUserRuntimeDirectory();
if (!run_dir) {
VIR_ERROR(_("Can't determine user directory"));
goto cleanup;
}
}
if (privileged)
old_umask = umask(022);

3
src/remote/remote_driver.c
View File

@ -779,8 +779,7 @@ remoteGetUNIXSocketHelper(remoteDriverTransport transport,
remoteDriverTransportTypeToString(transport));
return NULL;
}
if (!(userdir = virGetUserRuntimeDirectory()))
return NULL;
userdir = virGetUserRuntimeDirectory();
sockname = g_strdup_printf("%s/%s-sock", userdir, sock_prefix);
} else {