PERFORCE change 142149 for review
Vincenzo Iozzo
snagg at FreeBSD.org
Fri May 23 19:28:59 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=142149
Change 142149 by snagg at snagg_macosx on 2008/05/23 19:28:40
style fixes
Reviewed by: attilio
Affected files ...
.. //depot/projects/soc2008/snagg-audit/sys/security/audit/audit_ioctl.h#12 edit
.. //depot/projects/soc2008/snagg-audit/sys/security/audit/audit_pipe.c#17 edit
Differences ...
==== //depot/projects/soc2008/snagg-audit/sys/security/audit/audit_ioctl.h#12 (text) ====
@@ -62,7 +62,7 @@
#define AUDITPIPE_PRESELECT_MODE_TRAIL 1 /* Global audit trail. */
#define AUDITPIPE_PRESELECT_MODE_LOCAL 2 /* Local audit trail. */
#define AUDITPIPE_PRESELECT_MODE_EVENT 3 /* Events-pid based audit trail */
-#define AUDITPIPE_PRESELECT_MODE_PID 4 /*Pid based audit trail*/
+#define AUDITPIPE_PRESELECT_MODE_PID 4 /*Pid based audit trail*/
/*
* Ioctls to read and control the behavior of individual audit pipe devices.
@@ -87,9 +87,9 @@
#define AUDITPIPE_FLUSH _IO(AUDITPIPE_IOBASE, 16)
#define AUDITPIPE_GET_MAXAUDITDATA _IOR(AUDITPIPE_IOBASE, 17, u_int)
#define AUDITPIPE_GET_PRESELECT_EVENT_LIST _IOR(AUDITPIPE_IOBASE, 18, \
- struct auditpipe_ioctl_preselect)
+ struct auditpipe_ioctl_preselect)
#define AUDITPIPE_SET_PRESELECT_EVENTS _IOW(AUDITPIPE_IOBASE, 19, \
- struct auditpipe_ioctl_preselect)
+ struct auditpipe_ioctl_preselect)
#define AUDITPIPE_DELETE_PRESELECT_PID _IOW(AUDITPIPE_IOBASE, 20, pid_t)
#define AUDITPIPE_FLUSH_PRESELECT_EVENTS _IO(AUDITPIPE_IOBASE, 21)
==== //depot/projects/soc2008/snagg-audit/sys/security/audit/audit_pipe.c#17 (text) ====
@@ -244,8 +244,6 @@
else
return (0);
}
-
-
/*
* Find an audit pipe preselection specification for an event and flag, if any.
@@ -255,8 +253,7 @@
pid_t app_pid, int event_flag)
{
struct audit_pipe_preselect *app;
- struct audit_pipe_preselect_event *event;
- struct audit_pipe_preselect_event ev_a;
+ struct audit_pipe_preselect_event *event, ev_a;
mtx_assert(&audit_pipe_mtx, MA_OWNED);
@@ -283,7 +280,7 @@
/*
* Find an audit pipe preselection specification for an auid, if any.
- */
+ */
static struct audit_pipe_preselect *
audit_pipe_preselect_find(struct audit_pipe *ap, au_id_t auid)
{
@@ -349,8 +346,7 @@
struct audit_pipe_preselect_event *events, int num)
{
struct audit_pipe_preselect *app, *app_new;
- int i;
- int found;
+ int i, found;
/*
* Pessimistically assume that the entry for this pid doesn't
@@ -596,7 +592,7 @@
} else
return (au_preselect(event, class, &app->app_mask,
sorf));
-
+
case AUDITPIPE_PRESELECT_MODE_EVENT:
app = audit_pipe_preselect_find_event(ap, event, app_pid, sorf);
if(app != NULL)
@@ -618,7 +614,6 @@
/*
* Determine whether there exists a pipe interested in a record with specific
* properties.
- *
*/
int
audit_pipe_preselect(au_id_t auid, au_event_t event, au_class_t class,
@@ -937,7 +932,7 @@
int error, mode;
au_id_t auid;
pid_t app_pid;
-
+
ap = dev->si_drv1;
KASSERT(ap != NULL, ("audit_pipe_ioctl: ap == NULL"));
More information about the p4-projects
mailing list