- changed name of $Include to $IncludeConfig - sound better as it is more

    explicit (we'll see where else we get includes for...)

2 files changed, 2 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 2c666580..02064ad2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,7 +21,7 @@ Version 1.17.6 (rgerhards), 2007-07-3?
   $DebugPrintCfSysLineHandlerList
 - fixed an invalid value for the MARK timer - unfortunately, there was
   a testing aid left in place. This resulted in quite frequent MARK messages
-- added $include config directive
+- added $IncludeConfig config directive
 - applied a patch from mildew to prevent rsyslogd from freezing under heavy
   load. This could happen when the queue was full. Now, we drop messages
   but rsyslogd remains active.
diff --git a/syslogd.c b/syslogd.c
index f6ef5fc0..3d3ce08c 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -3650,16 +3650,6 @@ rsRetVal cfsysline(uchar *p)
 	 * list of cfsysline handlers. -- rgerhards, 2007-07-31
 	 */
 	CHKiRet(processCfSysLineCommand(szCmd, &p));
-#if 0
-	if((iRet = processCfSysLineCommand(szCmd, &p)) != RS_RET_OK) {
-		/* invalid command! */
-		char err[256];
-		snprintf(err, sizeof(err)/sizeof(char),
-			 "Invalid command in $-configline: '%s' (error %d) - line ignored\n", szCmd, iRet);
-		logerror(err);
-		ABORT_FINALIZE(RS_RET_INVALID_CMD);
-	}
-#endif
 
 	/* now check if we have some extra characters left on the line - that
 	 * should not be the case. Whitespace is OK, but everything else should
@@ -5355,7 +5345,7 @@ static rsRetVal loadBuildInModules(void)
 	CHKiRet(regCfSysLineHdlr((uchar *)"outchannel", 0, eCmdHdlrCustomHandler, doNameLine, (void*)DIR_OUTCHANNEL));
 	CHKiRet(regCfSysLineHdlr((uchar *)"allowedsender", 0, eCmdHdlrCustomHandler, doNameLine, (void*)DIR_ALLOWEDSENDER));
 	CHKiRet(regCfSysLineHdlr((uchar *)"modload", 0, eCmdHdlrCustomHandler, doModLoad, NULL));
-	CHKiRet(regCfSysLineHdlr((uchar *)"include", 0, eCmdHdlrCustomHandler, doIncludeLine, NULL));
+	CHKiRet(regCfSysLineHdlr((uchar *)"includeconfig", 0, eCmdHdlrCustomHandler, doIncludeLine, NULL));
 	CHKiRet(regCfSysLineHdlr((uchar *)"umask", 0, eCmdHdlrFileCreateMode, setUmask, NULL));
 	CHKiRet(regCfSysLineHdlr((uchar *)"debugprinttemplatelist", 0, eCmdHdlrBinary, NULL, &bDebugPrintTemplateList));
 	CHKiRet(regCfSysLineHdlr((uchar *)"debugprintmodulelist", 0, eCmdHdlrBinary, NULL, &bDebugPrintModuleList));