From: Frédéric Marchal <fmarchal@users.sourceforge.net>
Date: Tue, 20 Jul 2010 05:00:56 +0000 (+0000)
Subject: The two sarg.conf options "hours" and "weekdays" lacked a return statement after... 
X-Git-Tag: v2.3.1~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3bd75b91fe76a0c1341f0e21db95579f77e9ff97;p=thirdparty%2Fsarg.git

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.
---

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: