diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-07-01 15:09:07 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-07-01 15:09:07 +0200 |
| commit | 4fd98529572b57f494597a34f04ced96ef1031a2 (patch) | |
| tree | a2abace73c6cfcfa9db49d4c04ed2a1e831cef74 /runtime/conf.c | |
| parent | 78543b7e31ea9559108d15fd645862db7dd63913 (diff) | |
| parent | a16cbe655541421fefdcc852087219228bbc5c94 (diff) | |
| download | rsyslog-4fd98529572b57f494597a34f04ced96ef1031a2.tar.gz rsyslog-4fd98529572b57f494597a34f04ced96ef1031a2.tar.bz2 rsyslog-4fd98529572b57f494597a34f04ced96ef1031a2.zip | |
Merge branch 'beta'
Conflicts:
ChangeLog
conf.c
doc/Makefile.am
doc/manual.html
omfwd.c
plugins/omgssapi/omgssapi.c
This was a bit hard to merge; if there are problems, they
may be in the area of the new "comment in action line" code
that came from the beta.
Diffstat (limited to 'runtime/conf.c')
| -rw-r--r-- | runtime/conf.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/runtime/conf.c b/runtime/conf.c index a0a2b080..71b2b2da 100644 --- a/runtime/conf.c +++ b/runtime/conf.c @@ -480,36 +480,33 @@ rsRetVal cflineParseTemplateName(uchar** pp, omodStringRequest_t *pOMSR, int iEn { uchar *p; uchar *tplName; - DEFiRet; cstr_t *pStrB; + DEFiRet; ASSERT(pp != NULL); ASSERT(*pp != NULL); ASSERT(pOMSR != NULL); p =*pp; - /* a template must follow - search it and complain, if not found - */ + /* a template must follow - search it and complain, if not found */ skipWhiteSpace(&p); if(*p == ';') ++p; /* eat it */ else if(*p != '\0' && *p != '#') { - errmsg.LogError(0, NO_ERRCODE, "invalid character in selector line - ';template' expected"); - iRet = RS_RET_ERR; - goto finalize_it; + errmsg.LogError(0, RS_RET_ERR, "invalid character in selector line - ';template' expected"); + ABORT_FINALIZE(RS_RET_ERR); } skipWhiteSpace(&p); /* go to begin of template name */ - if(*p == '\0') { + if(*p == '\0' || *p == '#') { /* no template specified, use the default */ /* TODO: check NULL ptr */ tplName = (uchar*) strdup((char*)dfltTplName); } else { /* template specified, pick it up */ if(rsCStrConstruct(&pStrB) != RS_RET_OK) { - iRet = RS_RET_OUT_OF_MEMORY; - goto finalize_it; + ABORT_FINALIZE(RS_RET_OUT_OF_MEMORY); } /* now copy the string */ |