提交 eb945f80 编写于 作者: F Fabiano Fidêncio

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

virGetUserRuntimeDirectory() *never* *ever* returns NULL, making the
checks for it completely unnecessary.
Signed-off-by: NFabiano Fidêncio <fidencio@redhat.com>
Reviewed-by: NJán Tomko <jtomko@redhat.com>
上级 b0ffed92
......@@ -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);
......
......@@ -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 {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册