From 427e49003a739369c68aabc2d99b43c9e8cee741 Mon Sep 17 00:00:00 2001 From: Jackkal Date: Tue, 21 Jun 2022 22:48:56 +0200 Subject: [PATCH] make comments consistent and fix typo --- svr-authpam.c | 4 ++-- svr-authpasswd.c | 2 +- svr-authpubkey.c | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/svr-authpam.c b/svr-authpam.c index ee8e9a1..ec14632 100644 --- a/svr-authpam.c +++ b/svr-authpam.c @@ -282,10 +282,10 @@ void svr_auth_pam(int valid_user) { if (svr_opts.multiauthmethod && (ses.authstate.authtypes & ~AUTH_TYPE_PASSWORD)) { /* successful PAM password authentication, but extra auth required */ dropbear_log(LOG_NOTICE, - "PAM password auth auth succeeded for '%s' from %s, extra auth required", + "PAM password auth succeeded for '%s' from %s, extra auth required", ses.authstate.pw_name, svr_ses.addrstring); - ses.authstate.authtypes &= ~AUTH_TYPE_PASSWORD; + ses.authstate.authtypes &= ~AUTH_TYPE_PASSWORD; /* PAM password auth ok, delete the method flag */ send_msg_userauth_failure(1, 0); /* Send partial success */ } else { /* successful authentication */ diff --git a/svr-authpasswd.c b/svr-authpasswd.c index 8835b99..899a8ab 100644 --- a/svr-authpasswd.c +++ b/svr-authpasswd.c @@ -112,7 +112,7 @@ void svr_auth_password(int valid_user) { "Password auth succeeded for '%s' from %s, extra auth required", ses.authstate.pw_name, svr_ses.addrstring); - ses.authstate.authtypes &= ~AUTH_TYPE_PASSWORD; + ses.authstate.authtypes &= ~AUTH_TYPE_PASSWORD; /* password auth ok, delete the method flag */ send_msg_userauth_failure(1, 0); /* Send partial success */ } else { /* successful authentication */ diff --git a/svr-authpubkey.c b/svr-authpubkey.c index 6d956be..32e596c 100644 --- a/svr-authpubkey.c +++ b/svr-authpubkey.c @@ -203,6 +203,7 @@ void svr_auth_pubkey(int valid_user) { fp = sign_key_fingerprint(keyblob, keybloblen); if (buf_verify(ses.payload, key, sigtype, signbuf) == DROPBEAR_SUCCESS) { if (svr_opts.multiauthmethod && (ses.authstate.authtypes & ~AUTH_TYPE_PUBKEY)) { + /* successful pubkey authentication, but extra auth required */ dropbear_log(LOG_NOTICE, "Pubkey auth succeeded for '%s' with %s key %s from %s, extra auth required", ses.authstate.pw_name, @@ -211,6 +212,7 @@ void svr_auth_pubkey(int valid_user) { ses.authstate.authtypes &= ~AUTH_TYPE_PUBKEY; /* pubkey auth ok, delete the method flag */ send_msg_userauth_failure(1, 0); /* Send partial success */ } else { + /* successful authentication */ dropbear_log(LOG_NOTICE, "Pubkey auth succeeded for '%s' with %s key %s from %s", ses.authstate.pw_name,