summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2016-03-08 11:58:43 +1100
committerDarren Tucker <dtucker@zip.com.au>2016-03-08 11:58:43 +1100
commit885fb2a44ff694f01e4f6470f803629e11f62961 (patch)
tree0ee65c628023beb19745239a3a6551662a3a92a1
parent95767262caa6692eff1e1565be1f5cb297949a89 (diff)
auth_get_canonical_hostname in portable code.
"refactor canohost.c" replaced get_canonical_hostname, this makes the same change to some portable-specific code.
-rw-r--r--auth.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/auth.c b/auth.c
index aae0593e7..55629b320 100644
--- a/auth.c
+++ b/auth.c
@@ -318,11 +318,12 @@ auth_log(Authctxt *authctxt, int authenticated, int partial,
318 strncmp(method, "keyboard-interactive", 20) == 0 || 318 strncmp(method, "keyboard-interactive", 20) == 0 ||
319 strcmp(method, "challenge-response") == 0)) 319 strcmp(method, "challenge-response") == 0))
320 record_failed_login(authctxt->user, 320 record_failed_login(authctxt->user,
321 get_canonical_hostname(options.use_dns), "ssh"); 321 auth_get_canonical_hostname(ssh, options.use_dns), "ssh");
322# ifdef WITH_AIXAUTHENTICATE 322# ifdef WITH_AIXAUTHENTICATE
323 if (authenticated) 323 if (authenticated)
324 sys_auth_record_login(authctxt->user, 324 sys_auth_record_login(authctxt->user,
325 get_canonical_hostname(options.use_dns), "ssh", &loginmsg); 325 auth_get_canonical_hostname(ssh, options.use_dns), "ssh",
326 &loginmsg);
326# endif 327# endif
327#endif 328#endif
328#ifdef SSH_AUDIT_EVENTS 329#ifdef SSH_AUDIT_EVENTS
@@ -653,7 +654,7 @@ getpwnamallow(const char *user)
653 user, ssh_remote_ipaddr(ssh), ssh_remote_port(ssh)); 654 user, ssh_remote_ipaddr(ssh), ssh_remote_port(ssh));
654#ifdef CUSTOM_FAILED_LOGIN 655#ifdef CUSTOM_FAILED_LOGIN
655 record_failed_login(user, 656 record_failed_login(user,
656 get_canonical_hostname(options.use_dns), "ssh"); 657 auth_get_canonical_hostname(ssh, options.use_dns), "ssh");
657#endif 658#endif
658#ifdef SSH_AUDIT_EVENTS 659#ifdef SSH_AUDIT_EVENTS
659 audit_event(SSH_INVALID_USER); 660 audit_event(SSH_INVALID_USER);