More cleanups for audispd code merge

caidongyun · Jun 26, 2018 · a1192d0 · a1192d0
1 parent 000a054
commit a1192d0
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 66 deletions.
diff --git a/audit.spec b/audit.spec
@@ -199,7 +199,6 @@ fi
 %files
 %license COPYING
 %doc README ChangeLog rules init.d/auditd.cron
-%attr(644,root,root) %{_mandir}/man8/audispd.8.gz
 %attr(644,root,root) %{_mandir}/man8/auditctl.8.gz
 %attr(644,root,root) %{_mandir}/man8/auditd.8.gz
 %attr(644,root,root) %{_mandir}/man8/aureport.8.gz
@@ -219,7 +218,6 @@ fi
 %attr(755,root,root) /sbin/ausearch
 %attr(755,root,root) /sbin/aureport
 %attr(750,root,root) /sbin/autrace
-%attr(750,root,root) /sbin/audispd
 %attr(750,root,root) /sbin/augenrules
 %attr(755,root,root) %{_bindir}/aulast
 %attr(755,root,root) %{_bindir}/aulastlog

diff --git a/auparse/auditd-config.c b/auparse/auditd-config.c
@@ -73,7 +73,6 @@ static const struct kw_pair keywords[] =
 void clear_config(struct daemon_conf *config)
 {
 	config->local_events = 1;
-	config->qos = QOS_NON_BLOCKING;
 	config->sender_uid = 0;
 	config->sender_pid = 0;
 	config->sender_ctx = NULL;
@@ -85,7 +84,6 @@ void clear_config(struct daemon_conf *config)
 	config->flush =  FT_NONE;
 	config->freq = 0;
 	config->num_logs = 0L;
-	config->dispatcher = NULL;
 	config->node_name_format = N_NONE;
 	config->node_name = NULL;
 	config->max_log_size = 0L;

diff --git a/docs/Makefile.am b/docs/Makefile.am
@@ -58,7 +58,7 @@ ausearch_add_expression.3 ausearch_add_timestamp_item.3 ausearch_add_regex.3 \
 ausearch_add_timestamp_item_ex.3 ausearch_clear.3 \
 ausearch_next_event.3 ausearch_set_stop.3 \
 autrace.8 get_auditfail_action.3 set_aumessage_mode.3 \
-audispd.8 audispd.conf.5 audispd-zos-remote.8 libaudit.conf.5 \
+audispd.conf.5 audispd-zos-remote.8 libaudit.conf.5 \
 augenrules.8 audit_set_backlog_wait_time.3 \
 zos-remote.conf.5 
 
diff --git a/docs/audispd.8 b/docs/audispd.8