D57452.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D57452.diff
View Options

	diff --git a/contrib/openbsm/bin/auditd/auditd_fbsd.c b/contrib/openbsm/bin/auditd/auditd_fbsd.c
	--- a/contrib/openbsm/bin/auditd/auditd_fbsd.c
	+++ b/contrib/openbsm/bin/auditd/auditd_fbsd.c
	@@ -81,7 +81,7 @@
	}

	/*
	- * Log messages at different priority levels.
	+ * Log messages at different priority levels.
	*/
	void
	auditd_log_err(const char *fmt, ...)
	@@ -152,7 +152,7 @@
	{
	int old_auditing_state = auditing_state;

	- if (state == AUD_STATE_INIT)
	+ if (state == AUD_STATE_INIT)
	init_audit_state();
	else
	auditing_state = state;
	@@ -171,7 +171,6 @@
	int
	auditd_get_state(void)
	{
	-
	if (auditing_state == AUD_STATE_INIT)
	init_audit_state();

	@@ -184,7 +183,6 @@
	int
	auditd_open_trigger(int __unused launchd_flag)
	{
	-
	return ((triggerfd = open(AUDIT_TRIGGER_FILE, O_RDONLY, 0)));
	}

	@@ -194,11 +192,10 @@
	int
	auditd_close_trigger(void)
	{
	-
	return (close(triggerfd));
	}

	-/*
	+/*
	* The main event loop. Wait for trigger messages or signals and handle them.
	* It should not return unless there is a problem.
	*/
	@@ -229,13 +226,13 @@
	signaled[SIGTERM] = 0;
	auditd_log_debug("%s: SIGTERM", __FUNCTION__);
	auditd_terminate();
	- /* not reached */
	+ /* not reached */
	}
	if (signaled[SIGALRM]) {
	signaled[SIGALRM] = 0;
	auditd_log_debug("%s: SIGALRM", __FUNCTION__);
	auditd_terminate();
	- /* not reached */
	+ /* not reached */
	}
	if (signaled[SIGCHLD]) {
	signaled[SIGCHLD] = 0;
	@@ -276,6 +273,5 @@
	void
	auditd_relay_signal(int signo)
	{
	-
	signaled[signo]++;
	}