External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

esx: Don't overwrite virAuthGet{Username|Password} errors

Browse Source 
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@redhat.com>
Reviewed-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
This commit is contained in:
John Ferlan 2018-08-14 12:30:02 -04:00
parent 39f0f3ae65
commit 359c6365b9
1 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/esx/esx_driver.c
View File

@ -635,20 +635,14 @@ esxConnectToHost(esxPrivate *priv,
if (VIR_STRDUP(username, conn->uri->user) < 0)
goto cleanup;
} else {
username = virAuthGetUsername(conn, auth, "esx", "root", conn->uri->server);
if (!username) {
virReportError(VIR_ERR_AUTH_FAILED, "%s", _("Username request failed"));
if (!(username = virAuthGetUsername(conn, auth, "esx", "root",
conn->uri->server)))
goto cleanup;
}
}
password = virAuthGetPassword(conn, auth, "esx", username, conn->uri->server);
if (!password) {
virReportError(VIR_ERR_AUTH_FAILED, "%s", _("Password request failed"));
if (!(password = virAuthGetPassword(conn, auth, "esx", username,
conn->uri->server)))
goto cleanup;
}
if (virAsprintf(&url, "%s://%s:%d/sdk", priv->parsedUri->transport,
conn->uri->server, conn->uri->port) < 0)
@ -733,20 +727,13 @@ esxConnectToVCenter(esxPrivate *priv,
if (VIR_STRDUP(username, conn->uri->user) < 0)
goto cleanup;
} else {
username = virAuthGetUsername(conn, auth, "esx", "administrator", hostname);
if (!username) {
virReportError(VIR_ERR_AUTH_FAILED, "%s", _("Username request failed"));
if (!(username = virAuthGetUsername(conn, auth, "esx", "administrator",
hostname)))
goto cleanup;
}
}
password = virAuthGetPassword(conn, auth, "esx", username, hostname);
if (!password) {
virReportError(VIR_ERR_AUTH_FAILED, "%s", _("Password request failed"));
if (!(password = virAuthGetPassword(conn, auth, "esx", username, hostname)))
goto cleanup;
}
if (virAsprintf(&url, "%s://%s:%d/sdk", priv->parsedUri->transport,
hostname, conn->uri->port) < 0)