Fix comments after module reference.

ok # foo!
FreeRADIUS · Oct 2, 2014 · 2615fdf · 2615fdf
1 parent cf151d0
commit 2615fdf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/main/conffile.c b/src/main/conffile.c
@@ -2244,7 +2244,13 @@ static int cf_section_read(char const *filename, int *lineno, FILE *fp,
 				break;
 			}
 
-			if (!*ptr || (*ptr == '#') || (*ptr == '}')) break;
+			if (!*ptr || (*ptr == '}')) break;
+
+			/*
+			 *	module # stuff!
+			 *	foo = bar # other stuff
+			 */
+			if ((t3 == T_HASH) || (*ptr == '#')) continue;
 
 			ERROR("%s[%d]: Syntax error: Expected comma after '%s': %s",
 			      filename, *lineno, value, ptr);
@@ -2320,7 +2326,6 @@ static int cf_section_read(char const *filename, int *lineno, FILE *fp,
 		if (*ptr == '#') continue;
 
 		if (*ptr) {
-			DEBUG("XXXXX ::%s::\n", ptr);
 			goto get_more;
 		}
 

diff --git a/src/tests/keywords/comments b/src/tests/keywords/comments
@@ -42,6 +42,5 @@ if (&request:Reply-Message[1] != "I am #literally a comment #") {
 	}
 }
 
-# @todo Fix these!
-#ok # Im a comment after a module call
-#ok # I'm a comment # after a module {} call
+ok # I'm a comment after a module call
+ok # I'm a comment # after a module {} call