mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-20 11:11:24 +00:00
Code Issues Releases Activity

Generally avoid <space><tab> as a white space anomoly.

Browse Source 
Obtained from:	Apple Inc.
MFC after:	3 days
This commit is contained in:
Robert Watson 2008-07-22 16:44:48 +00:00
parent 0c0a142a52
commit fc1286c81d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=180709
5 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/security/audit/audit_bsm.c
View File

@ -177,24 +177,24 @@ kau_free(struct au_record *rec)
} while (0)
#define VNODE1_TOKENS do { \
if (ARG_IS_VALID(kar, ARG_VNODE1)) { \
if (ARG_IS_VALID(kar, ARG_VNODE1)) { \
tok = au_to_attr32(&ar->ar_arg_vnode1); \
kau_write(rec, tok); \
} \
} while (0)
#define UPATH1_VNODE1_TOKENS do { \
if (ARG_IS_VALID(kar, ARG_UPATH1)) { \
if (ARG_IS_VALID(kar, ARG_UPATH1)) { \
UPATH1_TOKENS; \
} \
if (ARG_IS_VALID(kar, ARG_VNODE1)) { \
if (ARG_IS_VALID(kar, ARG_VNODE1)) { \
tok = au_to_attr32(&ar->ar_arg_vnode1); \
kau_write(rec, tok); \
} \
} while (0)
#define VNODE2_TOKENS do { \
if (ARG_IS_VALID(kar, ARG_VNODE2)) { \
if (ARG_IS_VALID(kar, ARG_VNODE2)) { \
tok = au_to_attr32(&ar->ar_arg_vnode2); \
kau_write(rec, tok); \
} \
@ -393,8 +393,8 @@ kaudit_to_bsm(struct kaudit_record *kar, struct au_record **pau)
subj_tok = au_to_subject32(ar->ar_subj_auid, /* audit ID */
ar->ar_subj_cred.cr_uid, /* eff uid */
ar->ar_subj_egid, /* eff group id */
ar->ar_subj_ruid, /* real uid */
ar->ar_subj_rgid, /* real group id */
ar->ar_subj_ruid, /* real uid */
ar->ar_subj_rgid, /* real group id */
ar->ar_subj_pid, /* process id */
ar->ar_subj_asid, /* session ID */
&tid);
@ -876,7 +876,7 @@ kaudit_to_bsm(struct kaudit_record *kar, struct au_record **pau)
if (ARG_IS_VALID(kar, ARG_FD)) {
tok = au_to_arg32(1, "fd",
ar->ar_arg_fd);
kau_write(rec, tok);
kau_write(rec, tok);
}
}
}

8
sys/security/audit/audit_bsm_token.c
View File

@ -262,7 +262,7 @@ au_to_data(char unit_print, char unit_type, char unit_count, char *p)
break;
default:
return (NULL);
return (NULL);
}
totdata = datasize * unit_count;
@ -918,7 +918,7 @@ au_to_sock_inet32(struct sockaddr_in *so)
*
* XXXRW: Should a name space conversion be taking place on the value
* of sin_family?
*/
*/
family = so->sin_family;
ADD_U_INT16(dptr, family);
ADD_MEM(dptr, &so->sin_port, sizeof(uint16_t));
@ -940,8 +940,8 @@ au_to_sock_inet128(struct sockaddr_in6 *so)
ADD_U_CHAR(dptr, AUT_SOCKINET128);
/*
* In Darwin, sin6_family is one octet, but BSM defines the token
* to store two. So we copy in a 0 first.
*/
* to store two. So we copy in a 0 first.
*/
ADD_U_CHAR(dptr, 0);
ADD_U_CHAR(dptr, so->sin6_family);

2
sys/security/audit/audit_private.h
View File

@ -109,7 +109,7 @@ struct groupset {
};
struct socket_au_info {
int so_domain;
int so_domain;
int so_type;
int so_protocol;
in_addr_t so_raddr; /* Remote address if INET socket. */

10
sys/security/audit/audit_trigger.c
View File

@ -150,11 +150,11 @@ audit_send_trigger(unsigned int trigger)
static struct cdevsw audit_cdevsw = {
.d_version = D_VERSION,
.d_open = audit_open,
.d_close = audit_close,
.d_read = audit_read,
.d_write = audit_write,
.d_name = "audit"
.d_open = audit_open,
.d_close = audit_close,
.d_read = audit_read,
.d_write = audit_write,
.d_name = "audit"
};
void

2
sys/security/audit/audit_worker.c
View File

@ -116,7 +116,7 @@ audit_record_write(struct vnode *vp, struct ucred *cred, void *data,
if (vp == NULL)
return;
mnt_stat = &vp->v_mount->mnt_stat;
mnt_stat = &vp->v_mount->mnt_stat;
vfslocked = VFS_LOCK_GIANT(vp->v_mount);
/*