diff options
author | Michael Meckelein <mmeckelein@hq.adiscon.com> | 2007-08-22 10:49:32 +0000 |
---|---|---|
committer | Michael Meckelein <mmeckelein@hq.adiscon.com> | 2007-08-22 10:49:32 +0000 |
commit | fb13c3a39850ba28bf28ae8aead9c80c180fc13f (patch) | |
tree | 53ac7c98ac9be1a540e70d7c584642aa0607b2fd /omusrmsg.c | |
parent | d1a76e1bdfd1c61d0244a3860cf05211f2458ca2 (diff) | |
download | rsyslog-fb13c3a39850ba28bf28ae8aead9c80c180fc13f.tar.gz rsyslog-fb13c3a39850ba28bf28ae8aead9c80c180fc13f.tar.xz rsyslog-fb13c3a39850ba28bf28ae8aead9c80c180fc13f.zip |
applied patches which will be released under 1.19.1, changed doc for 1.19.1v1-19-1
release
Diffstat (limited to 'omusrmsg.c')
-rw-r--r-- | omusrmsg.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -272,10 +272,10 @@ CODE_STD_STRING_REQUESTparseSelectorAct(1) */ if (!*p || !((*p >= 'a' && *p <= 'z') || (*p >= 'A' && *p <= 'Z') || (*p >= '0' && *p <= '9') || *p == '_' || *p == '.' || *p == '*')) - return RS_RET_CONFLINE_UNPROCESSED; + ABORT_FINALIZE(RS_RET_CONFLINE_UNPROCESSED); if((iRet = createInstance(&pData)) != RS_RET_OK) - return iRet; + goto finalize_it; if(*p == '*') { /* wall */ @@ -284,7 +284,7 @@ CODE_STD_STRING_REQUESTparseSelectorAct(1) pData->bIsWall = 1; /* write to all users */ if((iRet = cflineParseTemplateName(&p, *ppOMSR, 0, OMSR_NO_RQD_TPL_OPTS, (uchar*) " WallFmt")) != RS_RET_OK) - return iRet; + goto finalize_it; } else { /* everything else beginning with the regex above * is currently treated as a user name @@ -309,7 +309,7 @@ CODE_STD_STRING_REQUESTparseSelectorAct(1) */ if((iRet = cflineParseTemplateName(&p, *ppOMSR, 0, OMSR_NO_RQD_TPL_OPTS, (uchar*)" StdUsrMsgFmt")) != RS_RET_OK) - return iRet; + goto finalize_it; } CODE_STD_FINALIZERparseSelectorAct ENDparseSelectorAct |