Merge branch 'beta'

Conflicts:

	ChangeLog
	rfc3195d.c

1 files changed, 1 insertions, 0 deletions

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);