External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

virnetsshsession: Don't check return value of 'virNetSSHSessionAuthMethodNew'

Browse Source 
The function can't return NULL to the callers so it doesn't make sense
to check it.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2023-01-23 16:41:55 +01:00
parent 6aed6becec
commit c68a07eeb3
1 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/rpc/virnetsshsession.c
View File

@ -981,17 +981,11 @@ virNetSSHSessionAuthAddPasswordAuth(virNetSSHSession *sess,
} }
} }
if (!(auth = virNetSSHSessionAuthMethodNew(sess))) auth = virNetSSHSessionAuthMethodNew(sess);
goto error;
auth->method = VIR_NET_SSH_AUTH_PASSWORD; auth->method = VIR_NET_SSH_AUTH_PASSWORD;
virObjectUnlock(sess); virObjectUnlock(sess);
return 0; return 0;
error:
virObjectUnlock(sess);
return -1;
} }
int int
@ -1001,17 +995,11 @@ virNetSSHSessionAuthAddAgentAuth(virNetSSHSession *sess)
virObjectLock(sess); virObjectLock(sess);
if (!(auth = virNetSSHSessionAuthMethodNew(sess))) auth = virNetSSHSessionAuthMethodNew(sess);
goto error;
auth->method = VIR_NET_SSH_AUTH_AGENT; auth->method = VIR_NET_SSH_AUTH_AGENT;
virObjectUnlock(sess); virObjectUnlock(sess);
return 0; return 0;
error:
virObjectUnlock(sess);
return -1;
} }
int int
@ -1028,11 +1016,7 @@ virNetSSHSessionAuthAddPrivKeyAuth(virNetSSHSession *sess,
virObjectLock(sess); virObjectLock(sess);
if (!(auth = virNetSSHSessionAuthMethodNew(sess))) { auth = virNetSSHSessionAuthMethodNew(sess);
virObjectUnlock(sess);
return -1;
}
auth->filename = g_strdup(keyfile); auth->filename = g_strdup(keyfile);
auth->method = VIR_NET_SSH_AUTH_PRIVKEY; auth->method = VIR_NET_SSH_AUTH_PRIVKEY;
@ -1048,19 +1032,12 @@ virNetSSHSessionAuthAddKeyboardAuth(virNetSSHSession *sess,
virObjectLock(sess); virObjectLock(sess);
if (!(auth = virNetSSHSessionAuthMethodNew(sess))) auth = virNetSSHSessionAuthMethodNew(sess);
goto error;
auth->tries = tries; auth->tries = tries;
auth->method = VIR_NET_SSH_AUTH_KEYBOARD_INTERACTIVE; auth->method = VIR_NET_SSH_AUTH_KEYBOARD_INTERACTIVE;
virObjectUnlock(sess); virObjectUnlock(sess);
return 0; return 0;
error:
virObjectUnlock(sess);
return -1;
} }
void void