From a4aaed6165ba22d2f2186d42c72b7e77d905812c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Thu, 19 Dec 2019 09:23:58 +0100 Subject: [PATCH] rpc: Don't check the output of virGetUserDirectory() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit virGetUserDirectory() *never* *ever* returns NULL, making the checks for it completely unnecessary. Signed-off-by: Fabiano Fidêncio Reviewed-by: Ján Tomko --- src/rpc/virnetclient.c | 12 ++++-------- src/rpc/virnettlscontext.c | 12 ------------ 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index 1b882a261a..40e5fa35e2 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -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) { diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c index ec9dd35c46..08944f6771 100644 --- a/src/rpc/virnettlscontext.c +++ b/src/rpc/virnettlscontext.c @@ -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; }