From 79a87d32783d6c9db40af8f35e091d9d30365ae7 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Wed, 3 Apr 2019 06:27:45 +1100 Subject: [PATCH] Remove "struct ssh" from sys_auth_record_login. It's not needed, and is not available from the call site in loginrec.c Should only affect AIX, spotted by Kevin Brott. --- auth.c | 2 +- openbsd-compat/port-aix.c | 4 ++-- openbsd-compat/port-aix.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/auth.c b/auth.c index 332b6220c..8696f258e 100644 --- a/auth.c +++ b/auth.c @@ -360,7 +360,7 @@ auth_log(struct ssh *ssh, int authenticated, int partial, auth_get_canonical_hostname(ssh, options.use_dns), "ssh"); # ifdef WITH_AIXAUTHENTICATE if (authenticated) - sys_auth_record_login(ssh, authctxt->user, + sys_auth_record_login(authctxt->user, auth_get_canonical_hostname(ssh, options.use_dns), "ssh", loginmsg); # endif diff --git a/openbsd-compat/port-aix.c b/openbsd-compat/port-aix.c index b61018b56..fc80dc39f 100644 --- a/openbsd-compat/port-aix.c +++ b/openbsd-compat/port-aix.c @@ -280,8 +280,8 @@ sys_auth_allowed_user(struct passwd *pw, struct sshbuf *loginmsg) } int -sys_auth_record_login(struct ssh *ssh, const char *user, const char *host, - const char *ttynm, struct sshbuf *loginmsg) +sys_auth_record_login(const char *user, const char *host, const char *ttynm, + struct sshbuf *loginmsg) { char *msg = NULL; int success = 0; diff --git a/openbsd-compat/port-aix.h b/openbsd-compat/port-aix.h index 4702e3bf1..904de3096 100644 --- a/openbsd-compat/port-aix.h +++ b/openbsd-compat/port-aix.h @@ -90,8 +90,8 @@ void aix_usrinfo(struct passwd *); # define CUSTOM_SYS_AUTH_ALLOWED_USER 1 int sys_auth_allowed_user(struct passwd *, struct sshbuf *); # define CUSTOM_SYS_AUTH_RECORD_LOGIN 1 -int sys_auth_record_login(struct ssh *, const char *, const char *, - const char *, struct sshbuf *); +int sys_auth_record_login(const char *, const char *, const char *, + struct sshbuf *); # define CUSTOM_SYS_AUTH_GET_LASTLOGIN_MSG char *sys_auth_get_lastlogin_msg(const char *, uid_t); # define CUSTOM_FAILED_LOGIN 1