]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
Don't pass loginmsg by address now that it's an sshbuf*
authorKevin Adler <kadler@us.ibm.com>
Thu, 13 Dec 2018 04:12:45 +0000 (22:12 -0600)
committerDarren Tucker <dtucker@dtucker.net>
Thu, 13 Dec 2018 05:31:36 +0000 (16:31 +1100)
In 120a1ec74, loginmsg was changed from the legacy Buffer type
to struct sshbuf*, but it missed changing calls to
sys_auth_allowed_user and sys_auth_record_login which passed
loginmsg by address. Now that it's a pointer, just pass it directly.

This only affects AIX, unless there are out of tree users.

auth.c
loginrec.c

diff --git a/auth.c b/auth.c
index 18d0857ff306074bacb2df1ba87e9b94bbd19740..d2a8cd65b90b2f4aad7cf1ffb5541baf59bc5058 100644 (file)
--- a/auth.c
+++ b/auth.c
@@ -258,7 +258,7 @@ allowed_user(struct passwd * pw)
        }
 
 #ifdef CUSTOM_SYS_AUTH_ALLOWED_USER
-       if (!sys_auth_allowed_user(pw, &loginmsg))
+       if (!sys_auth_allowed_user(pw, loginmsg))
                return 0;
 #endif
 
@@ -362,7 +362,7 @@ auth_log(Authctxt *authctxt, int authenticated, int partial,
        if (authenticated)
                sys_auth_record_login(authctxt->user,
                    auth_get_canonical_hostname(ssh, options.use_dns), "ssh",
-                   &loginmsg);
+                   loginmsg);
 # endif
 #endif
 #ifdef SSH_AUDIT_EVENTS
index 9a427dec4125dd233b6be22167db1bc20a217e6b..08fc73758957bd575ec3498f6f1919f33b6ca3c9 100644 (file)
@@ -467,7 +467,7 @@ login_write(struct logininfo *li)
 #ifdef CUSTOM_SYS_AUTH_RECORD_LOGIN
        if (li->type == LTYPE_LOGIN &&
            !sys_auth_record_login(li->username,li->hostname,li->line,
-           &loginmsg))
+           loginmsg))
                logit("Writing login record failed for %s", li->username);
 #endif
 #ifdef SSH_AUDIT_EVENTS