From 3bd75b91fe76a0c1341f0e21db95579f77e9ff97 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fr=C3=A9d=C3=A9ric=20Marchal?= Date: Tue, 20 Jul 2010 05:00:56 +0000 Subject: [PATCH] The two sarg.conf options "hours" and "weekdays" lacked a return statement after processing the option. That produced an error stating that the options were invalid but was not preventing sarg from working just fine. --- getconf.c | 2 ++ sarg.conf | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/getconf.c b/getconf.c index ba95198..dd3ae27 100644 --- a/getconf.c +++ b/getconf.c @@ -396,6 +396,7 @@ static void parmtest(char *buf) debuga(_("Error: Invalid syntax in hours tag!\n")); exit( 1 ); } + return; } if (is_param("weekdays",buf)) { @@ -403,6 +404,7 @@ static void parmtest(char *buf) debuga(_("Error: Invalid syntax in weekdays tag!\n")); exit( 1 ); } + return; } if (getparam_2words("topuser_sort_field",buf,TopuserSortField,sizeof(TopuserSortField),TopuserSortOrder,sizeof(TopuserSortOrder))>0) return; diff --git a/sarg.conf b/sarg.conf index 9f88cad..e9bce01 100644 --- a/sarg.conf +++ b/sarg.conf @@ -452,14 +452,14 @@ #datafile_url ip # TAG: weekdays -# The weekdays to take account ( Sunday->0, Saturday->6 ) +# The weekdays to take into account ( Sunday->0, Saturday->6 ) # Example: #weekdays 1-3,5 # Default: #weekdays 0-6 # TAG: hours -# The hours to take account +# The hours to take into account # Example: #hours 7-12,14,16,18-20 # Default: -- 2.47.2