Browse Source

Imported Upstream version 3.20.2

upstream upstream/3.20.2
Michael Biebl 14 years ago
parent
commit
84080b58f8
  1. 213
      ChangeLog
  2. 153
      Makefile.am
  3. 1043
      Makefile.in
  4. 18
      action.c
  5. 6
      config.h.in
  6. 704
      configure
  7. 88
      configure.ac
  8. 15
      contrib/gnutls/ca.pem
  9. 16
      contrib/gnutls/cert.pem
  10. 15
      contrib/gnutls/key.pem
  11. 81
      dirty.h
  12. 20
      doc/Makefile.am
  13. 31
      doc/Makefile.in
  14. 39
      doc/features.html
  15. 46
      doc/im3195.html
  16. 13
      doc/imtcp.html
  17. 19
      doc/manual.html
  18. 21
      doc/netstream.html
  19. 59
      doc/ns_gtls.html
  20. 16
      doc/ns_ptcp.html
  21. 55
      doc/professional_support.html
  22. 53
      doc/property_replacer.html
  23. 28
      doc/rsyslog_conf.html
  24. 2
      doc/rsyslog_mysql.html
  25. 36
      doc/rsyslog_ng_comparison.html
  26. 127
      doc/rsyslog_secure_tls.html
  27. 488
      doc/rsyslog_stunnel.html
  28. 307
      doc/rsyslog_tls.html
  29. 0
      doc/src/queueWorkerLogic.dia
  30. BIN
      doc/src/tls_cert.dia
  31. 24
      doc/status.html
  32. BIN
      doc/tls_cert.jpg
  33. BIN
      doc/tls_cert_100.jpg
  34. 168
      doc/tls_cert_ca.html
  35. BIN
      doc/tls_cert_ca.jpg
  36. 91
      doc/tls_cert_client.html
  37. 103
      doc/tls_cert_errmsgs.html
  38. 172
      doc/tls_cert_machine.html
  39. 63
      doc/tls_cert_scenario.html
  40. 118
      doc/tls_cert_server.html
  41. 66
      doc/tls_cert_summary.html
  42. 105
      doc/tls_cert_udp_relay.html
  43. 26
      gss-misc.c
  44. 115
      net.h
  45. 645
      omfwd.c
  46. 2
      outchannel.c
  47. 2
      parse.c
  48. 19
      parse.h
  49. 8
      plugins/im3195/Makefile.am
  50. 506
      plugins/im3195/Makefile.in
  51. 167
      plugins/im3195/im3195.c
  52. 2
      plugins/imfile/Makefile.am
  53. 13
      plugins/imfile/Makefile.in
  54. 28
      plugins/imfile/imfile.c
  55. 2
      plugins/imgssapi/Makefile.am
  56. 13
      plugins/imgssapi/Makefile.in
  57. 79
      plugins/imgssapi/imgssapi.c
  58. 2
      plugins/imklog/Makefile.am
  59. 13
      plugins/imklog/Makefile.in
  60. 12
      plugins/imklog/imklog.c
  61. 2
      plugins/imklog/imklog.h
  62. 9
      plugins/imklog/linux.c
  63. 2
      plugins/immark/Makefile.am
  64. 13
      plugins/immark/Makefile.in
  65. 5
      plugins/immark/immark.c
  66. 2
      plugins/imrelp/Makefile.am
  67. 13
      plugins/imrelp/Makefile.in
  68. 6
      plugins/imrelp/imrelp.c
  69. 2
      plugins/imtcp/Makefile.am
  70. 13
      plugins/imtcp/Makefile.in
  71. 85
      plugins/imtcp/imtcp.c
  72. 2
      plugins/imtemplate/Makefile.am
  73. 13
      plugins/imtemplate/Makefile.in
  74. 2
      plugins/imudp/Makefile.am
  75. 13
      plugins/imudp/Makefile.in
  76. 33
      plugins/imudp/imudp.c
  77. 2
      plugins/imuxsock/Makefile.am
  78. 13
      plugins/imuxsock/Makefile.in
  79. 25
      plugins/imuxsock/imuxsock.c
  80. 2
      plugins/omgssapi/Makefile.am
  81. 13
      plugins/omgssapi/Makefile.in
  82. 62
      plugins/omgssapi/omgssapi.c
  83. 2
      plugins/omlibdbi/Makefile.am
  84. 13
      plugins/omlibdbi/Makefile.in
  85. 14
      plugins/omlibdbi/omlibdbi.c
  86. 2
      plugins/ommail/Makefile.am
  87. 13
      plugins/ommail/Makefile.in
  88. 12
      plugins/ommail/ommail.c
  89. 2
      plugins/ommysql/Makefile.am
  90. 13
      plugins/ommysql/Makefile.in
  91. 10
      plugins/ommysql/ommysql.c
  92. 2
      plugins/ompgsql/Makefile.am
  93. 13
      plugins/ompgsql/Makefile.in
  94. 12
      plugins/ompgsql/ompgsql.c
  95. 2
      plugins/omrelp/Makefile.am
  96. 13
      plugins/omrelp/Makefile.in
  97. 21
      plugins/omrelp/omrelp.c
  98. 2
      plugins/omsnmp/Makefile.am
  99. 13
      plugins/omsnmp/Makefile.in
  100. 14
      plugins/omsnmp/omsnmp.c

213
ChangeLog

