applied patch from varmojfekoj to fix an issue with compatibility mode and

    default module directories (many thanks!)

2 files changed, 11 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 25ff8284..0592f8c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,15 @@
 Version 3.12.0 (rgerhards), 2008-02-??
 - bugfix: gssapi libraries were still linked to rsyslog core, what should
   no longer be necessary. Applied fix by Michael Biebl to solve this.
+- applied patch from varmojfekoj to fix an issue with compatibility 
+  mode and default module directories (many thanks!):
+  I've also noticed a bug in the compatibility code; the problem is that 
+  options are parsed before configuration file so options which need a 
+  module to be loaded will currently ignore any $moddir directive. This 
+  can be fixed by moving legacyOptsHook() after config file parsing. 
+  (see the attached patch) This goes against the logical order of 
+  processing, but the legacy options are only few and it doesn't seem to 
+  be a problem.
 ---------------------------------------------------------------------------
 Version 3.11.5 (rgerhards), 2008-02-25
 - new imgssapi module, changed imtcp module - this enables to load/package
diff --git a/syslogd.c b/syslogd.c
index 7d28a3cc..b1572f18 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -2834,8 +2834,6 @@ init(void)
 	 */
 	cfsysline((uchar*)"ResetConfigVariables");
 
-	legacyOptsHook();
-
 	/* open the configuration file */
 	if((iRet = processConfFile(ConfFile)) != RS_RET_OK) {
 		/* rgerhards: this code is executed to set defaults when the
@@ -2856,6 +2854,8 @@ init(void)
 		selectorAddList(f);
 	}
 
+	legacyOptsHook();
+
 	/* we are now done with reading the configuration. This is the right time to
 	 * free some objects that were just needed for loading it. rgerhards 2005-10-19
 	 */