diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-03 12:52:53 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-04-03 12:52:53 +0200 |
| commit | 1a08fa5ded3087a3b60d87a20d25a4ec589eba21 (patch) | |
| tree | 9dd51c4b9db468be41a63f4286029d95bef0bf0b /tools/syslogd.c | |
| parent | 5f397495524ffe460fe93d2f1069f3077f48b7b0 (diff) | |
| parent | ec0e2c3e7df6addc02431628daddfeae49b92af7 (diff) | |
| download | rsyslog-1a08fa5ded3087a3b60d87a20d25a4ec589eba21.tar.gz rsyslog-1a08fa5ded3087a3b60d87a20d25a4ec589eba21.tar.bz2 rsyslog-1a08fa5ded3087a3b60d87a20d25a4ec589eba21.zip | |
Merge branch 'master' into oracle
Diffstat (limited to 'tools/syslogd.c')
| -rw-r--r-- | tools/syslogd.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c index c72160fb..b23c12a7 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -429,6 +429,8 @@ selectorDestruct(void *pVal) rsCStrDestruct(&pThis->f_filterData.prop.pCSPropName); if(pThis->f_filterData.prop.pCSCompValue != NULL) rsCStrDestruct(&pThis->f_filterData.prop.pCSCompValue); + if(pThis->f_filterData.prop.regex_cache != NULL) + rsCStrRegexDestruct(&pThis->f_filterData.prop.regex_cache); } else if(pThis->f_filter_type == FILTER_EXPR) { if(pThis->f_filterData.f_expr != NULL) expr.Destruct(&pThis->f_filterData.f_expr); @@ -549,7 +551,7 @@ void untty(void) int i; if ( !Debug ) { - i = open(_PATH_TTY, O_RDWR); + i = open(_PATH_TTY, O_RDWR|O_CLOEXEC); if (i >= 0) { # if !defined(__hpux) (void) ioctl(i, (int) TIOCNOTTY, (char *)0); @@ -1076,12 +1078,12 @@ static rsRetVal shouldProcessThisMessage(selector_t *f, msg_t *pMsg, int *bProce break; case FIOP_REGEX: if(rsCStrSzStrMatchRegex(f->f_filterData.prop.pCSCompValue, - (unsigned char*) pszPropVal, 0) == RS_RET_OK) + (unsigned char*) pszPropVal, 0, &f->f_filterData.prop.regex_cache) == RS_RET_OK) bRet = 1; break; case FIOP_EREREGEX: if(rsCStrSzStrMatchRegex(f->f_filterData.prop.pCSCompValue, - (unsigned char*) pszPropVal, 1) == RS_RET_OK) + (unsigned char*) pszPropVal, 1, &f->f_filterData.prop.regex_cache) == RS_RET_OK) bRet = 1; break; default: |