Browse Source

Imported Upstream version 8.8.0

upstream upstream/8.8.0
Michael Biebl 8 years ago
parent
commit
e1198c3c37
  1. 59
      ChangeLog
  2. 4
      Makefile.am
  3. 45
      Makefile.in
  4. 2
      README.md
  5. 1
      aclocal.m4
  6. 4
      action.c
  7. 8
      compat/Makefile.in
  8. 21
      config.h.in
  9. 947
      configure
  10. 129
      configure.ac
  11. 8
      contrib/imczmq/Makefile.in
  12. 8
      contrib/imkmsg/Makefile.in
  13. 3
      contrib/imkmsg/imkmsg.c
  14. 3
      contrib/imkmsg/imkmsg.h
  15. 28
      contrib/imkmsg/kmsg.c
  16. 8
      contrib/imzmq3/Makefile.in
  17. 8
      contrib/mmcount/Makefile.in
  18. 2
      contrib/mmcount/mmcount.c
  19. 8
      contrib/mmrfc5424addhmac/Makefile.in
  20. 8
      contrib/mmsequence/Makefile.in
  21. 2
      contrib/mmsequence/mmsequence.c
  22. 8
      contrib/omczmq/Makefile.in
  23. 8
      contrib/omhiredis/Makefile.in
  24. 8
      contrib/omrabbitmq/Makefile.in
  25. 8
      contrib/omzmq3/Makefile.in
  26. 8
      contrib/pmaixforwardedfrom/Makefile.in
  27. 8
      contrib/pmcisconames/Makefile.in
  28. 8
      contrib/pmsnare/Makefile.in
  29. 8
      grammar/Makefile.in
  30. 851
      grammar/grammar.c
  31. 127
      grammar/grammar.h
  32. 13
      grammar/grammar.y
  33. 2376
      grammar/lexer.c
  34. 14
      grammar/lexer.l
  35. 48
      grammar/rainerscript.c
  36. 15
      grammar/rainerscript.h
  37. 42
      m4/ac_check_define.m4
  38. 19
      platform/redhat/rsyslog.conf
  39. 8
      plugins/im3195/Makefile.in
  40. 8
      plugins/imdiag/Makefile.in
  41. 8
      plugins/imfile/Makefile.in
  42. 23
      plugins/imfile/imfile.c
  43. 8
      plugins/imgssapi/Makefile.in
  44. 8
      plugins/imjournal/Makefile.in
  45. 2
      plugins/imjournal/imjournal.c
  46. 8
      plugins/imklog/Makefile.in
  47. 27
      plugins/imklog/bsd.c
  48. 3
      plugins/imklog/imklog.c
  49. 5
      plugins/imklog/imklog.h
  50. 8
      plugins/immark/Makefile.in
  51. 8
      plugins/impstats/Makefile.in
  52. 1
      plugins/impstats/impstats.c
  53. 8
      plugins/imptcp/Makefile.in
  54. 29
      plugins/imptcp/imptcp.c
  55. 8
      plugins/imrelp/Makefile.in
  56. 11
      plugins/imrelp/imrelp.c
  57. 8
      plugins/imsolaris/Makefile.in
  58. 8
      plugins/imtcp/Makefile.in
  59. 52
      plugins/imtcp/imtcp.c
  60. 8
      plugins/imudp/Makefile.in
  61. 10
      plugins/imudp/imudp.c
  62. 8
      plugins/imuxsock/Makefile.in
  63. 10
      plugins/imuxsock/imuxsock.c
  64. 8
      plugins/mmanon/Makefile.in
  65. 8
      plugins/mmaudit/Makefile.in
  66. 2
      plugins/mmaudit/mmaudit.c
  67. 8
      plugins/mmexternal/Makefile.in
  68. 8
      plugins/mmfields/Makefile.in
  69. 2
      plugins/mmfields/mmfields.c
  70. 8
      plugins/mmjsonparse/Makefile.in
  71. 17
      plugins/mmjsonparse/mmjsonparse.c
  72. 8
      plugins/mmnormalize/Makefile.in
  73. 118
      plugins/mmnormalize/mmnormalize.c
  74. 8
      plugins/mmpstrucdata/Makefile.in
  75. 2
      plugins/mmpstrucdata/mmpstrucdata.c
  76. 8
      plugins/mmsnmptrapd/Makefile.in
  77. 8
      plugins/mmutf8fix/Makefile.in
  78. 8
      plugins/omelasticsearch/Makefile.in
  79. 8
      plugins/omgssapi/Makefile.in
  80. 8
      plugins/omhdfs/Makefile.in
  81. 8
      plugins/omjournal/Makefile.in
  82. 8
      plugins/omkafka/Makefile.am
  83. 718
      plugins/omkafka/Makefile.in
  84. 946
      plugins/omkafka/omkafka.c
  85. 8
      plugins/omlibdbi/Makefile.in
  86. 8
      plugins/ommail/Makefile.in
  87. 8
      plugins/ommongodb/Makefile.in
  88. 8
      plugins/ommysql/Makefile.in
  89. 8
      plugins/ompgsql/Makefile.in
  90. 8
      plugins/omprog/Makefile.in
  91. 8
      plugins/omrelp/Makefile.in
  92. 8
      plugins/omruleset/Makefile.in
  93. 6
      plugins/omruleset/omruleset.c
  94. 8
      plugins/omsnmp/Makefile.in
  95. 8
      plugins/omstdout/Makefile.in
  96. 8
      plugins/omtesting/Makefile.in
  97. 8
      plugins/omudpspoof/Makefile.in
  98. 8
      plugins/omuxsock/Makefile.in
  99. 4
      plugins/omuxsock/omuxsock.c
  100. 8
      plugins/pmciscoios/Makefile.in

59
ChangeLog

@ -1,4 +1,57 @@
------------------------------------------------------------------------------
Version 8.8.0 [v8-stable] 2015-02-24
- omkafka: add support for dynamic topics and auto partitioning
Thanks to Tait Clarridge for the patches.
- imtcp/imptcp: support for broken Cisco ASA TCP syslog framing
- omfwd: more detailled error messages in case of UDP send error
- TLS syslog: enable capability to turn on GnuTLS debug logging
This provides better diagnostics in hard-to-diagnose cases,
especially when GnuTLS is extra-picky about certificates.
- bugfix: $AbortOnUncleanConfig did not work
- improve rsyslogd -v output and error message with meta information
version number is now contained in error message and build platform in
version output. This helps to gets rid of the usual "which version"
question on mailing list, support forums, etc...
- bugfix imtcp: octet-counted framing cannot be turned off
- bugfix: build problems on Illuminos
Thanks to Andrew Stormont for the patch
- bugfix: invalid data size for iMaxLine global property
It was defined as int, but inside the config system it was declared as
size type, which uses int64_t. With legacy config statements, this could
lead to misadressing, which usually meant the another config variable was
overwritten (depending on memory layout).
closes https://github.com/rsyslog/rsyslog/issues/205
- bugfix: negative values for maxMessageSize global parameter were permitted
------------------------------------------------------------------------------
Version 8.7.0 [v8-stable] 2015-01-13
- add message metadata "system" to msg object
this permits to store metadata alongside the message
- imfile: add support for "filename" metadata
this is useful in cases where wildcards are used
- imptcp: make stats counter names consistent with what imudp, imtcp uses
- added new module "omkafka" to support writing to Apache Kafka
- omfwd: add new "udp.senddelay" parameter
- mmnormalize enhancements
Thanks to Janmejay Singh for the patch.
- RainerScript "foreach" iterator and array reading support
Thanks to Janmejay Singh for the patch.
- now requires liblognorm >= 1.0.2
- add support for systemd >= 209 library names
- BSD "ntp" facility (value 12) is now also supported in filter
Thanks to Douglas K. Rand of Iteris, Inc. for the patch.
Note: this patch was released under ASL 2.0 (see email-conversation).
- bugfix: global(localHostName="xxx") was not respected in all modules
- bugfix: emit correct error message on config-file-not-found
closes https://github.com/rsyslog/rsyslog/issues/173
- bugfix: impstats emitted invalid JSON format (if JSON was selected)
- bugfix: (small) memory leak in omfile's outchannel code
Thanks to Koral Ilgun for reporting this issue.
- bugfix: imuxsock did not deactivate some code not supported by platform
Among potential other problemns, this caused build failure under Solaris.
Note that this build problem just made a broader problem appear that so
far always existed but was not visible.
closes https://github.com/rsyslog/rsyslog/issues/185
------------------------------------------------------------------------------
Version 8.6.0 [v8-stable] 2014-12-02
NOTE: This version also incorporates all changes and enhancements made for
v8.5.0, but in a stable release. For details see immediately below.
@ -64,6 +117,12 @@ v8.5.0, but in a stable release. For details see immediately below.
general, it looks more like a cosmetic issue. For example, with
MySQL it lead to a small memory but also an annoying message about
a thread not properly torn down.
- imttcp was removed because it was an incompleted experimental module
- pmrfc3164sd because it was a custom module nobody used
We used to keep this as a sample inside the tree, but whoever wants
to look at it can check in older versions inside git.
- omoracle was removed because it was orphaned and did not build/work
for quite some years and nobody was interested in fixing it
---------------------------------------------------------------------------
Version 8.5.0 [v8-stable] 2014-10-24
- imfile greatly refactored and support for wildcards added

