提交 359c6365 编写于 作者: J John Ferlan

esx: 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: NJohn Ferlan <jferlan@redhat.com>
Reviewed-by: NMarcos Paulo de Souza <marcos.souza.org@gmail.com>
上级 39f0f3ae
......@@ -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)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册