rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-17 12:50:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2606 from rgerhards/omfile-hardened

Browse Source 
merge #2490 as experimental module
This commit is contained in:
Rainer Gerhards 2018-04-03 10:52:28 +02:00 committed by GitHub
commit a1f5da069a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 1688 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -67,6 +67,10 @@ if ENABLE_RELP
SUBDIRS += plugins/omrelp plugins/imrelp
endif
if ENABLE_OMFILE_HARDENED
SUBDIRS += contrib/omfile-hardened
endif
if ENABLE_MYSQL
SUBDIRS += plugins/ommysql
endif

15
configure.ac
View File

@ -1319,6 +1319,19 @@ fi
AM_CONDITIONAL(ENABLE_MMRFC5424ADDHMAC, test x$enable_mmrfc5424addhmac = xyes)
# experimental omfile-hardened module
AC_ARG_ENABLE(omfile-hardened,
[AS_HELP_STRING([--enable-omfile-hardened],[Enable omfile-hardened support @<:@default=no@:>@])],
[case "${enableval}" in
yes) enable_omfile_hardened="yes" ;;
no) enable_omfile_hardened="no" ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-omfile-hardened) ;;
esac],
[enable_omfile_hardened=no]
)
AM_CONDITIONAL(ENABLE_OMFILE_HARDENED, test x$enable_omfile_hardened = xyes)
# RELP support
AC_ARG_ENABLE(relp,
[AS_HELP_STRING([--enable-relp],[Enable RELP support @<:@default=no@:>@])],
@ -2266,6 +2279,7 @@ AC_CONFIG_FILES([Makefile \
contrib/omhttpfs/Makefile \
contrib/omamqp1/Makefile \
contrib/omtcl/Makefile \
contrib/omfile-hardened/Makefile \
contrib/mmkubernetes/Makefile \
tests/Makefile])
AC_OUTPUT
@ -2305,6 +2319,7 @@ echo " imkafka module will be compiled: $enable_imkafka"
echo
echo "---{ output plugins }---"
echo " Mail support enabled: $enable_mail"
echo " omfile-hardened module will be compiled: $enable_omfile_hardened"
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/omfile-hardened/Makefile.am Normal file
View File

@ -0,0 +1,8 @@
pkglib_LTLIBRARIES = omfile-hardened.la
omfile_hardened_la_SOURCES = omfile-hardened.c
omfile_hardened_la_CPPFLAGS = $(RSRT_CFLAGS) $(PTHREADS_CFLAGS) -I ../../tools
omfile_hardened_la_LDFLAGS = -module -avoid-version
omfile_hardened_la_LIBADD =
EXTRA_DIST =

1660
contrib/omfile-hardened/omfile-hardened.c Normal file
View File

File diff suppressed because it is too large Load Diff

1
runtime/rsyslog.h
View File

@ -506,6 +506,7 @@ operation not carried out */
RS_RET_UDP_MSGSIZE_TOO_LARGE = -2440, /**< a message is too large to be sent via UDP */
RS_RET_NON_JSON_PROP = -2441, /**< a non-json property id is provided where a json one is requried */
RS_RET_NO_TZ_SET = -2442, /**< system env var TZ is not set (status msg) */
RS_RET_FS_ERR = -2443, /**< file-system error */
/* RainerScript error messages (range 1000.. 1999) */
RS_RET_SYSVAR_NOT_FOUND = 1001, /**< system variable could not be found (maybe misspelled) */