Merge branch 'beta'

Conflicts:

	ChangeLog
	rfc3195d.c

3 files changed, 23 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 991efb88..71faebc1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
 ---------------------------------------------------------------------------
-Version 3.19.2 (rgerhards), 2008-05-??
+Version 3.19.2 (rgerhards), 2008-05-16
 - bugfix: TCP input modules did incorrectly set fromhost property
   (always blank)
 - bugfix: imklog did not set fromhost property
@@ -45,8 +45,8 @@ Version 3.19.0 (rgerhards), 2008-05-06
 - -c option no longer must be the first option - thanks to varmjofekoj
   for the patch
 ---------------------------------------------------------------------------
-Version 3.17.2 (rgerhards), 2008-04-??
-- this version is the new beta
+Version 3.17.2 (rgerhards), 2008-05-04
+- this version is the new beta, based on 3.17.1 devel feature set
 - merged in imklog bug fix from v3-stable (3.16.1)
 ---------------------------------------------------------------------------
 Version 3.17.1 (rgerhards), 2008-04-15
@@ -100,6 +100,13 @@ Version 3.17.0 (rgerhards), 2008-04-08
 Plus a number of bugfixes that were applied to v3-stable and beta
 branches (not mentioned here in detail).
 ---------------------------------------------------------------------------
+Version 3.16.2 (rgerhards), 2008-05-14
+- fixed potential segfault due to invalid call to cfsysline
+  thanks to varmojfekoj for the patch
+- bugfix: some whitespaces where incorrectly not ignored when parsing
+  the config file. This is now corrected. Thanks to Michael Biebl for
+  pointing out the problem.
+---------------------------------------------------------------------------
 Version 3.16.1 (rgerhards), 2008-05-02
 - fixed a bug in imklog which lead to startup problems (including
   segfault) on some platforms under some circumsances. Thanks to
@@ -571,6 +578,16 @@ Version 3.10.0 (rgerhards), 2008-01-07
 - much cleaner code due to new objects and removal of single-threading
   mode
 ---------------------------------------------------------------------------
+Version 2.0.5 STABLE (rgerhards), 2008-05-15
+- bugfix: regular expressions inside property replacer did not work
+  properly
+- adapted to liblogging 0.7.1+
+---------------------------------------------------------------------------
+Version 2.0.4 STABLE (rgerhards), 2008-03-27
+- bugfix: internally generated messages had "FROMHOST" property not set
+- bugfix: continue parsing if tag is oversize (discard oversize part) - thanks
+  to mclaughlin77@gmail.com for the patch
+---------------------------------------------------------------------------
 Version 2.0.1 STABLE (rgerhards), 2008-01-24
 - fixed a bug in integer conversion - but this function was never called,
   so it is not really a useful bug fix ;)
diff --git a/conf.c b/conf.c
index dad9ebf2..78895272 100644
--- a/conf.c
+++ b/conf.c
@@ -235,6 +235,7 @@ doModLoad(uchar **pp, __attribute__((unused)) void* pVal)
 	ASSERT(pp != NULL);
 	ASSERT(*pp != NULL);
 
+	skipWhiteSpace(pp); /* skip over any whitespace */
 	if(getSubString(pp, (char*) szName, sizeof(szName) / sizeof(uchar), ' ')  != 0) {
 		errmsg.LogError(NO_ERRCODE, "could not extract module name");
 		ABORT_FINALIZE(RS_RET_NOT_FOUND);
diff --git a/runtime/cfsysline.c b/runtime/cfsysline.c
index 0043ce5c..ef21fb4b 100644
--- a/runtime/cfsysline.c
+++ b/runtime/cfsysline.c
@@ -464,6 +464,8 @@ getWord(uchar **pp, cstr_t **ppStrB)
 
 	CHKiRet(rsCStrConstruct(ppStrB));
 
+	skipWhiteSpace(pp); /* skip over any whitespace */
+
 	/* parse out the word */
 	p = *pp;