@ -1,9 +1,210 @@
---------------------------------------------------------------------------
Version 3.18.6 (rgerhards), 2008-12-08
Version 3.20.2 [v3-stable] (rgerhards), 2008-12-04
- re-release of 3.20.1 with an additional fix, that could also lead
to DoS; 3.20.1 has been removed from the official download archives
- security fix: imudp emitted a message when a non-permitted sender
tried to send a message to it. This behaviour is operator-configurable.
If enabled, a message was emitted each time. That way an attacker could
effectively fill the disk via this facility. The message is now
emitted only once in a minute (this currently is a hard-coded limit,
if someone comes up with a good reason to make it configurable, we
will probably do that).
---------------------------------------------------------------------------
Version 3.20.1 [v3-stable] (rgerhards), 2008-12-04
- security bugfix: $AllowedSender was not honored, all senders were
permitted instead (see http://www.rsyslog.com/Article322.phtml)
(backport from v3-stable, v3.20.9)
- minor bugfix: dual close() call on tcp session closure
permitted instead
- enhance: regex nomatch option "ZERO" has been added
This allows to return the string 0 if a regular expression is
not found. This is probably useful for storing numerical values into
database columns.
- bugfix: memory leak in gtls netstream driver fixed
memory was lost each time a TLS session was torn down. This could
result in a considerable memory leak if it happened quite frequently
(potential system crash condition)
- doc update: documented how to specify multiple property replacer
options + link to new online regex generator tool added
- minor bufgfix: very small memory leak in gtls netstream driver
around a handful of bytes (< 20) for each HUP
- improved debug output for regular expressions inside property replacer
RE's seem to be a big trouble spot and I would like to have more
information inside the debug log. So I decided to add some additional
debug strings permanently.
---------------------------------------------------------------------------
Version 3.20.0 [v3-stable] (rgerhards), 2008-11-05
- this is the inital release of the 3.19.x branch as a stable release
- bugfix: double-free in pctp netstream driver. Thank to varmojfeko
for the patch
---------------------------------------------------------------------------
Version 3.19.12 [BETA] (rgerhards), 2008-10-16
- bugfix: subseconds where not correctly extracted from a timestamp
if that timestamp did not contain any subsecond information (the
resulting string was garbagge but should have been "0", what it
now is).
- increased maximum size of a configuration statement to 4K (was 1K)
- imported all fixes from the stable branch (quite a lot)
- bugfix: (potentially big) memory leak on HUP if queues could not be
drained before timeout - thanks to David Lang for pointing this out
---------------------------------------------------------------------------
Version 3.19.11 [BETA] (rgerhards), 2008-08-25
This is a refresh of the beta. No beta-specific fixes have been added.
- included fixes from v3-stable (most importantly 3.18.3)
---------------------------------------------------------------------------
Version 3.19.10 [BETA] (rgerhards), 2008-07-15
- start of a new beta branch based on former 3.19 devel branch
- bugfix: bad memory leak in disk-based queue modes
- bugfix: UDP syslog forwarding did not work on all platforms
the ai_socktype was incorrectly set to 1. On some platforms, this
lead to failing name resolution (e.g. FreeBSD 7). Thanks to HKS for
reporting the bug.
- bugfix: priority was incorrectly calculated on FreeBSD 7,
because the LOG_MAKEPRI() C macro has a different meaning there (it
is just a simple addition of faciltity and severity). I have changed
this to use own, consistent, code for PRI calculation. Thank to HKS
for reporting this bug.
- bugfix (cosmetical): authorization was not checked when gtls handshake
completed immediately. While this sounds scary, the situation can not
happen in practice. We use non-blocking IO only for server-based gtls
session setup. As TLS requires the exchange of multiple frames before
the handshake completes, it simply is impossible to do this in one
step. However, it is useful to have the code path correct even for
this case - otherwise, we may run into problems if the code is changed
some time later (e.g. to use blocking sockets). Thanks to varmojfekoj
for providing the patch.
- important queue bugfix from 3.18.1 imported (see below)
- cleanup of some debug messages
---------------------------------------------------------------------------
Version 3.19.9 (rgerhards), 2008-07-07
- added tutorial for creating a TLS-secured syslog infrastructure
- rewritten omusrmsg to no longer fork() a new process for sending messages
this caused some problems with the threading model, e.g. zombies. Also,
it was far less optimal than it is now.
- bugfix: machine certificate was required for client even in TLS anon mode
Reference: http://bugzilla.adiscon.com/show_bug.cgi?id=85
The fix also slightly improves performance by not storing certificates in
client sessions when there is no need to do so.
- bugfix: RainerScript syntax error was not always detected
---------------------------------------------------------------------------
Version 3.19.8 (rgerhards), 2008-07-01
- bugfix: gtls module did not correctly handle EGAIN (and similar) recv()
states. This has been fixed by introducing a new abstraction layer inside
gtls.
- added (internal) error codes to error messages; added redirector to
web description of error codes
closes bug http://bugzilla.adiscon.com/show_bug.cgi?id=20
- disabled compile warnings caused by third-party libraries
- reduced number of compile warnings in gcc's -pedantic mode
- some minor documentation improvements
- included all fixes from beta 3.17.5
---------------------------------------------------------------------------
Version 3.19.7 (rgerhards), 2008-06-11
- added new property replacer option "date-subseconds" that enables
to query just the subsecond part of a high-precision timestamp
- somewhat improved plain tcp syslog reliability by doing a connection
check before sending. Credits to Martin Schuette for providing the
idea. Details are available at
http://blog.gerhards.net/2008/06/reliable-plain-tcp-syslog-once-again.html
- made rsyslog tickless in the (usual and default) case that repeated
message reduction is turned off. More info:
http://blog.gerhards.net/2008/06/coding-to-save-environment.html
- some build system cleanup, thanks to Michael Biebl
- bugfix: compile under (Free)BSD failed due to some invalid library
definitions - this is fixed now. Thanks to Michael Biebl for the patch.
---------------------------------------------------------------------------
Version 3.19.6 (rgerhards), 2008-06-06
- enhanced property replacer to support multiple regex matches
- bugfix: part of permittedPeer structure was not correctly initialized
thanks to varmojfekoj for spotting this
- bugfix: off-by-one bug during certificate check
- bugfix: removed some memory leaks in TLS code
---------------------------------------------------------------------------
Version 3.19.5 (rgerhards), 2008-05-30
- enabled Posix ERE expressions inside the property replacer
(previously BRE was permitted only)
- provided ability to specify that a regular expression submatch shall
be used inside the property replacer
- implemented in property replacer: if a regular expression does not match,
it can now either return "**NO MATCH** (default, as before), a blank
property or the full original property text
- enhanced property replacer to support multiple regex matches
---------------------------------------------------------------------------
Version 3.19.4 (rgerhards), 2008-05-27
- implemented x509/certvalid gtls auth mode
- implemented x509/name gtls auth mode (including wildcards)
- changed fingerprint gtls auth mode to new format fingerprint
- protected gtls error string function by a mutex. Without it, we
could have a race condition in extreme cases. This was very remote,
but now can no longer happen.
- changed config directive name to reflect different use
$ActionSendStreamDriverCertFingerprint is now
$ActionSendStreamDriverPermittedPeer and can be used both for
fingerprint and name authentication (similar to the input side)
- bugfix: sender information (fromhost et al) was missing in imudp
thanks to sandiso for reporting this bug
- this release fully inplements IETF's syslog-transport-tls-12 plus
the latest text changes Joe Salowey provided via email. Not included
is ipAddress subjectAltName authentication, which I think will be
dropped from the draft. I don't think there is any real need for it.
This release also includes all bug fix up to today from the beta
and stable branches. Most importantly, this means the bugfix for
100% CPU utilization by imklog.
---------------------------------------------------------------------------
Version 3.19.3 (rgerhards), 2008-05-21
- added ability to authenticate the server against its certificate
fingerprint
- added ability for client to provide its fingerprint
- added ability for server to obtain client cert's fingerprint
- bugfix: small mem leak in omfwd on exit (strmdriver name was not freed)
- bugfix: $ActionSendStreamDriver had no effect
- bugfix: default syslog port was no longer used if none was
configured. Thanks to varmojfekoj for the patch
- bugfix: missing linker options caused build to fail on some
systems. Thanks to Tiziano Mueller for the patch.
---------------------------------------------------------------------------
Version 3.19.2 (rgerhards), 2008-05-16
- bugfix: TCP input modules did incorrectly set fromhost property
(always blank)
- bugfix: imklog did not set fromhost property
- added "fromhost-ip" property
Note that adding this property changes the on-disk format for messages.
However, that should not have any bad effect on existing spool files.
But you will run into trouble if you create a spool file with this
version and then try to process it with an older one (after a downgrade).
Don't do that ;)
- added "RSYSLOG_DebugFormat" canned template
- bugfix: hostname and fromhost were swapped when a persisted message
(in queued mode) was read in
- bugfix: lmtcpclt, lmtcpsrv and lmgssutil did all link to the static
runtime library, resulting in a large size increase (and potential
"interesting" effects). Thanks to Michael Biebel for reporting the size
issue.
- bugfix: TLS server went into an endless loop in some situations.
Thanks to Michael Biebl for reporting the problem.
- fixed potential segfault due to invalid call to cfsysline
thanks to varmojfekoj for the patch
---------------------------------------------------------------------------
Version 3.19.1 (rgerhards), 2008-05-07
- configure help for --enable-gnutls wrong - said default is "yes" but
default actually is "no" - thanks to darix for pointing this out
- file dirty.h was missing - thanks to darix for pointing this out
- bugfix: man files were not properly distributed - thanks to
darix for reporting and to Michael Biebl for help with the fix
- some minor cleanup
---------------------------------------------------------------------------
Version 3.19.0 (rgerhards), 2008-05-06
- begins new devel branch version
- implemented TLS for plain tcp syslog (this is also the world's first
implementation of IETF's upcoming syslog-transport-tls draft)
- partly rewritten and improved omfwd among others, now loads TCP
code only if this is actually necessary
- split of a "runtime library" for rsyslog - this is not yet a clean
model, because some modularization is still outstanding. In theory,
this shall enable other utilities but rsyslogd to use the same
runtime
- implemented im3195, the RFC3195 input as a plugin
- changed directory structure, files are now better organized
- a lot of cleanup in regard to modularization
- -c option no longer must be the first option - thanks to varmjofekoj
for the patch
---------------------------------------------------------------------------
Version 3.18.5 (rgerhards), 2008-10-09
- bugfix: imudp input module could cause segfault on HUP
@ -675,6 +876,10 @@ Version 3.10.0 (rgerhards), 2008-01-07
- much cleaner code due to new objects and removal of single-threading
mode
---------------------------------------------------------------------------
Version 2.0.7 V2-STABLE (rgerhards), 2008-??-??
- bugfix: memory leak in ompgsql
Thanks to Ken for providing the patch
---------------------------------------------------------------------------
Version 2.0.6 V2-STABLE (rgerhards), 2008-??-??
- bugfix: memory leaks in rsyslogd, primarily in singlethread mode
Thanks to Frederico Nunez for providing the fix

153
Makefile.am

@ -1,125 +1,9 @@
#sbin_PROGRAMS = rfc3195d rsyslogd
sbin_PROGRAMS =
man_MANS =
if ENABLE_RSYSLOGD
sbin_PROGRAMS += rsyslogd
rsyslogd_SOURCES = \
datetime.c \
datetime.h \
errmsg.c \
errmsg.h \
syslogd.c \
syslogd.h \
sysvar.c \
sysvar.h \
vm.c \
vm.h \
vmstk.c \
vmstk.h \
vmprg.c \
vmprg.h \
vmop.c \
vmop.h \
debug.c \
debug.h \
glbl.h \
pidfile.c \
pidfile.h \
template.c \
outchannel.c \
stringbuf.c \
stringbuf.h \
srUtils.c \
srUtils.h \
parse.c \
parse.h \
syslogd-types.h \
template.h \
outchannel.h \
liblogging-stub.h \
threads.c \
threads.h \
stream.c \
stream.h \
var.c \
var.h \
wtp.c \
wtp.h \
wti.c \
wti.h \
queue.c \
queue.h \
sync.c \
sync.h \
obj.c \
obj.h \
obj-types.h \
msg.c \
msg.h \
expr.c \
expr.h \
ctok.c \
ctok.h \
ctok_token.c \
ctok_token.h \
conf.c \
conf.h \
omshell.c \
omshell.h \
omusrmsg.c \
omusrmsg.h \
omfwd.c \
omfwd.h \
tcpsyslog.c \
tcpsyslog.h \
omfile.c \
omfile.h \
omdiscard.c \
omdiscard.h \
modules.c \
modules.h \
module-template.h \
objomsr.c \
objomsr.h \
cfsysline.c \
cfsysline.h \
linkedlist.c \
linkedlist.h \
iminternal.c \
iminternal.h \
action.c \
action.h \
atomic.h
rsyslogd_CPPFLAGS = -D_PATH_MODDIR=\"$(pkglibdir)/\" $(pthreads_cflags)
rsyslogd_LDADD = $(zlib_libs) $(pthreads_libs) $(dl_libs) $(rt_libs)
rsyslogd_LDFLAGS = -export-dynamic
man_MANS += rsyslogd.8 rsyslog.conf.5
endif # if ENABLE_RSYSLOGD
# now come the library plugins
pkglib_LTLIBRARIES =
if ENABLE_RFC3195
# this does so far not work - a manual build is needed
sbin_PROGRAMS += rfc3195d
rfc3195d_SOURCES = rfc3195d.c rsyslog.h
man_MANS += rfc3195d.8
endif
if ENABLE_INET
pkglib_LTLIBRARIES += lmnet.la lmtcpsrv.la lmtcpclt.la
#
# network support
#
lmnet_la_SOURCES = net.c net.h
lmnet_la_CPPFLAGS = $(pthreads_cflags)
lmnet_la_LDFLAGS = -module -avoid-version
lmnet_la_LIBADD =
pkglib_LTLIBRARIES += lmtcpsrv.la lmtcpclt.la
#
#
# TCP (stream) server support
@ -129,7 +13,7 @@ lmtcpsrv_la_SOURCES = \
tcps_sess.h \
tcpsrv.c \
tcpsrv.h
lmtcpsrv_la_CPPFLAGS = $(pthreads_cflags)
lmtcpsrv_la_CPPFLAGS = $(pthreads_cflags) $(rsrt_cflags)
lmtcpsrv_la_LDFLAGS = -module -avoid-version
lmtcpsrv_la_LIBADD =
@ -139,50 +23,41 @@ lmtcpsrv_la_LIBADD =
lmtcpclt_la_SOURCES = \
tcpclt.c \
tcpclt.h
lmtcpclt_la_CPPFLAGS = $(pthreads_cflags)
lmtcpclt_la_CPPFLAGS = $(pthreads_cflags) $(rsrt_cflags)
lmtcpclt_la_LDFLAGS = -module -avoid-version
lmtcpclt_la_LIBADD =
endif # if ENABLE_INET
#
# regular expression support
#
if ENABLE_REGEXP
pkglib_LTLIBRARIES += lmregexp.la
lmregexp_la_SOURCES = regexp.c regexp.h
lmregexp_la_CPPFLAGS = $(pthreads_cflags)
lmregexp_la_LDFLAGS = -module -avoid-version
lmregexp_la_LIBADD =
endif
#
# gssapi support
#
if ENABLE_GSSAPI
pkglib_LTLIBRARIES += lmgssutil.la
lmgssutil_la_SOURCES = gss-misc.c gss-misc.h
lmgssutil_la_CPPFLAGS = $(pthreads_cflags)
lmgssutil_la_CPPFLAGS = $(pthreads_cflags) $(rsrt_cflags)
lmgssutil_la_LDFLAGS = -module -avoid-version
lmgssutil_la_LIBADD = $(gss_libs)
endif
EXTRA_DIST = \
redhat/rsyslog.conf \
redhat/rsyslog.init \
redhat/rsyslog.log \
redhat/rsyslog.sysconfig \
freebsd/rsyslogd \
slackware/rc.rsyslogd \
contrib/README \
rsyslog.conf \
COPYING.LESSER \
$(man_MANS)
contrib/gnutls/ca.pem \
contrib/gnutls/cert.pem \
contrib/gnutls/key.pem
SUBDIRS = . doc
SUBDIRS = doc runtime . tests
SUBDIRS += plugins/immark plugins/imuxsock plugins/imtcp plugins/imudp plugins/omtesting
if ENABLE_RSYSLOGD
SUBDIRS += tools
endif
if ENABLE_IMKLOG
SUBDIRS += plugins/imklog
endif
@ -222,3 +97,7 @@ endif
if ENABLE_MAIL
SUBDIRS += plugins/ommail
endif
if ENABLE_RFC3195
SUBDIRS += plugins/im3195
endif

1043
Makefile.in

File diff suppressed because it is too large

18
action.c

@ -34,7 +34,7 @@
#include <time.h>
#include <errno.h>
#include "syslogd.h"
#include "dirty.h"
#include "template.h"
#include "action.h"
#include "modules.h"
@ -219,11 +219,11 @@ actionConstructFinalize(action_t *pThis)
/* ... set some properties ... */
# define setQPROP(func, directive, data) \
CHKiRet_Hdlr(func(pThis->pQueue, data)) { \
errmsg.LogError(NO_ERRCODE, "Invalid " #directive ", error %d. Ignored, running with default setting", iRet); \
errmsg.LogError(0, NO_ERRCODE, "Invalid " #directive ", error %d. Ignored, running with default setting", iRet); \
}
# define setQPROPstr(func, directive, data) \
CHKiRet_Hdlr(func(pThis->pQueue, data, (data == NULL)? 0 : strlen((char*) data))) { \
errmsg.LogError(NO_ERRCODE, "Invalid " #directive ", error %d. Ignored, running with default setting", iRet); \
errmsg.LogError(0, NO_ERRCODE, "Invalid " #directive ", error %d. Ignored, running with default setting", iRet); \
}
queueSetpUsr(pThis->pQueue, pThis);
@ -369,6 +369,7 @@ rsRetVal actionDbgPrint(action_t *pThis)
/* call the DoAction output plugin entry point
* rgerhards, 2008-01-28
*/
#pragma GCC diagnostic ignored "-Wempty-body"
rsRetVal
actionCallDoAction(action_t *pAction, msg_t *pMsg)
{
@ -453,6 +454,7 @@ finalize_it:
RETiRet;
}
#pragma GCC diagnostic warning "-Wempty-body"
/* set the action message queue mode
* TODO: probably move this into queue object, merge with MainMsgQueue!
@ -475,7 +477,7 @@ static rsRetVal setActionQueType(void __attribute__((unused)) *pVal, uchar *pszT
ActionQueType = QUEUETYPE_DIRECT;
dbgprintf("action queue type set to DIRECT (no queueing at all)\n");
} else {
errmsg.LogError(NO_ERRCODE, "unknown actionqueue parameter: %s", (char *) pszType);
errmsg.LogError(0, RS_RET_INVALID_PARAMS, "unknown actionqueue parameter: %s", (char *) pszType);
iRet = RS_RET_INVALID_PARAMS;
}
d_free(pszType); /* no longer needed */
@ -541,7 +543,7 @@ actionWriteToAction(action_t *pAction)
pAction->f_pMsg = pMsg; /* use the new msg (pointer will be restored below) */
}
dbgprintf("Called action, logging to %s", module.GetStateName(pAction->pMod));
dbgprintf("Called action, logging to %s\n", module.GetStateName(pAction->pMod));
time(&now); /* we need this for message repeation processing AND $ActionExecOnlyOnceEveryInterval */
if(pAction->tLastExec > now) {
@ -592,6 +594,7 @@ finalize_it:
/* call the configured action. Does all necessary housekeeping.
* rgerhards, 2007-08-01
*/
#pragma GCC diagnostic ignored "-Wempty-body"
rsRetVal
actionCallAction(action_t *pAction, msg_t *pMsg)
{
@ -676,6 +679,7 @@ finalize_it:
pthread_setcancelstate(iCancelStateSave, NULL);
RETiRet;
}
#pragma GCC diagnostic warning "-Wempty-body"
/* add our cfsysline handlers
@ -763,14 +767,14 @@ addAction(action_t **ppAction, modInfo_t *pMod, void *pModData, omodStringReques
" Could not find template '%s' - action disabled\n",
pTplName);
errno = 0;
errmsg.LogError(NO_ERRCODE, "%s", errMsg);
errmsg.LogError(0, RS_RET_NOT_FOUND, "%s", errMsg);
ABORT_FINALIZE(RS_RET_NOT_FOUND);
}
/* check required template options */
if( (iTplOpts & OMSR_RQD_TPL_OPT_SQL)
&& (pAction->ppTpl[i]->optFormatForSQL == 0)) {
errno = 0;
errmsg.LogError(NO_ERRCODE, "Action disabled. To use this action, you have to specify "
errmsg.LogError(0, RS_RET_RQD_TPLOPT_MISSING, "Action disabled. To use this action, you have to specify "
"the SQL or stdSQL option in your template!\n");
ABORT_FINALIZE(RS_RET_RQD_TPLOPT_MISSING);
}

6
config.h.in

@ -61,15 +61,15 @@
/* Define to 1 if you have the `gettimeofday' function. */
#undef HAVE_GETTIMEOFDAY
/* Define to 1 if you have the <gnutls/gnutls.h> header file. */
#undef HAVE_GNUTLS_GNUTLS_H
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
/* Define to 1 if you have the <libgen.h> header file. */
#undef HAVE_LIBGEN_H
/* Define to 1 if you have the <librfc3195.h> header file. */
#undef HAVE_LIBRFC3195_H
/* Define to 1 if you have the <locale.h> header file. */
#undef HAVE_LOCALE_H

704
configure

@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.63 for rsyslog 3.18.6.
# Generated by GNU Autoconf 2.63 for rsyslog 3.20.2.
#
# Report bugs to <rsyslog@lists.adiscon.com>.
#
@ -750,11 +750,11 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='rsyslog'
PACKAGE_TARNAME='rsyslog'
PACKAGE_VERSION='3.18.6'
PACKAGE_STRING='rsyslog 3.18.6'
PACKAGE_VERSION='3.20.2'
PACKAGE_STRING='rsyslog 3.20.2'
PACKAGE_BUGREPORT='rsyslog@lists.adiscon.com'
ac_unique_file="syslogd.c"
ac_unique_file="ChangeLog"
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
@ -796,10 +796,12 @@ ENABLE_IMTEMPLATE_FALSE
ENABLE_IMTEMPLATE_TRUE
ENABLE_IMFILE_FALSE
ENABLE_IMFILE_TRUE
rfc3195_libs
rfc3195_cflags
RFC3195_LIBS
RFC3195_CFLAGS
ENABLE_RFC3195_FALSE
ENABLE_RFC3195_TRUE
LIBLOGGING_LIBS
LIBLOGGING_CFLAGS
ENABLE_RELP_FALSE
ENABLE_RELP_TRUE
RELP_LIBS
@ -809,6 +811,15 @@ ENABLE_MAIL_FALSE
ENABLE_MAIL_TRUE
ENABLE_RSYSLOGD_FALSE
ENABLE_RSYSLOGD_TRUE
rsrt_libs
rsrt_cflags
ENABLE_RSYSLOGRT_FALSE
ENABLE_RSYSLOGRT_TRUE
gnutls_libs
gnutls_cflags
ENABLE_GNUTLS_FALSE
ENABLE_GNUTLS_TRUE
HAVE_GNUTLS_CONFIG
snmp_libs
snmp_cflags
ENABLE_SNMP_FALSE
@ -978,6 +989,8 @@ enable_mysql
enable_pgsql
enable_libdbi
enable_snmp
enable_gnutls
enable_rsyslogrt
enable_rsyslogd
enable_mail
enable_relp
@ -1002,7 +1015,9 @@ F77
FFLAGS
PKG_CONFIG
RELP_CFLAGS
RELP_LIBS'
RELP_LIBS
LIBLOGGING_CFLAGS
LIBLOGGING_LIBS'
# Initialize some variables set by options.
@ -1555,7 +1570,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures rsyslog 3.18.6 to adapt to many kinds of systems.
\`configure' configures rsyslog 3.20.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1625,7 +1640,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of rsyslog 3.18.6:";;
short | recursive ) echo "Configuration of rsyslog 3.20.2:";;
esac
cat <<\_ACEOF
@ -1656,6 +1671,8 @@ Optional Features:
--enable-pgsql Enable PostgreSQL database support [default=no]
--enable-libdbi Enable libdbi database support [default=no]
--enable-snmp Enable SNMP support [default=no]
--enable-gnutls Enable GNU TLS support [default=no]
--enable-rsyslogrt Build rsyslogrt [default=yes]
--enable-rsyslogd Build rsyslogd [default=yes]
--enable-mail Enable mail support [default=no]
--enable-relp Enable RELP support [default=no]
@ -1688,6 +1705,10 @@ Some influential environment variables:
PKG_CONFIG path to pkg-config utility
RELP_CFLAGS C compiler flags for RELP, overriding pkg-config
RELP_LIBS linker flags for RELP, overriding pkg-config
LIBLOGGING_CFLAGS
C compiler flags for LIBLOGGING, overriding pkg-config
LIBLOGGING_LIBS
linker flags for LIBLOGGING, overriding pkg-config
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
@ -1755,7 +1776,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
rsyslog configure 3.18.6
rsyslog configure 3.20.2
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@ -1769,7 +1790,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by rsyslog $as_me 3.18.6, which was
It was created by rsyslog $as_me 3.20.2, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@ -2485,7 +2506,7 @@ fi
# Define the identity of the package.
PACKAGE='rsyslog'
VERSION='3.18.6'
VERSION='3.20.2'
cat >>confdefs.h <<_ACEOF
@ -6164,7 +6185,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
echo '#line 6167 "configure"' > conftest.$ac_ext
echo '#line 6188 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@ -8762,11 +8783,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:8765: $lt_compile\"" >&5)
(eval echo "\"\$as_me:8786: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:8769: \$? = $ac_status" >&5
echo "$as_me:8790: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@ -9052,11 +9073,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:9055: $lt_compile\"" >&5)
(eval echo "\"\$as_me:9076: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:9059: \$? = $ac_status" >&5
echo "$as_me:9080: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@ -9156,11 +9177,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:9159: $lt_compile\"" >&5)
(eval echo "\"\$as_me:9180: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:9163: \$? = $ac_status" >&5
echo "$as_me:9184: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@ -11558,7 +11579,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 11561 "configure"
#line 11582 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -11658,7 +11679,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
#line 11661 "configure"
#line 11682 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -14067,11 +14088,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:14070: $lt_compile\"" >&5)
(eval echo "\"\$as_me:14091: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:14074: \$? = $ac_status" >&5
echo "$as_me:14095: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@ -14171,11 +14192,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:14174: $lt_compile\"" >&5)
(eval echo "\"\$as_me:14195: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:14178: \$? = $ac_status" >&5
echo "$as_me:14199: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@ -15756,11 +15777,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:15759: $lt_compile\"" >&5)
(eval echo "\"\$as_me:15780: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:15763: \$? = $ac_status" >&5
echo "$as_me:15784: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@ -15860,11 +15881,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:15863: $lt_compile\"" >&5)
(eval echo "\"\$as_me:15884: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:15867: \$? = $ac_status" >&5
echo "$as_me:15888: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@ -18077,11 +18098,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:18080: $lt_compile\"" >&5)
(eval echo "\"\$as_me:18101: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:18084: \$? = $ac_status" >&5
echo "$as_me:18105: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@ -18367,11 +18388,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:18370: $lt_compile\"" >&5)
(eval echo "\"\$as_me:18391: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:18374: \$? = $ac_status" >&5
echo "$as_me:18395: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@ -18471,11 +18492,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:18474: $lt_compile\"" >&5)
(eval echo "\"\$as_me:18495: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:18478: \$? = $ac_status" >&5
echo "$as_me:18499: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@ -27560,6 +27581,352 @@ fi
# GNUtls support
# Check whether --enable-gnutls was given.
if test "${enable_gnutls+set}" = set; then
enableval=$enable_gnutls; case "${enableval}" in
yes) enable_gnutls="yes" ;;
no) enable_gnutls="no" ;;
*) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-gnutls" >&5
$as_echo "$as_me: error: bad value ${enableval} for --enable-gnutls" >&2;}
{ (exit 1); exit 1; }; } ;;
esac
else
enable_gnutls=no
fi
if test "x$enable_gnutls" = "xyes"; then
for ac_header in gnutls/gnutls.h
do
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
$as_echo_n "checking for $ac_header... " >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
$as_echo_n "(cached) " >&6
fi
ac_res=`eval 'as_val=${'$as_ac_Header'}
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
else
# Is the header compilable?
{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
$as_echo_n "checking $ac_header usability... " >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_compiler=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
$as_echo "$ac_header_compiler" >&6; }
# Is the header present?
{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
$as_echo_n "checking $ac_header presence... " >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
if { (ac_try="$ac_cpp conftest.$ac_ext"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
$as_echo "$ac_try_echo") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then
ac_header_preproc=yes
else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
rm -f conftest.err conftest.$ac_ext
{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
$as_echo "$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
yes:no: )
{ $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
{ $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
{ $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
{ $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
{ $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
{ $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
{ $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to rsyslog@lists.adiscon.com ##
## ---------------------------------------- ##
_ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
$as_echo_n "checking for $ac_header... " >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
$as_echo_n "(cached) " >&6
else
eval "$as_ac_Header=\$ac_header_preproc"
fi
ac_res=`eval 'as_val=${'$as_ac_Header'}
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
fi
as_val=`eval 'as_val=${'$as_ac_Header'}
$as_echo "$as_val"'`
if test "x$as_val" = x""yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
else
{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
{ { $as_echo "$as_me:$LINENO: error: GNUTls is missing
See \`config.log' for more details." >&5
$as_echo "$as_me: error: GNUTls is missing
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }; }
fi
done
# Extract the first word of "libgnutls-config", so it can be a program name with args.
set dummy libgnutls-config; ac_word=$2
{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_HAVE_GNUTLS_CONFIG+set}" = set; then
$as_echo_n "(cached) " >&6
else
if test -n "$HAVE_GNUTLS_CONFIG"; then
ac_cv_prog_HAVE_GNUTLS_CONFIG="$HAVE_GNUTLS_CONFIG" # Let the user override the test.
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_HAVE_GNUTLS_CONFIG="yes"
$as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
fi
fi
HAVE_GNUTLS_CONFIG=$ac_cv_prog_HAVE_GNUTLS_CONFIG
if test -n "$HAVE_GNUTLS_CONFIG"; then
{ $as_echo "$as_me:$LINENO: result: $HAVE_GNUTLS_CONFIG" >&5
$as_echo "$HAVE_GNUTLS_CONFIG" >&6; }
else
{ $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
fi
if test "x${HAVE_GNUTLS_CONFIG}" != "xyes"; then
{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
{ { $as_echo "$as_me:$LINENO: error: libgnutls-config not found in PATH
See \`config.log' for more details." >&5
$as_echo "$as_me: error: libgnutls-config not found in PATH
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }; }
fi
{ $as_echo "$as_me:$LINENO: checking for gnutls_check_version in -lgnutls" >&5
$as_echo_n "checking for gnutls_check_version in -lgnutls... " >&6; }
if test "${ac_cv_lib_gnutls_gnutls_check_version+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lgnutls `libgnutls-config --libs`
$LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char gnutls_check_version ();
int
main ()
{
return gnutls_check_version ();
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext && {
test "$cross_compiling" = yes ||
$as_test_x conftest$ac_exeext
}; then
ac_cv_lib_gnutls_gnutls_check_version=yes
else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_gnutls_gnutls_check_version=no
fi
rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_gnutls_gnutls_check_version" >&5
$as_echo "$ac_cv_lib_gnutls_gnutls_check_version" >&6; }
if test "x$ac_cv_lib_gnutls_gnutls_check_version" = x""yes; then
gnutls_cflags=`libgnutls-config --cflags`
gnutls_libs=`libgnutls-config --libs`
else
{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
{ { $as_echo "$as_me:$LINENO: error: GNU TLS library is missing
See \`config.log' for more details." >&5
$as_echo "$as_me: error: GNU TLS library is missing
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }; }
fi
fi
if test x$enable_gnutls = xyes; then
ENABLE_GNUTLS_TRUE=
ENABLE_GNUTLS_FALSE='#'
else
ENABLE_GNUTLS_TRUE='#'
ENABLE_GNUTLS_FALSE=
fi
# support for building the rsyslogd runtime
# Check whether --enable-rsyslogrt was given.
if test "${enable_rsyslogrt+set}" = set; then
enableval=$enable_rsyslogrt; case "${enableval}" in
yes) enable_rsyslogrt="yes" ;;
no) enable_rsyslogrt="no" ;;
*) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-rsyslogrt" >&5
$as_echo "$as_me: error: bad value ${enableval} for --enable-rsyslogrt" >&2;}
{ (exit 1); exit 1; }; } ;;
esac
else
enable_rsyslogrt=yes
fi
if test "x$enable_rsyslogrt" = "xyes"; then
rsrt_cflags="-I\$(top_srcdir)/runtime -I\$(top_srcdir)"
rsrt_libs="\$(top_builddir)/runtime/librsyslog.la"
fi
if test x$enable_rsyslogrt = xyes; then
ENABLE_RSYSLOGRT_TRUE=
ENABLE_RSYSLOGRT_FALSE='#'
else
ENABLE_RSYSLOGRT_TRUE='#'
ENABLE_RSYSLOGRT_FALSE=
fi
# support for NOT building rsyslogd (useful for source-based packaging systems)
# Check whether --enable-rsyslogd was given.
if test "${enable_rsyslogd+set}" = set; then
@ -27864,7 +28231,6 @@ fi
# RFC 3195 support
# WARNING: THIS IS NOT REALLY PRESENT YET - needs to be build manually!
# Check whether --enable-rfc3195 was given.
if test "${enable_rfc3195+set}" = set; then
enableval=$enable_rfc3195; case "${enableval}" in
@ -27881,176 +28247,114 @@ fi
if test "x$enable_rfc3195" = "xyes"; then
for ac_header in librfc3195.h
do
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
$as_echo_n "checking for $ac_header... " >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
$as_echo_n "(cached) " >&6
fi
ac_res=`eval 'as_val=${'$as_ac_Header'}
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
else
# Is the header compilable?
{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
$as_echo_n "checking $ac_header usability... " >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
pkg_failed=no
{ $as_echo "$as_me:$LINENO: checking for LIBLOGGING" >&5
$as_echo_n "checking for LIBLOGGING... " >&6; }
if test -n "$LIBLOGGING_CFLAGS"; then
pkg_cv_LIBLOGGING_CFLAGS="$LIBLOGGING_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"liblogging >= 0.7.1\"") >&5
($PKG_CONFIG --exists --print-errors "liblogging >= 0.7.1") 2>&5
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_header_compiler=yes
(exit $ac_status); }; then
pkg_cv_LIBLOGGING_CFLAGS=`$PKG_CONFIG --cflags "liblogging >= 0.7.1" 2>/dev/null`
else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_compiler=no
pkg_failed=yes
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
$as_echo "$ac_header_compiler" >&6; }
# Is the header present?
{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
$as_echo_n "checking $ac_header presence... " >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
if { (ac_try="$ac_cpp conftest.$ac_ext"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
$as_echo "$ac_try_echo") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
else
pkg_failed=untried
fi
if test -n "$LIBLOGGING_LIBS"; then
pkg_cv_LIBLOGGING_LIBS="$LIBLOGGING_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"liblogging >= 0.7.1\"") >&5
($PKG_CONFIG --exists --print-errors "liblogging >= 0.7.1") 2>&5
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then
ac_header_preproc=yes
(exit $ac_status); }; then
pkg_cv_LIBLOGGING_LIBS=`$PKG_CONFIG --libs "liblogging >= 0.7.1" 2>/dev/null`
else
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
pkg_failed=yes
fi
else
pkg_failed=untried
fi
rm -f conftest.err conftest.$ac_ext
{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
$as_echo "$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
yes:no: )
{ $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
{ $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
{ $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
{ $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
{ $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
{ $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
{ $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
{ $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
( cat <<\_ASBOX
## ---------------------------------------- ##
## Report this to rsyslog@lists.adiscon.com ##
## ---------------------------------------- ##
_ASBOX
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
$as_echo_n "checking for $ac_header... " >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
$as_echo_n "(cached) " >&6
if test $pkg_failed = yes; then
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
else
eval "$as_ac_Header=\$ac_header_preproc"
_pkg_short_errors_supported=no
fi
ac_res=`eval 'as_val=${'$as_ac_Header'}
$as_echo "$as_val"'`
{ $as_echo "$as_me:$LINENO: result: $ac_res" >&5
$as_echo "$ac_res" >&6; }
if test $_pkg_short_errors_supported = yes; then
LIBLOGGING_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "liblogging >= 0.7.1" 2>&1`
else
LIBLOGGING_PKG_ERRORS=`$PKG_CONFIG --print-errors "liblogging >= 0.7.1" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBLOGGING_PKG_ERRORS" >&5
fi
as_val=`eval 'as_val=${'$as_ac_Header'}
$as_echo "$as_val"'`
if test "x$as_val" = x""yes; then
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
{ { $as_echo "$as_me:$LINENO: error: Package requirements (liblogging >= 0.7.1) were not met:
else
{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
$LIBLOGGING_PKG_ERRORS
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
Alternatively, you may set the environment variables LIBLOGGING_CFLAGS
and LIBLOGGING_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
$as_echo "$as_me: error: Package requirements (liblogging >= 0.7.1) were not met:
$LIBLOGGING_PKG_ERRORS
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
Alternatively, you may set the environment variables LIBLOGGING_CFLAGS
and LIBLOGGING_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
{ { $as_echo "$as_me:$LINENO: error: RFC3195 library is missing (no headers)
{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
Alternatively, you may set the environment variables LIBLOGGING_CFLAGS
and LIBLOGGING_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
$as_echo "$as_me: error: RFC3195 library is missing (no headers)
$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
Alternatively, you may set the environment variables LIBLOGGING_CFLAGS
and LIBLOGGING_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }; }
else
LIBLOGGING_CFLAGS=$pkg_cv_LIBLOGGING_CFLAGS
LIBLOGGING_LIBS=$pkg_cv_LIBLOGGING_LIBS
{ $as_echo "$as_me:$LINENO: result: yes" >&5
$as_echo "yes" >&6; }
:
fi
done
# I don't know how to tell that librfc3195 needs -lrt, so I disable
# this check for now - the header check should work well enough...
# rgerhards, 2008-03-25
# AC_CHECK_LIB(
# [rfc3195],
# [rfc3195EngineGetVersion],
# [rfc3195_cflags=""
rfc3195_libs="-lrfc3195"
# ],
# [AC_MSG_FAILURE([RFC3195 library is missing])]
# )
fi
if test x$enable_rfc3195 = xyes; then
ENABLE_RFC3195_TRUE=
@ -28135,7 +28439,7 @@ fi
# end of copy template - be sure to serach for imtemplate to find everything!
ac_config_files="$ac_config_files Makefile doc/Makefile plugins/imudp/Makefile plugins/imtcp/Makefile plugins/imgssapi/Makefile plugins/imuxsock/Makefile plugins/immark/Makefile plugins/imklog/Makefile plugins/imtemplate/Makefile plugins/imfile/Makefile plugins/imrelp/Makefile plugins/omtesting/Makefile plugins/omgssapi/Makefile plugins/ommysql/Makefile plugins/ompgsql/Makefile plugins/omrelp/Makefile plugins/omlibdbi/Makefile plugins/ommail/Makefile plugins/omsnmp/Makefile"
ac_config_files="$ac_config_files Makefile runtime/Makefile tools/Makefile tests/Makefile doc/Makefile plugins/imudp/Makefile plugins/imtcp/Makefile plugins/im3195/Makefile plugins/imgssapi/Makefile plugins/imuxsock/Makefile plugins/immark/Makefile plugins/imklog/Makefile plugins/imtemplate/Makefile plugins/imfile/Makefile plugins/imrelp/Makefile plugins/omtesting/Makefile plugins/omgssapi/Makefile plugins/ommysql/Makefile plugins/ompgsql/Makefile plugins/omrelp/Makefile plugins/omlibdbi/Makefile plugins/ommail/Makefile plugins/omsnmp/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@ -28332,6 +28636,20 @@ $as_echo "$as_me: error: conditional \"ENABLE_SNMP\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${ENABLE_GNUTLS_TRUE}" && test -z "${ENABLE_GNUTLS_FALSE}"; then
{ { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_GNUTLS\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
$as_echo "$as_me: error: conditional \"ENABLE_GNUTLS\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${ENABLE_RSYSLOGRT_TRUE}" && test -z "${ENABLE_RSYSLOGRT_FALSE}"; then
{ { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_RSYSLOGRT\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
$as_echo "$as_me: error: conditional \"ENABLE_RSYSLOGRT\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${ENABLE_RSYSLOGD_TRUE}" && test -z "${ENABLE_RSYSLOGD_FALSE}"; then
{ { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_RSYSLOGD\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@ -28703,7 +29021,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by rsyslog $as_me 3.18.6, which was
This file was extended by rsyslog $as_me 3.20.2, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -28766,7 +29084,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
rsyslog config.status 3.18.6
rsyslog config.status 3.20.2
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@ -28892,9 +29210,13 @@ do
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"runtime/Makefile") CONFIG_FILES="$CONFIG_FILES runtime/Makefile" ;;
"tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
"tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
"doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
"plugins/imudp/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/imudp/Makefile" ;;
"plugins/imtcp/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/imtcp/Makefile" ;;
"plugins/im3195/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/im3195/Makefile" ;;
"plugins/imgssapi/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/imgssapi/Makefile" ;;
"plugins/imuxsock/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/imuxsock/Makefile" ;;
"plugins/immark/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/immark/Makefile" ;;
@ -29747,9 +30069,11 @@ echo "file input module enabled: $enable_imfile"
echo "input template module will be compiled: $enable_imtemplate"
echo "Large file support enabled: $enable_largefile"
echo "Networking support enabled: $enable_inet"
echo "GnuTLS network stream driver enabled: $enable_gnutls"
echo "Enable GSSAPI Kerberos 5 support: $want_gssapi_krb5"
echo "Debug mode enabled: $enable_debug"
echo "Runtime Instrumentation enabled: $enable_rtinst"
echo "valgrind support settings enabled: $enable_valgrind"
echo "rsyslog runtime will be built: $enable_rsyslogrt"
echo "rsyslogd will be built: $enable_rsyslogd"

88
configure.ac

@ -2,9 +2,9 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61)
AC_INIT([rsyslog],[3.18.6],[rsyslog@lists.adiscon.com])
AC_INIT([rsyslog],[3.20.2],[rsyslog@lists.adiscon.com])
AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([syslogd.c])
AC_CONFIG_SRCDIR([ChangeLog])
AC_CONFIG_HEADERS([config.h])
AC_GNU_SOURCE
@ -467,6 +467,63 @@ AC_SUBST(snmp_cflags)
AC_SUBST(snmp_libs)
# GNUtls support
AC_ARG_ENABLE(gnutls,
[AS_HELP_STRING([--enable-gnutls],[Enable GNU TLS support @<:@default=no@:>@])],
[case "${enableval}" in
yes) enable_gnutls="yes" ;;
no) enable_gnutls="no" ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-gnutls) ;;
esac],
[enable_gnutls=no]
)
if test "x$enable_gnutls" = "xyes"; then
AC_CHECK_HEADERS(
[gnutls/gnutls.h],,
[AC_MSG_FAILURE([GNUTls is missing])]
)
AC_CHECK_PROG(
[HAVE_GNUTLS_CONFIG],
[libgnutls-config],
[yes],,,
)
if test "x${HAVE_GNUTLS_CONFIG}" != "xyes"; then
AC_MSG_FAILURE([libgnutls-config not found in PATH])
fi
AC_CHECK_LIB(
[gnutls],
[gnutls_check_version],
[gnutls_cflags=`libgnutls-config --cflags`
gnutls_libs=`libgnutls-config --libs`
],