auth_get_canonical_hostname in portable code.

"refactor canohost.c" replaced get_canonical_hostname, this makes the
same change to some portable-specific code.
This commit is contained in:
Darren Tucker 2016-03-08 11:58:43 +11:00
Родитель 95767262ca
Коммит 885fb2a44f
1 изменённых файлов: 4 добавлений и 3 удалений

7
auth.c
Просмотреть файл

@ -318,11 +318,12 @@ auth_log(Authctxt *authctxt, int authenticated, int partial,
strncmp(method, "keyboard-interactive", 20) == 0 || strncmp(method, "keyboard-interactive", 20) == 0 ||
strcmp(method, "challenge-response") == 0)) strcmp(method, "challenge-response") == 0))
record_failed_login(authctxt->user, record_failed_login(authctxt->user,
get_canonical_hostname(options.use_dns), "ssh"); auth_get_canonical_hostname(ssh, options.use_dns), "ssh");
# ifdef WITH_AIXAUTHENTICATE # ifdef WITH_AIXAUTHENTICATE
if (authenticated) if (authenticated)
sys_auth_record_login(authctxt->user, sys_auth_record_login(authctxt->user,
get_canonical_hostname(options.use_dns), "ssh", &loginmsg); auth_get_canonical_hostname(ssh, options.use_dns), "ssh",
&loginmsg);
# endif # endif
#endif #endif
#ifdef SSH_AUDIT_EVENTS #ifdef SSH_AUDIT_EVENTS
@ -653,7 +654,7 @@ getpwnamallow(const char *user)
user, ssh_remote_ipaddr(ssh), ssh_remote_port(ssh)); user, ssh_remote_ipaddr(ssh), ssh_remote_port(ssh));
#ifdef CUSTOM_FAILED_LOGIN #ifdef CUSTOM_FAILED_LOGIN
record_failed_login(user, record_failed_login(user,
get_canonical_hostname(options.use_dns), "ssh"); auth_get_canonical_hostname(ssh, options.use_dns), "ssh");
#endif #endif
#ifdef SSH_AUDIT_EVENTS #ifdef SSH_AUDIT_EVENTS
audit_event(SSH_INVALID_USER); audit_event(SSH_INVALID_USER);