4
Makefile.am

@ -220,6 +220,10 @@ if ENABLE_MAIL
SUBDIRS += plugins/ommail
endif
if ENABLE_OMKAFKA
SUBDIRS += plugins/omkafka
endif
if ENABLE_OMPROG
SUBDIRS += plugins/omprog
endif

45
Makefile.in

@ -123,18 +123,19 @@ sbin_PROGRAMS =
@ENABLE_IMPTCP_TRUE@am__append_36 = plugins/imptcp
@ENABLE_IMDIAG_TRUE@am__append_37 = plugins/imdiag
@ENABLE_MAIL_TRUE@am__append_38 = plugins/ommail
@ENABLE_OMPROG_TRUE@am__append_39 = plugins/omprog
@ENABLE_RFC3195_TRUE@am__append_40 = plugins/im3195
@ENABLE_MMNORMALIZE_TRUE@am__append_41 = plugins/mmnormalize
@ENABLE_MMJSONPARSE_TRUE@am__append_42 = plugins/mmjsonparse
@ENABLE_MMAUDIT_TRUE@am__append_43 = plugins/mmaudit
@ENABLE_MMANON_TRUE@am__append_44 = plugins/mmanon
@ENABLE_MMUTF8FIX_TRUE@am__append_45 = plugins/mmutf8fix
@ENABLE_MMCOUNT_TRUE@am__append_46 = contrib/mmcount
@ENABLE_MMSEQUENCE_TRUE@am__append_47 = contrib/mmsequence
@ENABLE_MMFIELDS_TRUE@am__append_48 = plugins/mmfields
@ENABLE_MMPSTRUCDATA_TRUE@am__append_49 = plugins/mmpstrucdata
@ENABLE_MMRFC5424ADDHMAC_TRUE@am__append_50 = contrib/mmrfc5424addhmac
@ENABLE_OMKAFKA_TRUE@am__append_39 = plugins/omkafka
@ENABLE_OMPROG_TRUE@am__append_40 = plugins/omprog
@ENABLE_RFC3195_TRUE@am__append_41 = plugins/im3195
@ENABLE_MMNORMALIZE_TRUE@am__append_42 = plugins/mmnormalize
@ENABLE_MMJSONPARSE_TRUE@am__append_43 = plugins/mmjsonparse
@ENABLE_MMAUDIT_TRUE@am__append_44 = plugins/mmaudit
@ENABLE_MMANON_TRUE@am__append_45 = plugins/mmanon
@ENABLE_MMUTF8FIX_TRUE@am__append_46 = plugins/mmutf8fix
@ENABLE_MMCOUNT_TRUE@am__append_47 = contrib/mmcount
@ENABLE_MMSEQUENCE_TRUE@am__append_48 = contrib/mmsequence
@ENABLE_MMFIELDS_TRUE@am__append_49 = plugins/mmfields
@ENABLE_MMPSTRUCDATA_TRUE@am__append_50 = plugins/mmpstrucdata
@ENABLE_MMRFC5424ADDHMAC_TRUE@am__append_51 = contrib/mmrfc5424addhmac
subdir = .
DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
@ -142,7 +143,8 @@ DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
$(srcdir)/config.h.in depcomp COPYING COPYING.LESSER compile \
config.guess config.sub install-sh missing ylwrap ltmain.sh
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/atomic_operations.m4 \
am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_define.m4 \
$(top_srcdir)/m4/atomic_operations.m4 \
$(top_srcdir)/m4/atomic_operations_64bit.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
@ -314,11 +316,11 @@ DIST_SUBDIRS = compat runtime grammar . plugins/immark \
plugins/omuxsock plugins/omhdfs plugins/omjournal \
plugins/imjournal plugins/omelasticsearch plugins/mmsnmptrapd \
plugins/imfile plugins/imptcp plugins/imdiag plugins/ommail \
plugins/omprog plugins/im3195 plugins/mmnormalize \
plugins/mmjsonparse plugins/mmaudit plugins/mmanon \
plugins/mmutf8fix contrib/mmcount contrib/mmsequence \
plugins/mmfields plugins/mmpstrucdata contrib/mmrfc5424addhmac \
tests
plugins/omkafka plugins/omprog plugins/im3195 \
plugins/mmnormalize plugins/mmjsonparse plugins/mmaudit \
plugins/mmanon plugins/mmutf8fix contrib/mmcount \
contrib/mmsequence plugins/mmfields plugins/mmpstrucdata \
contrib/mmrfc5424addhmac tests
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@ -397,8 +399,6 @@ GREP = @GREP@
GSS_LIBS = @GSS_LIBS@
GUARDTIME_CFLAGS = @GUARDTIME_CFLAGS@
GUARDTIME_LIBS = @GUARDTIME_LIBS@
HAVE_MYSQL_CONFIG = @HAVE_MYSQL_CONFIG@
HAVE_PGSQL_CONFIG = @HAVE_PGSQL_CONFIG@
HIREDIS_CFLAGS = @HIREDIS_CFLAGS@
HIREDIS_LIBS = @HIREDIS_LIBS@
IMUDP_LIBS = @IMUDP_LIBS@
@ -444,6 +444,7 @@ MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MYSQL_CFLAGS = @MYSQL_CFLAGS@
MYSQL_CONFIG = @MYSQL_CONFIG@
MYSQL_LIBS = @MYSQL_LIBS@
NM = @NM@
NMEDIT = @NMEDIT@
@ -463,6 +464,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PGSQL_CFLAGS = @PGSQL_CFLAGS@
PGSQL_LIBS = @PGSQL_LIBS@
PG_CONFIG = @PG_CONFIG@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
@ -491,6 +493,7 @@ UDPSPOOF_LIBS = @UDPSPOOF_LIBS@
VERSION = @VERSION@
YACC = @YACC@
YFLAGS = @YFLAGS@
ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
@ -624,7 +627,7 @@ SUBDIRS = compat runtime grammar . plugins/immark plugins/imuxsock \
$(am__append_41) $(am__append_42) $(am__append_43) \
$(am__append_44) $(am__append_45) $(am__append_46) \
$(am__append_47) $(am__append_48) $(am__append_49) \
$(am__append_50) tests
$(am__append_50) $(am__append_51) tests
# make sure "make distcheck" tries to build all modules. This means that
# a developer must always have an environment where every supporting library

