d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pass int arguments to auditon(2)'s A_GETCOND API rather than long

Browse Source 
arguments.  This change should be MFC'd with OpenBSM 1.1 since they
are interdependent.

MFC after:	2 weeks
Obtained from:	TrustedBSD Project
Sponsored by:	Apple, Inc.
This commit is contained in:
Robert Watson 2009-04-19 23:34:22 +00:00
parent 2a5058a3ed
commit 781202d7fd
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
usr.bin/login/login_audit.c
View File

@ -67,10 +67,10 @@ au_login_success(void)
uid_t uid = pwd->pw_uid; uid_t uid = pwd->pw_uid;
gid_t gid = pwd->pw_gid; gid_t gid = pwd->pw_gid;
pid_t pid = getpid(); pid_t pid = getpid();
long au_cond; int au_cond;
/* If we are not auditing, don't cut an audit record; just return. */ /* If we are not auditing, don't cut an audit record; just return. */
if (auditon(A_GETCOND, &au_cond, sizeof(long)) < 0) { if (auditon(A_GETCOND, &au_cond, sizeof(au_cond)) < 0) {
if (errno == ENOSYS) if (errno == ENOSYS)
return; return;
errx(1, "login: Could not determine audit condition"); errx(1, "login: Could not determine audit condition");
@ -115,13 +115,13 @@ au_login_fail(const char *errmsg, int na)
{ {
token_t *tok; token_t *tok;
int aufd; int aufd;
long au_cond; int au_cond;
uid_t uid; uid_t uid;
gid_t gid; gid_t gid;
pid_t pid = getpid(); pid_t pid = getpid();
/* If we are not auditing, don't cut an audit record; just return. */ /* If we are not auditing, don't cut an audit record; just return. */
if (auditon(A_GETCOND, &au_cond, sizeof(long)) < 0) { if (auditon(A_GETCOND, &au_cond, sizeof(au_cond)) < 0) {
if (errno == ENOSYS) if (errno == ENOSYS)
return; return;
errx(1, "login: Could not determine audit condition"); errx(1, "login: Could not determine audit condition");
@ -175,10 +175,10 @@ audit_logout(void)
uid_t uid = pwd->pw_uid; uid_t uid = pwd->pw_uid;
gid_t gid = pwd->pw_gid; gid_t gid = pwd->pw_gid;
pid_t pid = getpid(); pid_t pid = getpid();
long au_cond; int au_cond;
/* If we are not auditing, don't cut an audit record; just return. */ /* If we are not auditing, don't cut an audit record; just return. */
if (auditon(A_GETCOND, &au_cond, sizeof(long)) < 0) { if (auditon(A_GETCOND, &au_cond, sizeof(int)) < 0) {
if (errno == ENOSYS) if (errno == ENOSYS)
return; return;
errx(1, "login: Could not determine audit condition"); errx(1, "login: Could not determine audit condition");