From: Michal Privoznik <[email protected]> For the VIR_NET_SSH_AUTH_PASSWORD authentication mechanism the virNetSSHAuthenticatePassword() is called. Inside it, virAuthGetPasswordPath() is called to obtain password. Firstly reading from our auth.conf file is attempted and if that fails then corresponding callback from virConnectAuthCallbackPtr is called. But virAuthGetPasswordPath() checks whether the callback is NULL or not. There is no need for virNetSSHAuthenticatePassword() to check it too. Drop the duplicate check.
Signed-off-by: Michal Privoznik <[email protected]> --- src/rpc/virnetsshsession.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c index 83c8630480..3f60315822 100644 --- a/src/rpc/virnetsshsession.c +++ b/src/rpc/virnetsshsession.c @@ -661,13 +661,6 @@ virNetSSHAuthenticatePassword(virNetSSHSession *sess) VIR_DEBUG("sess=%p", sess); - /* password authentication with interactive password request */ - if (!sess->cred || !sess->cred->cb) { - virReportError(VIR_ERR_SSH, "%s", - _("Can't perform authentication: Authentication callback not provided")); - goto cleanup; - } - /* Try the authenticating the set amount of times. The server breaks the * connection if maximum number of bad auth tries is exceeded */ while (true) { -- 2.53.0
