Move audispd.conf settings into auditd.conf

caidongyun · Jun 29, 2018 · bf5f3cf · bf5f3cf
1 parent 2f772d2
commit bf5f3cf
Show file tree

Hide file tree

Showing 21 changed files with 254 additions and 606 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -20,6 +20,7 @@
 - Breakout audisp syslog plugin to be standalone program
 - Create a common internal library to reduce code
 - Move all audispd config files under /etc/audit/
+- Move audispd.conf settings into auditd.conf
 
 2.8.3
 - Correct msg function name in LRU debug code

diff --git a/audisp/Makefile.am b/audisp/Makefile.am
@@ -23,13 +23,13 @@
 SUBDIRS = plugins 
 CONFIG_CLEAN_FILES = *.rej *.orig
 AUTOMAKE_OPTIONS = no-dependencies
-AM_CPPFLAGS = -D_GNU_SOURCE -fPIC -DPIC -I${top_srcdir} -I${top_srcdir}/lib
+AM_CPPFLAGS = -D_GNU_SOURCE -fPIC -DPIC -I${top_srcdir} -I${top_srcdir}/lib -I${top_srcdir}/src
 LIBS = -L${top_builddir}/lib -laudit 
 LDADD = -lpthread
 
-noinst_HEADERS = audispd-config.h audispd-pconfig.h audispd-llist.h \
+noinst_HEADERS = audispd-pconfig.h audispd-llist.h audispd-config.h \
 	queue.h audispd-builtins.h libdisp.h
-libdisp_a_SOURCES = audispd.c audispd-config.c audispd-pconfig.c \
-	audispd-llist.c queue.c audispd-builtins.c
+libdisp_a_SOURCES = audispd.c audispd-pconfig.c queue.c \
+	audispd-llist.c audispd-builtins.c
 noinst_LIBRARIES = libdisp.a