[libvirt] [PATCH 07/11] hyperv: Don't overwrite virAuthGet{Username|Password} errors
Now that the virAuthGet*Path API's generate all the error messages
we can remove them from the callers. This means that we will no
longer overwrite the error from the API.
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
src/hyperv/hyperv_driver.c | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c
index 7ca145aef5..f41cd1c939 100644
--- a/src/hyperv/hyperv_driver.c
+++ b/src/hyperv/hyperv_driver.c
@@ -152,21 +152,15 @@ hypervConnectOpen(virConnectPtr conn, virConnectAuthPtr auth,
if (VIR_STRDUP(username, conn->uri->user) < 0)
goto cleanup;
} else {
- username = virAuthGetUsername(conn, auth, "hyperv",
"administrator", conn->uri->server);
-
- if (username == NULL) {
- virReportError(VIR_ERR_AUTH_FAILED, "%s", _("Username request
failed"));
+ if (!(username = virAuthGetUsername(conn, auth, "hyperv",
+ "administrator",
+ conn->uri->server)))
goto cleanup;
- }
}
- password = virAuthGetPassword(conn, auth, "hyperv", username,
conn->uri->server);
-
- if (password == NULL) {
- virReportError(VIR_ERR_AUTH_FAILED, "%s", _("Password request
failed"));
+ if (!(password = virAuthGetPassword(conn, auth, "hyperv", username,
+ conn->uri->server)))
goto cleanup;
- }
-
if (hypervInitConnection(conn, priv, username, password) < 0)
goto cleanup;
--
2.17.1