RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't pass loginmsg by address now that it's an sshbuf* 

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.
This commit is contained in:
Kevin Adler 2018-12-12 22:12:45 -06:00 committed by Darren Tucker
parent 285310b897
commit a784fa8c7a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
auth.c
View File

@ -258,7 +258,7 @@ allowed_user(struct passwd * pw)
} }
#ifdef CUSTOM_SYS_AUTH_ALLOWED_USER #ifdef CUSTOM_SYS_AUTH_ALLOWED_USER
if (!sys_auth_allowed_user(pw, &loginmsg)) if (!sys_auth_allowed_user(pw, loginmsg))
return 0; return 0;
#endif #endif
@ -362,7 +362,7 @@ auth_log(Authctxt *authctxt, int authenticated, int partial,
if (authenticated) if (authenticated)
sys_auth_record_login(authctxt->user, sys_auth_record_login(authctxt->user,
auth_get_canonical_hostname(ssh, options.use_dns), "ssh", auth_get_canonical_hostname(ssh, options.use_dns), "ssh",
&loginmsg); loginmsg);
# endif # endif
#endif #endif
#ifdef SSH_AUDIT_EVENTS #ifdef SSH_AUDIT_EVENTS

2
loginrec.c
View File

@ -467,7 +467,7 @@ login_write(struct logininfo *li)
#ifdef CUSTOM_SYS_AUTH_RECORD_LOGIN #ifdef CUSTOM_SYS_AUTH_RECORD_LOGIN
if (li->type == LTYPE_LOGIN && if (li->type == LTYPE_LOGIN &&
!sys_auth_record_login(li->username,li->hostname,li->line, !sys_auth_record_login(li->username,li->hostname,li->line,
&loginmsg)) loginmsg))
logit("Writing login record failed for %s", li->username); logit("Writing login record failed for %s", li->username);
#endif #endif
#ifdef SSH_AUDIT_EVENTS #ifdef SSH_AUDIT_EVENTS