External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-17 23:27:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

rpc: Don't check the output of virGetUserDirectory()

Browse Source 
virGetUserDirectory() *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 09:23:58 +01:00
parent 998cd53722
commit a4aaed6165
2 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/rpc/virnetclient.c
View File

@ -466,10 +466,8 @@ virNetClientPtr virNetClientNewLibSSH2(const char *host,
privkey = g_strdup(privkeyPath);
} else {
homedir = virGetUserDirectory();
if (homedir) {
if (virNetClientFindDefaultSshKey(homedir, &privkey) < 0)
goto no_memory;
}
if (virNetClientFindDefaultSshKey(homedir, &privkey) < 0)
goto no_memory;
}
if (!authMethods) {
@ -566,10 +564,8 @@ virNetClientPtr virNetClientNewLibssh(const char *host,
privkey = g_strdup(privkeyPath);
} else {
homedir = virGetUserDirectory();
if (homedir) {
if (virNetClientFindDefaultSshKey(homedir, &privkey) < 0)
goto no_memory;
}
if (virNetClientFindDefaultSshKey(homedir, &privkey) < 0)
goto no_memory;
}
if (!authMethods) {

12
src/rpc/virnettlscontext.c
View File

@ -805,9 +805,6 @@ static int virNetTLSContextLocateCredentials(const char *pkipath,
*/
userdir = virGetUserDirectory();
if (!userdir)
goto error;
user_pki_path = g_strdup_printf("%s/.pki/libvirt", userdir);
VIR_DEBUG("Trying to find TLS user credentials in %s", user_pki_path);
@ -864,15 +861,6 @@ static int virNetTLSContextLocateCredentials(const char *pkipath,
VIR_FREE(userdir);
return 0;
error:
VIR_FREE(*cacert);
VIR_FREE(*cacrl);
VIR_FREE(*key);
VIR_FREE(*cert);
VIR_FREE(user_pki_path);
VIR_FREE(userdir);
return -1;
}