summaryrefslogtreecommitdiffstats
path: root/omfwd.c
diff options
context:
space:
mode:
Diffstat (limited to 'omfwd.c')
-rw-r--r--omfwd.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/omfwd.c b/omfwd.c
index 74b4c66e..54811432 100644
--- a/omfwd.c
+++ b/omfwd.c
@@ -414,14 +414,8 @@ static rsRetVal parseSelectorAct(uchar **pp, selector_t *f)
f->f_un.f_forw.f_addr = res;
}
- /* then try to find the template and re-set f_type to UNUSED
- * if it can not be found. */
- cflineSetTemplateAndIOV(f, szTemplateName);
- if(f->f_type == F_UNUSED)
- /* safety measure to make sure we have a valid
- * selector line before we continue down below.
- * rgerhards 2005-07-29
- */
+ /* then try to find the template */
+ if((iRet = cflineSetTemplateAndIOV(f, szTemplateName)) != RS_RET_OK)
break;
dprintf("forwarding host: '%s:%s/%s' template '%s'\n", q, getFwdSyslogPt(f),
@@ -439,6 +433,9 @@ static rsRetVal parseSelectorAct(uchar **pp, selector_t *f)
break;
}
+ if(iRet == RS_RET_OK)
+ iRet = RS_RET_CONFLINE_PROCESSED;
+
if(iRet == RS_RET_CONFLINE_PROCESSED)
*pp = p;
return iRet;