Merge pull request #118 from MrAnno/remove-pe-leftovers

Remove mangle_callback, server_mode flags, and PluginFailureInfo

CMakeLists.txt

@@ -95,7 +95,6 @@ set(SYSLOG_NG_PATH_TOPSRC_DIR "${PROJECT_SOURCE_DIR}")
 set(LIBDIR "\${exec_prefix}/lib")
 set(INCLUDEDIR "\${prefix}/include")
 set(TOOLSDIR "\${datadir}/syslog-ng/tools")
-set(SYSLOG_NG_ENABLE_FORCED_SERVER_MODE 1)
 
 set (LOGGEN_PLUGIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib/syslog-ng/loggen")
 

cmake/syslog-ng-config.h.in

@@ -28,7 +28,6 @@
 #cmakedefine SYSLOG_NG_VERSION "@SYSLOG_NG_VERSION@"
 #cmakedefine SYSLOG_NG_COMBINED_VERSION "@SYSLOG_NG_COMBINED_VERSION@"
 #cmakedefine01 SYSLOG_NG_ENABLE_CPP
-#cmakedefine01 SYSLOG_NG_ENABLE_FORCED_SERVER_MODE
 #cmakedefine01 SYSLOG_NG_ENABLE_DEBUG
 #cmakedefine01 SYSLOG_NG_ENABLE_GPROF
 #cmakedefine01 SYSLOG_NG_ENABLE_IPV6

configure.ac

@@ -193,9 +193,6 @@ AC_ARG_WITH(package_name,
    [  --with-package-name=package name Package name is printed out when syslog-ng started with --version],
    PACKAGE_NAME=$with_package_name)
 
-AC_ARG_ENABLE(forced_server_mode,
-              [  --enable-forced-server-mode   Enable forced server mode.],, enable_forced_server_mode="yes")
-
 AC_ARG_ENABLE(debug,
               [  --enable-debug      Enable debugging code.],, enable_debug="no")
 
@@ -2236,7 +2233,6 @@ AC_DEFINE_UNQUOTED(PACKAGE_NAME, "$PACKAGE_NAME", [package name])
 
 
 AC_DEFINE_UNQUOTED(WITH_COMPILE_DATE, $wcmp_date, [Include the compile date in the binary])
-AC_DEFINE_UNQUOTED(ENABLE_FORCED_SERVER_MODE, `enable_value $enable_forced_server_mode`, [Enable forced server mode])
 AC_DEFINE_UNQUOTED(ENABLE_DEBUG, `enable_value $enable_debug`, [Enable debugging])
 AC_DEFINE_UNQUOTED(ENABLE_GPROF, `enable_value $enable_gprof`, [Enable gcc profiling])
 AC_DEFINE_UNQUOTED(ENABLE_MEMTRACE, `enable_value $enable_memtrace`, [Enable memtrace])
@@ -2404,7 +2400,6 @@ echo "  Unit tests                  : ${enable_tests:=no}"
 echo " Submodules:"
 echo "  ivykis                      : $with_ivykis"
 echo " Features:"
-echo "  Forced server mode          : ${enable_forced_server_mode:=yes}"
 echo "  Debug symbols               : ${enable_debug:=no}"
 echo "  GCC profiling               : ${enable_gprof:=no}"
 echo "  Memtrace                    : ${enable_memtrace:=no}"

contrib/Makefile.am

@@ -78,10 +78,6 @@ EXTRA_DIST += \
 	\
 	contrib/apparmor/opt.syslog-ng.sbin.syslog-ng \
 	\
-	contrib/balabit-initscripts/init.d \
-	contrib/balabit-initscripts/init.d.freebsd \
-	contrib/balabit-initscripts/init-functions \
-	\
 	contrib/upstart/syslog-ng.conf.upstart	\
 	contrib/systemd/[email protected] \
 	contrib/systemd/syslog-ng@default \