unhide audit_fgets

Author: stevegrubb

audisp/plugins/af_unix/Makefile.am

@@ -25,8 +25,7 @@ CONFIG_CLEAN_FILES = *.rej *.orig
 CONF_FILES = af_unix.conf
 EXTRA_DIST = $(CONF_FILES) $(man_MANS)
 
-# FIXME add common temporarily
-AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/lib -I${top_srcdir}/audisp -I${top_srcdir}/common
+AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/lib -I${top_srcdir}/audisp
 LIBS = ${top_builddir}/lib/libaudit.la
 prog_confdir = $(sysconfdir)/audit
 plugin_confdir=$(prog_confdir)/plugins.d

audisp/plugins/af_unix/audisp-af_unix.c

@@ -43,7 +43,6 @@
 #include <cap-ng.h>
 #endif
 #include "libaudit.h"
-#include "common.h" // FIXME temporary
 #include "audispd-pconfig.h"
 
 #define DEFAULT_PATH "/var/run/audispd_events"

audisp/plugins/ids/ids.c

@@ -36,7 +36,6 @@
 #include <sys/timerfd.h>
 #include "auparse.h"
 #include "libaudit.h"
-#include "common.h" // FIXME temporary
 #include "ids.h"
 #include "ids_config.h"
 #include "origin.h"

audisp/plugins/syslog/Makefile.am

@@ -23,8 +23,7 @@
 
 CONFIG_CLEAN_FILES = *.loT *.rej *.orig
 EXTRA_DIST = syslog.conf $(man_MANS)
-# FIXME: remove common
-AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/lib -I${top_srcdir}/common -I${top_srcdir}/auparse -I${top_srcdir}/common
+AM_CPPFLAGS = -I${top_srcdir} -I${top_srcdir}/lib -I${top_srcdir}/common -I${top_srcdir}/auparse
 prog_confdir = $(sysconfdir)/audit
 plugin_confdir=$(prog_confdir)/plugins.d
 plugin_conf = syslog.conf

audisp/plugins/syslog/audisp-syslog.c

@@ -33,7 +33,6 @@
 #include <cap-ng.h>
 #endif
 #include "libaudit.h"
-#include "common.h" // FIXME temporary
 #include "auparse.h"
 
 /* Global Data */

common/common.h

@@ -87,14 +87,5 @@ void wall_message(const char *fmt, ...)
 #endif
 
 AUDIT_HIDDEN_END
-
-// FIXME temporary
-/* Helper function for reading stdin in plugins */
-void audit_fgets_clear(void);
-int audit_fgets_eof(void);
-int audit_fgets_more(size_t blen);
-int audit_fgets(char *buf, size_t blen, int fd)
-        __attr_access ((__write_only__, 1, 2));
-
 #endif
 

lib/libaudit.h

@@ -305,6 +305,13 @@ int audit_can_control(void);
 int audit_can_write(void);
 int audit_can_read(void);
 
+/* Helper function for reading stdin in plugins */
+void audit_fgets_clear(void);
+int audit_fgets_eof(void);
+int audit_fgets_more(size_t blen);
+int audit_fgets(char *buf, size_t blen, int fd)
+        __attr_access ((__write_only__, 1, 2));
+
 #ifdef __cplusplus
 }
 #endif