diff options
| -rw-r--r-- | AUTHORS | 3 | ||||
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | freebsd/Makefile | 3 | ||||
| -rw-r--r-- | linux/Makefile | 2 | ||||
| -rw-r--r-- | syslogd.c | 2 |
5 files changed, 13 insertions, 2 deletions
@@ -2,6 +2,7 @@ Rainer Gerhards <rgerhards@adiscon.com>, Adiscon GmbH Michael Meckelein <mmeckelein@hq.adiscon.com>, Adiscon GmbH Contributors -Andres Riancho (alias APR in code files) +Andres Riancho (andres-dot-riancho-at-gmail-dot-com) + (alias APR in code files) - supplied regexp functionality for the property replacer - a great feature. thanks! @@ -5,6 +5,11 @@ Version 1.10.0 (RGer), 2005-09-?? - added support for a "discard" action. If a selector line with discard (~ character) is found, no selector lines *after* that line will be processed. +- thanks to Andres Riancho, regular expression support has been + added to the template engine +- added the FROMHOST property in the template processor, which could + previously not be obtained. Thanks to Cristian Testa for pointing + this out and even providing a fix. --------------------------------------------------------------------------- Version 1.0.0 (RGer), 2005-09-12 - changed install doc to cover daily cron scripts - a trouble source diff --git a/freebsd/Makefile b/freebsd/Makefile index 118ac159..e73a6460 100644 --- a/freebsd/Makefile +++ b/freebsd/Makefile @@ -25,6 +25,9 @@ FEATURE_LARGEFILE=1 # on when support for MySQL is desired). FEATURE_DB=0 +# Enable regular expressions +FEATURE_REGEXP=1 + ############################################################# # END OF USER SETTINGS # # -------------------- # diff --git a/linux/Makefile b/linux/Makefile index d93fe933..5fd60168 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -28,7 +28,7 @@ FEATURE_LARGEFILE=1 FEATURE_DB=0 # Enable regular expressions -FEATURE_REGEXP=0 +FEATURE_REGEXP=1 ############################################################# # END OF USER SETTINGS # @@ -2031,6 +2031,8 @@ char *MsgGetProp(struct msg *pMsg, struct templateEntry *pTpe, unsigned short *p pRes = getRawMsg(pMsg); } else if(!strcmp(pName, "UxTradMsg")) { pRes = getUxTradMsg(pMsg); + } else if(!strcmp(pName, "FROMHOST")) { + pRes = getRcvFrom(pMsg); } else if(!strcmp(pName, "source") || !strcmp(pName, "HOSTNAME")) { pRes = getHOSTNAME(pMsg); |