mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-22 21:55:25 +00:00
test: 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. Signed-off-by: John Ferlan <jferlan@redhat.com> Reviewed-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com>
This commit is contained in:
parent
e456575e6f
commit
a9a476e3fb
@ -1374,12 +1374,9 @@ testConnectAuthenticate(virConnectPtr conn,
|
||||
/* Authentication is required because the test XML contains a
|
||||
* non-empty <auth/> section. First we must ask for a username.
|
||||
*/
|
||||
username = virAuthGetUsername(conn, auth, "test", NULL, "localhost"/*?*/);
|
||||
if (!username) {
|
||||
virReportError(VIR_ERR_AUTH_FAILED, "%s",
|
||||
_("authentication failed when asking for username"));
|
||||
if (!(username = virAuthGetUsername(conn, auth, "test", NULL,
|
||||
"localhost"/*?*/)))
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
/* Does the username exist? */
|
||||
for (i = 0; i < privconn->numAuths; ++i) {
|
||||
@ -1391,14 +1388,10 @@ testConnectAuthenticate(virConnectPtr conn,
|
||||
found_user:
|
||||
/* Even if we didn't find the user, we still ask for a password. */
|
||||
if (i == -1 || privconn->auths[i].password != NULL) {
|
||||
password = virAuthGetPassword(conn, auth, "test",
|
||||
username, "localhost");
|
||||
if (password == NULL) {
|
||||
virReportError(VIR_ERR_AUTH_FAILED, "%s",
|
||||
_("authentication failed when asking for password"));
|
||||
if (!(password = virAuthGetPassword(conn, auth, "test", username,
|
||||
"localhost")))
|
||||
goto cleanup;
|
||||
}
|
||||
}
|
||||
|
||||
if (i == -1 ||
|
||||
(password && STRNEQ(privconn->auths[i].password, password))) {
|
||||
|
Loading…
Reference in New Issue
Block a user