2
README.md

@ -100,7 +100,7 @@ and contribution. We base our work on standards and try to solve all real-world
needs (of course, we occasionally fail tackeling actually all needs ;)). While
the project is primarily sponsored by Adiscon, technical development is
independent from company goals and most decisions are solely based on mailing
list discussion results. There is an active commuity around rsyslog.
list discussion results. There is an active community around rsyslog.
There is no such thing like being an official member of the rsyslog team. The
closest to that is being subscribed to the mailing list:

1
aclocal.m4

@ -1307,6 +1307,7 @@ AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
m4_include([m4/ac_check_define.m4])
m4_include([m4/atomic_operations.m4])
m4_include([m4/atomic_operations_64bit.m4])
m4_include([m4/libtool.m4])

4
action.c

@ -63,7 +63,7 @@
* beast.
* rgerhards, 2011-06-15
*
* Copyright 2007-2014 Rainer Gerhards and Adiscon GmbH.
* Copyright 2007-2015 Rainer Gerhards and Adiscon GmbH.
*
* This file is part of rsyslog.
*
@ -724,7 +724,7 @@ actionDoRetry(action_t * const pThis, wti_t * const pWti)
DBGPRINTF("actionDoRetry: %s had success RDY again (iRet=%d)\n",
pThis->pszName, iRet);
if(pThis->bReportSuspension) {
errmsg.LogMsg(0, RS_RET_OK, LOG_INFO, "action '%s' "
errmsg.LogMsg(0, RS_RET_RESUMED, LOG_INFO, "action '%s' "
"resumed (module '%s')",
pThis->pszName, pThis->pMod->pszName);
}

8
compat/Makefile.in

@ -82,7 +82,8 @@ subdir = compat
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/atomic_operations.m4 \
am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_define.m4 \
$(top_srcdir)/m4/atomic_operations.m4 \
$(top_srcdir)/m4/atomic_operations_64bit.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
@ -202,8 +203,6 @@ GREP = @GREP@
GSS_LIBS = @GSS_LIBS@
GUARDTIME_CFLAGS = @GUARDTIME_CFLAGS@
GUARDTIME_LIBS = @GUARDTIME_LIBS@
HAVE_MYSQL_CONFIG = @HAVE_MYSQL_CONFIG@
HAVE_PGSQL_CONFIG = @HAVE_PGSQL_CONFIG@
HIREDIS_CFLAGS = @HIREDIS_CFLAGS@
HIREDIS_LIBS = @HIREDIS_LIBS@
IMUDP_LIBS = @IMUDP_LIBS@
@ -249,6 +248,7 @@ MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MYSQL_CFLAGS = @MYSQL_CFLAGS@
MYSQL_CONFIG = @MYSQL_CONFIG@
MYSQL_LIBS = @MYSQL_LIBS@
NM = @NM@
NMEDIT = @NMEDIT@
@ -268,6 +268,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PGSQL_CFLAGS = @PGSQL_CFLAGS@
PGSQL_LIBS = @PGSQL_LIBS@
PG_CONFIG = @PG_CONFIG@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
@ -296,6 +297,7 @@ UDPSPOOF_LIBS = @UDPSPOOF_LIBS@
VERSION = @VERSION@
YACC = @YACC@
YFLAGS = @YFLAGS@
ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@

21
config.h.in

@ -115,6 +115,9 @@
/* jemalloc support is integrated. */
#undef HAVE_JEMALLOC
/* Define to 1 if the system has the type `json_bool'. */
#undef HAVE_JSON_BOOL
/* Define to 1 if you have the `json_object_new_int64' function. */
#undef HAVE_JSON_OBJECT_NEW_INT64
@ -130,9 +133,15 @@
/* Define to 1 if you have the `json-c' library (-ljson-c). */
#undef HAVE_LIBJSON_C
/* Define to 1 if liblogging-stdlog is available. */
#undef HAVE_LIBLOGGING_STDLOG
/* Define to 1 if you have the <libnet.h> header file. */
#undef HAVE_LIBNET_H
/* Define to 1 if you have the <librdkafka/rdkafka.h> header file. */
#undef HAVE_LIBRDKAFKA_RDKAFKA_H
/* Define to 1 if you have the <locale.h> header file. */
#undef HAVE_LOCALE_H
@ -409,6 +418,12 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
/* platform id for display purposes */
#undef PLATFORM_ID
/* platform id for display purposes */
#undef PLATFORM_ID_LSB
/* Define as the return type of signal handlers (`int' or `void'). */
#undef RETSIGTYPE
@ -445,9 +460,6 @@
/* Define if you want to enable libuuid support */
#undef USE_LIBUUID
/* Define if you want to enable zlib support */
#undef USE_NETZIP
/* Multithreading support enabled. */
#undef USE_PTHREADS
@ -517,6 +529,9 @@
#define below would cause a syntax error. */
#undef _UINT8_T
/* Use X/Open CAE Specification */
#undef _XOPEN_SOURCE
/* Define to empty if `const' does not conform to ANSI C. */
#undef const

947
configure

File diff suppressed because it is too large

129
configure.ac

@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61)
AC_INIT([rsyslog],[8.6.0],[rsyslog@lists.adiscon.com])
AC_INIT([rsyslog],[8.8.0],[rsyslog@lists.adiscon.com])
AM_INIT_AUTOMAKE([subdir-objects])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@ -30,7 +30,6 @@ PKG_PROG_PKG_CONFIG
# modules we require
PKG_CHECK_MODULES(LIBESTR, libestr >= 0.1.9)
PKG_CHECK_MODULES(LIBLOGGING_STDLOG, liblogging-stdlog >= 1.0.3)
PKG_CHECK_MODULES([JSON_C], [json],, [
PKG_CHECK_MODULES([JSON_C], [json-c],,)
])
@ -48,10 +47,16 @@ AC_CHECK_FUNCS(json_object_new_int64,,)
# look for newer API
AC_CHECK_FUNCS(json_tokener_error_desc,,)
AC_CHECK_FUNCS(json_object_object_get_ex,,)
AC_CHECK_TYPES([json_bool],,,[[#include <json_object.h>]])
CFLAGS="$save_CFLAGS"
LIBS="$save_LIBS"
AC_DEFINE_UNQUOTED([PLATFORM_ID], ["${host}"], [platform id for display purposes])
# we don't mind if we don't have the lsb_release utility. But if we have, it's
# nice to have the extra information.
AC_DEFINE_UNQUOTED([PLATFORM_ID_LSB], ["`lsb_release -d`"], [platform id for display purposes])
case "${host}" in
*-*-linux*)
AC_DEFINE([OS_LINUX], [1], [Indicator for a Linux OS])
@ -70,6 +75,7 @@ case "${host}" in
os_type="solaris"
AC_DEFINE([OS_SOLARIS], [1], [Indicator for a Solaris OS])
AC_DEFINE([_POSIX_PTHREAD_SEMANTICS], [1], [Use POSIX pthread semantics])
AC_DEFINE([_XOPEN_SOURCE], [600], [Use X/Open CAE Specification])
SOL_LIBS="-lsocket -lnsl"
# Solaris libuuid does not ship with a pkgconfig file so override the appropriate
# variables (but only if they have not been set by the user).
@ -232,14 +238,16 @@ if test "$enable_regexp" = "yes"; then
fi
AC_CHECK_HEADER(zlib.h, [zlib_header="yes"], [zlib_header="no" enable_zlib="false"])
if test "$zlib_header" = "yes"; then
AC_CHECK_LIB(z, deflate,
[AC_DEFINE(USE_NETZIP, 1, [Define if you want to enable zlib support])
ZLIB_LIBS="-lz"
AC_SUBST(ZLIB_LIBS)], enable_zlib="false")
fi
# zlib support
PKG_CHECK_MODULES([ZLIB], [zlib], [found_zlib=yes], [found_zlib=no])
AS_IF([test "x$found_zlib" = "xno"], [
AC_SEARCH_LIBS([inflate], [z], [AC_CHECK_HEADER([zlib.h], [found_zlib=yes])])
if test "x$found_zlib" = "xno" ; then
AC_MSG_ERROR([zlib library and headers not found])
fi
ZLIB_LIBS="-lz"
AC_SUBST(ZLIB_LIBS)
])
#gssapi
@ -358,7 +366,9 @@ AC_ARG_ENABLE(imjournal,
[enable_imjournal="no"]
)
if test "x$enable_imjournal" = "xyes"; then
PKG_CHECK_MODULES([LIBSYSTEMD_JOURNAL], [libsystemd-journal >= 197])
PKG_CHECK_MODULES([LIBSYSTEMD_JOURNAL], [libsystemd >= 209] ,, [
PKG_CHECK_MODULES([LIBSYSTEMD_JOURNAL], [libsystemd-journal >= 197])
])
fi
AM_CONDITIONAL(ENABLE_IMJOURNAL, test x$enable_imjournal = xyes)
@ -543,21 +553,22 @@ AC_ARG_ENABLE(mysql,
)
if test "x$enable_mysql" = "xyes"; then
AC_CHECK_PROG(
[HAVE_MYSQL_CONFIG],
[MYSQL_CONFIG],
[mysql_config],
[yes],,,
[mysql_config],
[no],,
)
if test "x${HAVE_MYSQL_CONFIG}" != "xyes"; then
AC_MSG_FAILURE([mysql_config not found in PATH - usually a package named mysql-dev, libmysql-dev or similar, is missing - install it to fix this issue])
if test "x${MYSQL_CONFIG}" = "xno"; then
AC_MSG_FAILURE([mysql_config not found - usually a package named mysql-dev, libmysql-dev or similar, is missing - install it to fix this issue])
fi
AC_CHECK_LIB(
[mysqlclient],
[mysql_init],
[MYSQL_CFLAGS=`mysql_config --cflags`
MYSQL_LIBS=`mysql_config --libs`
[MYSQL_CFLAGS=`$MYSQL_CONFIG --cflags`
MYSQL_LIBS=`$MYSQL_CONFIG --libs`
],
[AC_MSG_FAILURE([MySQL library is missing])],
[`mysql_config --libs`]
[`$MYSQL_CONFIG --libs`]
)
AC_MSG_CHECKING(if we have mysql_library_init)
save_CFLAGS="$CFLAGS"
@ -593,21 +604,22 @@ AC_ARG_ENABLE(pgsql,
)
if test "x$enable_pgsql" = "xyes"; then
AC_CHECK_PROG(
[HAVE_PGSQL_CONFIG],
[PG_CONFIG],
[pg_config],
[pg_config],
[yes],,,
[no],,,
)
if test "x${HAVE_PGSQL_CONFIG}" != "xyes"; then
AC_MSG_FAILURE([pg_config not found in PATH])
if test "x${PG_CONFIG}" = "xno"; then
AC_MSG_FAILURE([pg_config not found])
fi
AC_CHECK_LIB(
[pq],
[PQconnectdb],
[PGSQL_CFLAGS="-I`pg_config --includedir`"
PGSQL_LIBS="-L`pg_config --libdir` -lpq"
[PGSQL_CFLAGS="-I`$PG_CONFIG --includedir`"
PGSQL_LIBS="-L`$PG_CONFIG --libdir` -lpq"
],
[AC_MSG_FAILURE([PgSQL library is missing])],
[-L`pg_config --libdir`]
[-L`$PG_CONFIG --libdir`]
)
fi
AM_CONDITIONAL(ENABLE_PGSQL, test x$enable_pgsql = xyes)
@ -823,8 +835,8 @@ AM_CONDITIONAL(ENABLE_RSYSLOGD, test x$enable_rsyslogd = xyes)
AC_ARG_ENABLE(extended_tests,
[AS_HELP_STRING([--enable-extended-tests],[extended testbench @<:@default=no@:>@])],
[case "${enableval}" in
yes) enable_rsyslogd="yes" ;;
no) enable_rsyslogd="no" ;;
yes) enable_extended_tests="yes" ;;
no) enable_extended_tests="no" ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-extended-tests) ;;
esac],
[enable_extended_tests=no]
@ -891,11 +903,22 @@ AC_ARG_ENABLE(mmnormalize,
[enable_mmnormalize=no]
)
if test "x$enable_mmnormalize" = "xyes"; then
PKG_CHECK_MODULES(LIBLOGNORM, lognorm >= 1.0.0)
PKG_CHECK_MODULES(LIBLOGNORM, lognorm >= 1.0.2)
save_CFLAGS="$CFLAGS"
save_LIBS="$LIBS"
CFLAGS="$CFLAGS $LIBLOGNORM_CFLAGS"
LIBS="$LIBS $LIBLOGNORM_LIBS"
AX_CHECK_DEFINED([[#include <lognorm-features.h>]],LOGNORM_REGEX_SUPPORTED,[lognorm_regex_supported="yes"],)
CFLAGS="$save_CFLAGS"
LIBS="$save_LIBS"
fi
AM_CONDITIONAL(LOGNORM_REGEX_SUPPORTED, test x$lognorm_regex_supported = xyes)
AM_CONDITIONAL(ENABLE_MMNORMALIZE, test x$enable_mmnormalize = xyes)
# mmnjsonparse
AC_ARG_ENABLE(mmjsonparse,
[AS_HELP_STRING([--enable-mmjsonparse],[Enable building mmjsonparse support @<:@default=no@:>@])],
@ -908,7 +931,6 @@ AC_ARG_ENABLE(mmjsonparse,
)
AM_CONDITIONAL(ENABLE_MMJSONPARSE, test x$enable_mmjsonparse = xyes)
# mmaudit
AC_ARG_ENABLE(mmaudit,
[AS_HELP_STRING([--enable-mmaudit],[Enable building mmaudit support @<:@default=no@:>@])],
@ -1050,6 +1072,24 @@ fi
AM_CONDITIONAL(ENABLE_GUARDTIME, test x$enable_guardtime = xyes)
# liblogging-stdlog support
AC_ARG_ENABLE(liblogging-stdlog,
[AS_HELP_STRING([--enable-liblogging-stdlog],[Enable liblogging-stdlog support @<:@default=yes@:>@])],
[case "${enableval}" in
yes) enable_liblogging_stdlog="yes" ;;
no) enable_liblogging_stdlog="no" ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-liblogging-stdlog) ;;
esac],
[enable_liblogging_stdlog=yes]
)
if test "x$enable_liblogging_stdlog" = "xyes"; then
PKG_CHECK_MODULES(LIBLOGGING_STDLOG, liblogging-stdlog >= 1.0.3,
AC_DEFINE(HAVE_LIBLOGGING_STDLOG, 1, [Define to 1 if liblogging-stdlog is available.])
)
fi
AM_CONDITIONAL(ENABLE_LIBLOGGING_STDLOG, test x$enable_liblogging_stdlog = xyes)
# RFC 3195 support
AC_ARG_ENABLE(rfc3195,
[AS_HELP_STRING([--enable-rfc3195],[Enable RFC3195 support @<:@default=no@:>@])],
@ -1202,7 +1242,9 @@ AC_ARG_ENABLE(omjournal,
[enable_omjournal=no]
)
if test "x$enable_omjournal" = "xyes"; then
PKG_CHECK_MODULES([LIBSYSTEMD_JOURNAL], [libsystemd-journal >= 197])
PKG_CHECK_MODULES([LIBSYSTEMD_JOURNAL], [libsystemd >= 209] ,, [
PKG_CHECK_MODULES([LIBSYSTEMD_JOURNAL], [libsystemd-journal >= 197])
])
fi
AM_CONDITIONAL(ENABLE_OMJOURNAL, test x$enable_omjournal = xyes)
@ -1313,7 +1355,7 @@ AM_CONDITIONAL(ENABLE_MMSNMPTRAPD, test x$enable_mmsnmptrapd = xyes)
# settings for the omhdfs;
AC_ARG_ENABLE(omhdfs,
[AS_HELP_STRING([--enable-omhdfs],[Compiles omhdfs template module @<:@default=no@:>@])],
[AS_HELP_STRING([--enable-omhdfs],[Compiles omhdfs module @<:@default=no@:>@])],
[case "${enableval}" in
yes) enable_omhdfs="yes" ;;
no) enable_omhdfs="no" ;;
@ -1327,10 +1369,27 @@ fi
AM_CONDITIONAL(ENABLE_OMHDFS, test x$enable_omhdfs = xyes)
# support for omkafka
AC_ARG_ENABLE(omkafka,
[AS_HELP_STRING([--enable-omkafka],[Compiles omkafka module @<:@default=no@:>@])],
[case "${enableval}" in
yes) enable_omkafka="yes" ;;
no) enable_omkafka="no" ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-omkafka) ;;
esac],
[enable_omkafka=no]
)
if test "x$enable_omkafka"; then
#PKG_CHECK_MODULES(LIBRDKAFKA, librdkafka)
AC_CHECK_HEADERS([librdkafka/rdkafka.h])
fi
AM_CONDITIONAL(ENABLE_OMKAFKA, test x$enable_omkafka = xyes)
#MONGODB SUPPORT
AC_ARG_ENABLE(ommongodb,
[AS_HELP_STRING([--enable-ommongodb],[Compiles ommongodb template module @<:@default=no@:>@])],
[AS_HELP_STRING([--enable-ommongodb],[Compiles ommongodb module @<:@default=no@:>@])],
[case "${enableval}" in
yes) enable_ommongodb="yes" ;;
no) enable_ommongodb="no" ;;
@ -1510,6 +1569,7 @@ AC_CONFIG_FILES([Makefile \
plugins/immark/Makefile \
plugins/imklog/Makefile \
plugins/omhdfs/Makefile \
plugins/omkafka/Makefile \
plugins/omprog/Makefile \
plugins/mmexternal/Makefile \
plugins/omstdout/Makefile \
@ -1565,7 +1625,6 @@ echo
echo " Large file support enabled: $enable_largefile"
echo " Networking support enabled: $enable_inet"
echo " Regular expressions support enabled: $enable_regexp"
echo " Zlib compression support enabled: $enable_zlib"
echo " rsyslog runtime will be built: $enable_rsyslogrt"
echo " rsyslogd will be built: $enable_rsyslogd"
echo " have to generate man pages: $have_to_generate_man_pages"
@ -1576,6 +1635,7 @@ echo " Log file encryption support: $enable_libgcrypt"
echo " anonymization support enabled: $enable_mmanon"
echo " message counting support enabled: $enable_mmcount"
echo " mmfields enabled: $enable_mmfields"
echo " liblogging-stdlog support enabled: $enable_liblogging_stdlog"
echo
echo "---{ input plugins }---"
echo " Klog functionality enabled: $enable_klog ($os_type)"
@ -1591,6 +1651,7 @@ echo " imjournal input module enabled: $enable_imjournal"
echo
echo "---{ output plugins }---"
echo " Mail support enabled: $enable_mail"
echo " omkafka module will be compiled: $enable_omkafka"
echo " omprog module will be compiled: $enable_omprog"
echo " omstdout module will be compiled: $enable_omstdout"
echo " omjournal module will be compiled: $enable_omjournal"

8
contrib/imczmq/Makefile.in

@ -82,7 +82,8 @@ subdir = contrib/imczmq
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/depcomp README
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/atomic_operations.m4 \
am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_define.m4 \
$(top_srcdir)/m4/atomic_operations.m4 \
$(top_srcdir)/m4/atomic_operations_64bit.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
@ -230,8 +231,6 @@ GREP = @GREP@
GSS_LIBS = @GSS_LIBS@
GUARDTIME_CFLAGS = @GUARDTIME_CFLAGS@
GUARDTIME_LIBS = @GUARDTIME_LIBS@
HAVE_MYSQL_CONFIG = @HAVE_MYSQL_CONFIG@
HAVE_PGSQL_CONFIG = @HAVE_PGSQL_CONFIG@
HIREDIS_CFLAGS = @HIREDIS_CFLAGS@
HIREDIS_LIBS = @HIREDIS_LIBS@
IMUDP_LIBS = @IMUDP_LIBS@
@ -277,6 +276,7 @@ MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MYSQL_CFLAGS = @MYSQL_CFLAGS@
MYSQL_CONFIG = @MYSQL_CONFIG@
MYSQL_LIBS = @MYSQL_LIBS@
NM = @NM@
NMEDIT = @NMEDIT@
@ -296,6 +296,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PGSQL_CFLAGS = @PGSQL_CFLAGS@
PGSQL_LIBS = @PGSQL_LIBS@
PG_CONFIG = @PG_CONFIG@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
@ -324,6 +325,7 @@ UDPSPOOF_LIBS = @UDPSPOOF_LIBS@
VERSION = @VERSION@
YACC = @YACC@
YFLAGS = @YFLAGS@
ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@

8
contrib/imkmsg/Makefile.in

@ -82,7 +82,8 @@ subdir = contrib/imkmsg
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/atomic_operations.m4 \
am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_define.m4 \
$(top_srcdir)/m4/atomic_operations.m4 \
$(top_srcdir)/m4/atomic_operations_64bit.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
@ -229,8 +230,6 @@ GREP = @GREP@
GSS_LIBS = @GSS_LIBS@
GUARDTIME_CFLAGS = @GUARDTIME_CFLAGS@
GUARDTIME_LIBS = @GUARDTIME_LIBS@
HAVE_MYSQL_CONFIG = @HAVE_MYSQL_CONFIG@
HAVE_PGSQL_CONFIG = @HAVE_PGSQL_CONFIG@
HIREDIS_CFLAGS = @HIREDIS_CFLAGS@
HIREDIS_LIBS = @HIREDIS_LIBS@
IMUDP_LIBS = @IMUDP_LIBS@
@ -276,6 +275,7 @@ MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MYSQL_CFLAGS = @MYSQL_CFLAGS@
MYSQL_CONFIG = @MYSQL_CONFIG@
MYSQL_LIBS = @MYSQL_LIBS@
NM = @NM@
NMEDIT = @NMEDIT@
@ -295,6 +295,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PGSQL_CFLAGS = @PGSQL_CFLAGS@
PGSQL_LIBS = @PGSQL_LIBS@
PG_CONFIG = @PG_CONFIG@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
@ -323,6 +324,7 @@ UDPSPOOF_LIBS = @UDPSPOOF_LIBS@
VERSION = @VERSION@
YACC = @YACC@
YFLAGS = @YFLAGS@
ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@

3
contrib/imkmsg/imkmsg.c

@ -208,7 +208,7 @@ ENDcheckCnf
BEGINactivateCnfPrePrivDrop
CODESTARTactivateCnfPrePrivDrop
runModConf = pModConf;
iRet = klogWillRun(runModConf);
iRet = klogWillRunPrePrivDrop(runModConf);
ENDactivateCnfPrePrivDrop
@ -224,6 +224,7 @@ ENDfreeCnf
BEGINwillRun
CODESTARTwillRun
iRet = klogWillRunPostPrivDrop(runModConf);
ENDwillRun

3
contrib/imkmsg/imkmsg.h

@ -42,7 +42,8 @@ struct modConfData_s {
* rgerhards, 2008-04-09
*/
rsRetVal klogLogKMsg(modConfData_t *pModConf);
rsRetVal klogWillRun(modConfData_t *pModConf);
rsRetVal klogWillRunPrePrivDrop(modConfData_t *pModConf);
rsRetVal klogWillRunPostPrivDrop(modConfData_t *pModConf);
rsRetVal klogAfterRun(modConfData_t *pModConf);
int klogFacilIntMsg();

28
contrib/imkmsg/kmsg.c

@ -156,24 +156,36 @@ submitSyslog(uchar *buf)
/* open the kernel log - will be called inside the willRun() imkmsg entry point
*/
rsRetVal
klogWillRun(modConfData_t *pModConf)
klogWillRunPrePrivDrop(modConfData_t *pModConf)
{
int i;
char errmsg[2048];
DEFiRet;
fklog = open(_PATH_KLOG, O_RDONLY, 0);
if (fklog < 0) {
imkmsgLogIntMsg(RS_RET_ERR_OPEN_KLOG, "imkmsg: cannot open kernel log(%s): %s.",
imkmsgLogIntMsg(LOG_ERR, "imkmsg: cannot open kernel log (%s): %s.",
_PATH_KLOG, rs_strerror_r(errno, errmsg, sizeof(errmsg)));
ABORT_FINALIZE(RS_RET_ERR_OPEN_KLOG);
}
/* make sure the kernel log is readable */
/* this normally returns EINVAL - on an OpenVZ VM, we get EBADF */
i = read(fklog, NULL, 0);
if (i < 0 && errno == EBADF) {
imkmsgLogIntMsg(RS_RET_ERR_OPEN_KLOG, "imkmsg: cannot read kernel log(%s): %s.",
finalize_it:
RETiRet;
}
/* make sure the kernel log is readable after dropping privileges
*/
rsRetVal
klogWillRunPostPrivDrop(modConfData_t *pModConf)
{
char errmsg[2048];
int r;
DEFiRet;
/* this normally returns EINVAL */
/* on an OpenVZ VM, we get EPERM */
r = read(fklog, NULL, 0);
if (r < 0 && errno != EINVAL) {
imkmsgLogIntMsg(LOG_ERR, "imkmsg: cannot open kernel log (%s): %s.",
_PATH_KLOG, rs_strerror_r(errno, errmsg, sizeof(errmsg)));
fklog = -1;
ABORT_FINALIZE(RS_RET_ERR_OPEN_KLOG);

8
contrib/imzmq3/Makefile.in

@ -82,7 +82,8 @@ subdir = contrib/imzmq3
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/depcomp README
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/atomic_operations.m4 \
am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_define.m4 \
$(top_srcdir)/m4/atomic_operations.m4 \
$(top_srcdir)/m4/atomic_operations_64bit.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
@ -230,8 +231,6 @@ GREP = @GREP@
GSS_LIBS = @GSS_LIBS@
GUARDTIME_CFLAGS = @GUARDTIME_CFLAGS@
GUARDTIME_LIBS = @GUARDTIME_LIBS@
HAVE_MYSQL_CONFIG = @HAVE_MYSQL_CONFIG@
HAVE_PGSQL_CONFIG = @HAVE_PGSQL_CONFIG@
HIREDIS_CFLAGS = @HIREDIS_CFLAGS@
HIREDIS_LIBS = @HIREDIS_LIBS@
IMUDP_LIBS = @IMUDP_LIBS@
@ -277,6 +276,7 @@ MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MYSQL_CFLAGS = @MYSQL_CFLAGS@
MYSQL_CONFIG = @MYSQL_CONFIG@
MYSQL_LIBS = @MYSQL_LIBS@
NM = @NM@
NMEDIT = @NMEDIT@
@ -296,6 +296,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PGSQL_CFLAGS = @PGSQL_CFLAGS@
PGSQL_LIBS = @PGSQL_LIBS@
PG_CONFIG = @PG_CONFIG@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
@ -324,6 +325,7 @@ UDPSPOOF_LIBS = @UDPSPOOF_LIBS@
VERSION = @VERSION@
YACC = @YACC@
YFLAGS = @YFLAGS@
ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@

8
contrib/mmcount/Makefile.in

@ -82,7 +82,8 @@ subdir = contrib/mmcount
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/atomic_operations.m4 \
am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_define.m4 \
$(top_srcdir)/m4/atomic_operations.m4 \
$(top_srcdir)/m4/atomic_operations_64bit.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
@ -229,8 +230,6 @@ GREP = @GREP@
GSS_LIBS = @GSS_LIBS@
GUARDTIME_CFLAGS = @GUARDTIME_CFLAGS@
GUARDTIME_LIBS = @GUARDTIME_LIBS@
HAVE_MYSQL_CONFIG = @HAVE_MYSQL_CONFIG@
HAVE_PGSQL_CONFIG = @HAVE_PGSQL_CONFIG@
HIREDIS_CFLAGS = @HIREDIS_CFLAGS@
HIREDIS_LIBS = @HIREDIS_LIBS@
IMUDP_LIBS = @IMUDP_LIBS@
@ -276,6 +275,7 @@ MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MYSQL_CFLAGS = @MYSQL_CFLAGS@
MYSQL_CONFIG = @MYSQL_CONFIG@
MYSQL_LIBS = @MYSQL_LIBS@
NM = @NM@
NMEDIT = @NMEDIT@
@ -295,6 +295,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PGSQL_CFLAGS = @PGSQL_CFLAGS@
PGSQL_LIBS = @PGSQL_LIBS@
PG_CONFIG = @PG_CONFIG@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
@ -323,6 +324,7 @@ UDPSPOOF_LIBS = @UDPSPOOF_LIBS@
VERSION = @VERSION@
YACC = @YACC@
YFLAGS = @YFLAGS@
ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@

2
contrib/mmcount/mmcount.c

@ -321,7 +321,7 @@ finalize_it:
}
if(json) {
msgAddJSON(pMsg, (uchar *)JSON_COUNT_NAME, json);
msgAddJSON(pMsg, (uchar *)JSON_COUNT_NAME, json, 0);
}
ENDdoAction

8
contrib/mmrfc5424addhmac/Makefile.in

@ -82,7 +82,8 @@ subdir = contrib/mmrfc5424addhmac
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/atomic_operations.m4 \
am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_define.m4 \
$(top_srcdir)/m4/atomic_operations.m4 \
$(top_srcdir)/m4/atomic_operations_64bit.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
@ -232,8 +233,6 @@ GREP = @GREP@
GSS_LIBS = @GSS_LIBS@
GUARDTIME_CFLAGS = @GUARDTIME_CFLAGS@
GUARDTIME_LIBS = @GUARDTIME_LIBS@
HAVE_MYSQL_CONFIG = @HAVE_MYSQL_CONFIG@
HAVE_PGSQL_CONFIG = @HAVE_PGSQL_CONFIG@
HIREDIS_CFLAGS = @HIREDIS_CFLAGS@
HIREDIS_LIBS = @HIREDIS_LIBS@
IMUDP_LIBS = @IMUDP_LIBS@
@ -279,6 +278,7 @@ MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MYSQL_CFLAGS = @MYSQL_CFLAGS@
MYSQL_CONFIG = @MYSQL_CONFIG@
MYSQL_LIBS = @MYSQL_LIBS@
NM = @NM@
NMEDIT = @NMEDIT@
@ -298,6 +298,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PGSQL_CFLAGS = @PGSQL_CFLAGS@
PGSQL_LIBS = @PGSQL_LIBS@
PG_CONFIG = @PG_CONFIG@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
@ -326,6 +327,7 @@ UDPSPOOF_LIBS = @UDPSPOOF_LIBS@
VERSION = @VERSION@
YACC = @YACC@
YFLAGS = @YFLAGS@
ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@

8
contrib/mmsequence/Makefile.in

@ -82,7 +82,8 @@ subdir = contrib/mmsequence
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/atomic_operations.m4 \
am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_define.m4 \
$(top_srcdir)/m4/atomic_operations.m4 \
$(top_srcdir)/m4/atomic_operations_64bit.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
@ -229,8 +230,6 @@ GREP = @GREP@
GSS_LIBS = @GSS_LIBS@
GUARDTIME_CFLAGS = @GUARDTIME_CFLAGS@
GUARDTIME_LIBS = @GUARDTIME_LIBS@
HAVE_MYSQL_CONFIG = @HAVE_MYSQL_CONFIG@
HAVE_PGSQL_CONFIG = @HAVE_PGSQL_CONFIG@
HIREDIS_CFLAGS = @HIREDIS_CFLAGS@
HIREDIS_LIBS = @HIREDIS_LIBS@
IMUDP_LIBS = @IMUDP_LIBS@
@ -276,6 +275,7 @@ MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MYSQL_CFLAGS = @MYSQL_CFLAGS@
MYSQL_CONFIG = @MYSQL_CONFIG@
MYSQL_LIBS = @MYSQL_LIBS@
NM = @NM@
NMEDIT = @NMEDIT@
@ -295,6 +295,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PGSQL_CFLAGS = @PGSQL_CFLAGS@
PGSQL_LIBS = @PGSQL_LIBS@
PG_CONFIG = @PG_CONFIG@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
@ -323,6 +324,7 @@ UDPSPOOF_LIBS = @UDPSPOOF_LIBS@
VERSION = @VERSION@
YACC = @YACC@
YFLAGS = @YFLAGS@
ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@

2
contrib/mmsequence/mmsequence.c

@ -373,7 +373,7 @@ CODESTARTdoAction
if (json == NULL) {
errmsg.LogError(0, RS_RET_OBJ_CREATION_FAILED,
"mmsequence: unable to create JSON");
} else if (RS_RET_OK != msgAddJSON(pMsg, (uchar *)pData->pszVar + 1, json)) {
} else if (RS_RET_OK != msgAddJSON(pMsg, (uchar *)pData->pszVar + 1, json, 0)) {
errmsg.LogError(0, RS_RET_OBJ_CREATION_FAILED,
"mmsequence: unable to pass out the value");
json_object_put(json);

8
contrib/omczmq/Makefile.in

@ -82,7 +82,8 @@ subdir = contrib/omczmq
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/depcomp README
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/atomic_operations.m4 \
am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_define.m4 \
$(top_srcdir)/m4/atomic_operations.m4 \
$(top_srcdir)/m4/atomic_operations_64bit.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
@ -230,8 +231,6 @@ GREP = @GREP@
GSS_LIBS = @GSS_LIBS@
GUARDTIME_CFLAGS = @GUARDTIME_CFLAGS@
GUARDTIME_LIBS = @GUARDTIME_LIBS@
HAVE_MYSQL_CONFIG = @HAVE_MYSQL_CONFIG@
HAVE_PGSQL_CONFIG = @HAVE_PGSQL_CONFIG@
HIREDIS_CFLAGS = @HIREDIS_CFLAGS@
HIREDIS_LIBS = @HIREDIS_LIBS@
IMUDP_LIBS = @IMUDP_LIBS@
@ -277,6 +276,7 @@ MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MYSQL_CFLAGS = @MYSQL_CFLAGS@
MYSQL_CONFIG = @MYSQL_CONFIG@
MYSQL_LIBS = @MYSQL_LIBS@
NM = @NM@
NMEDIT = @NMEDIT@
@ -296,6 +296,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PGSQL_CFLAGS = @PGSQL_CFLAGS@
PGSQL_LIBS = @PGSQL_LIBS@
PG_CONFIG = @PG_CONFIG@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
@ -324,6 +325,7 @@ UDPSPOOF_LIBS = @UDPSPOOF_LIBS@
VERSION = @VERSION@
YACC = @YACC@
YFLAGS = @YFLAGS@
ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@

8
contrib/omhiredis/Makefile.in

@ -82,7 +82,8 @@ subdir = contrib/omhiredis
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/depcomp COPYING README
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/atomic_operations.m4 \
am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_define.m4 \
$(top_srcdir)/m4/atomic_operations.m4 \
$(top_srcdir)/m4/atomic_operations_64bit.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
@ -230,8 +231,6 @@ GREP = @GREP@
GSS_LIBS = @GSS_LIBS@
GUARDTIME_CFLAGS = @GUARDTIME_CFLAGS@
GUARDTIME_LIBS = @GUARDTIME_LIBS@
HAVE_MYSQL_CONFIG = @HAVE_MYSQL_CONFIG@
HAVE_PGSQL_CONFIG = @HAVE_PGSQL_CONFIG@
HIREDIS_CFLAGS = @HIREDIS_CFLAGS@
HIREDIS_LIBS = @HIREDIS_LIBS@
IMUDP_LIBS = @IMUDP_LIBS@
@ -277,6 +276,7 @@ MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MYSQL_CFLAGS = @MYSQL_CFLAGS@
MYSQL_CONFIG = @MYSQL_CONFIG@
MYSQL_LIBS = @MYSQL_LIBS@
NM = @NM@
NMEDIT = @NMEDIT@
@ -296,6 +296,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PGSQL_CFLAGS = @PGSQL_CFLAGS@
PGSQL_LIBS = @PGSQL_LIBS@
PG_CONFIG = @PG_CONFIG@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
@ -324,6 +325,7 @@ UDPSPOOF_LIBS = @UDPSPOOF_LIBS@
VERSION = @VERSION@
YACC = @YACC@
YFLAGS = @YFLAGS@
ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@

8
contrib/omrabbitmq/Makefile.in

@ -82,7 +82,8 @@ subdir = contrib/omrabbitmq
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/atomic_operations.m4 \
am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_define.m4 \
$(top_srcdir)/m4/atomic_operations.m4 \
$(top_srcdir)/m4/atomic_operations_64bit.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
@ -230,8 +231,6 @@ GREP = @GREP@
GSS_LIBS = @GSS_LIBS@
GUARDTIME_CFLAGS = @GUARDTIME_CFLAGS@
GUARDTIME_LIBS = @GUARDTIME_LIBS@
HAVE_MYSQL_CONFIG = @HAVE_MYSQL_CONFIG@
HAVE_PGSQL_CONFIG = @HAVE_PGSQL_CONFIG@
HIREDIS_CFLAGS = @HIREDIS_CFLAGS@
HIREDIS_LIBS = @HIREDIS_LIBS@
IMUDP_LIBS = @IMUDP_LIBS@
@ -277,6 +276,7 @@ MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MYSQL_CFLAGS = @MYSQL_CFLAGS@
MYSQL_CONFIG = @MYSQL_CONFIG@
MYSQL_LIBS = @MYSQL_LIBS@
NM = @NM@
NMEDIT = @NMEDIT@
@ -296,6 +296,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PGSQL_CFLAGS = @PGSQL_CFLAGS@
PGSQL_LIBS = @PGSQL_LIBS@
PG_CONFIG = @PG_CONFIG@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
@ -324,6 +325,7 @@ UDPSPOOF_LIBS = @UDPSPOOF_LIBS@
VERSION = @VERSION@
YACC = @YACC@
YFLAGS = @YFLAGS@
ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@

8
contrib/omzmq3/Makefile.in

@ -82,7 +82,8 @@ subdir = contrib/omzmq3
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/depcomp README
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/atomic_operations.m4 \
am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_define.m4 \
$(top_srcdir)/m4/atomic_operations.m4 \
$(top_srcdir)/m4/atomic_operations_64bit.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
@ -230,8 +231,6 @@ GREP = @GREP@
GSS_LIBS = @GSS_LIBS@
GUARDTIME_CFLAGS = @GUARDTIME_CFLAGS@
GUARDTIME_LIBS = @GUARDTIME_LIBS@
HAVE_MYSQL_CONFIG = @HAVE_MYSQL_CONFIG@
HAVE_PGSQL_CONFIG = @HAVE_PGSQL_CONFIG@
HIREDIS_CFLAGS = @HIREDIS_CFLAGS@
HIREDIS_LIBS = @HIREDIS_LIBS@
IMUDP_LIBS = @IMUDP_LIBS@
@ -277,6 +276,7 @@ MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MYSQL_CFLAGS = @MYSQL_CFLAGS@
MYSQL_CONFIG = @MYSQL_CONFIG@
MYSQL_LIBS = @MYSQL_LIBS@
NM = @NM@
NMEDIT = @NMEDIT@
@ -296,6 +296,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PGSQL_CFLAGS = @PGSQL_CFLAGS@
PGSQL_LIBS = @PGSQL_LIBS@
PG_CONFIG = @PG_CONFIG@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
@ -324,6 +325,7 @@ UDPSPOOF_LIBS = @UDPSPOOF_LIBS@
VERSION = @VERSION@
YACC = @YACC@
YFLAGS = @YFLAGS@
ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@

8
contrib/pmaixforwardedfrom/Makefile.in

@ -82,7 +82,8 @@ subdir = contrib/pmaixforwardedfrom
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/atomic_operations.m4 \
am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_define.m4 \
$(top_srcdir)/m4/atomic_operations.m4 \
$(top_srcdir)/m4/atomic_operations_64bit.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
@ -231,8 +232,6 @@ GREP = @GREP@
GSS_LIBS = @GSS_LIBS@
GUARDTIME_CFLAGS = @GUARDTIME_CFLAGS@
GUARDTIME_LIBS = @GUARDTIME_LIBS@
HAVE_MYSQL_CONFIG = @HAVE_MYSQL_CONFIG@
HAVE_PGSQL_CONFIG = @HAVE_PGSQL_CONFIG@
HIREDIS_CFLAGS = @HIREDIS_CFLAGS@
HIREDIS_LIBS = @HIREDIS_LIBS@
IMUDP_LIBS = @IMUDP_LIBS@
@ -278,6 +277,7 @@ MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MYSQL_CFLAGS = @MYSQL_CFLAGS@
MYSQL_CONFIG = @MYSQL_CONFIG@
MYSQL_LIBS = @MYSQL_LIBS@
NM = @NM@
NMEDIT = @NMEDIT@
@ -297,6 +297,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PGSQL_CFLAGS = @PGSQL_CFLAGS@
PGSQL_LIBS = @PGSQL_LIBS@
PG_CONFIG = @PG_CONFIG@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
@ -325,6 +326,7 @@ UDPSPOOF_LIBS = @UDPSPOOF_LIBS@
VERSION = @VERSION@
YACC = @YACC@
YFLAGS = @YFLAGS@
ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@

8
contrib/pmcisconames/Makefile.in

@ -82,7 +82,8 @@ subdir = contrib/pmcisconames
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/atomic_operations.m4 \
am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_define.m4 \
$(top_srcdir)/m4/atomic_operations.m4 \
$(top_srcdir)/m4/atomic_operations_64bit.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
@ -230,8 +231,6 @@ GREP = @GREP@
GSS_LIBS = @GSS_LIBS@
GUARDTIME_CFLAGS = @GUARDTIME_CFLAGS@
GUARDTIME_LIBS = @GUARDTIME_LIBS@
HAVE_MYSQL_CONFIG = @HAVE_MYSQL_CONFIG@
HAVE_PGSQL_CONFIG = @HAVE_PGSQL_CONFIG@
HIREDIS_CFLAGS = @HIREDIS_CFLAGS@
HIREDIS_LIBS = @HIREDIS_LIBS@
IMUDP_LIBS = @IMUDP_LIBS@
@ -277,6 +276,7 @@ MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MYSQL_CFLAGS = @MYSQL_CFLAGS@
MYSQL_CONFIG = @MYSQL_CONFIG@
MYSQL_LIBS = @MYSQL_LIBS@
NM = @NM@
NMEDIT = @NMEDIT@
@ -296,6 +296,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PGSQL_CFLAGS = @PGSQL_CFLAGS@
PGSQL_LIBS = @PGSQL_LIBS@
PG_CONFIG = @PG_CONFIG@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
@ -324,6 +325,7 @@ UDPSPOOF_LIBS = @UDPSPOOF_LIBS@
VERSION = @VERSION@
YACC = @YACC@
YFLAGS = @YFLAGS@
ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@

8
contrib/pmsnare/Makefile.in

@ -82,7 +82,8 @@ subdir = contrib/pmsnare
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/atomic_operations.m4 \
am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_define.m4 \
$(top_srcdir)/m4/atomic_operations.m4 \
$(top_srcdir)/m4/atomic_operations_64bit.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
@ -229,8 +230,6 @@ GREP = @GREP@
GSS_LIBS = @GSS_LIBS@
GUARDTIME_CFLAGS = @GUARDTIME_CFLAGS@
GUARDTIME_LIBS = @GUARDTIME_LIBS@
HAVE_MYSQL_CONFIG = @HAVE_MYSQL_CONFIG@
HAVE_PGSQL_CONFIG = @HAVE_PGSQL_CONFIG@
HIREDIS_CFLAGS = @HIREDIS_CFLAGS@
HIREDIS_LIBS = @HIREDIS_LIBS@
IMUDP_LIBS = @IMUDP_LIBS@
@ -276,6 +275,7 @@ MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MYSQL_CFLAGS = @MYSQL_CFLAGS@
MYSQL_CONFIG = @MYSQL_CONFIG@
MYSQL_LIBS = @MYSQL_LIBS@
NM = @NM@
NMEDIT = @NMEDIT@