diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-16 17:01:16 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-16 17:01:16 +0200 |
commit | a1c7bc265554563d1744738994075214e5083566 (patch) | |
tree | ddf7c6676aa0de18b5986d7e56641465e83fe188 /conf.c | |
parent | c5178a4d21cf8ca3362b8a8394d0e762801550a4 (diff) | |
parent | d071de578454754c4701285b3569e55c5cef1ee4 (diff) | |
download | rsyslog-a1c7bc265554563d1744738994075214e5083566.tar.gz rsyslog-a1c7bc265554563d1744738994075214e5083566.tar.xz rsyslog-a1c7bc265554563d1744738994075214e5083566.zip |
Merge branch 'runtime'
Conflicts:
ChangeLog
Diffstat (limited to 'conf.c')
-rw-r--r-- | conf.c | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -45,7 +45,8 @@ #endif #include "rsyslog.h" -#include "syslogd.h" +#include "syslogd.h" /* this actually *is* part of the syslogd! */ +#include "dirty.h" #include "parse.h" #include "action.h" #include "template.h" @@ -57,6 +58,10 @@ #include "stringbuf.h" #include "srUtils.h" #include "errmsg.h" +#include "net.h" +#include "expr.h" +#include "ctok.h" +#include "ctok_token.h" /* forward definitions */ @@ -500,7 +505,6 @@ rsRetVal cflineParseTemplateName(uchar** pp, omodStringRequest_t *pOMSR, int iEn } else { /* template specified, pick it up */ if(rsCStrConstruct(&pStrB) != RS_RET_OK) { - glblHadMemShortage = 1; iRet = RS_RET_OUT_OF_MEMORY; goto finalize_it; } @@ -563,6 +567,7 @@ cflineParseFileName(uchar* p, uchar *pFileName, omodStringRequest_t *pOMSR, int * passed back to the caller. * rgerhards 2005-09-15 */ +/* GPLv3 - stems back to sysklogd */ static rsRetVal cflineProcessTradPRIFilter(uchar **pline, register selector_t *f) { uchar *p; |