Fix a use after free buffer in the regex

[thirdparty/sarg.git] / sarg.conf

diff --git a/sarg.conf b/sarg.conf
index 351b01f6ba54fff5aa6dbcc1610f71428e6d0e4b..18c8eb58a0965bae018be473b030a74b71c93114 100644 (file)
--- a/sarg.conf
+++ b/sarg.conf
@@ -3,13 +3,17 @@
 # TAG:  access_log file
 #       Where is the access.log file
 #
-#       This option can be repeated up to 256 times to list rotated files or
+#       This option can be repeated multiple times to list rotated files or
 #       files from different sources.
 #      
 #       The files named here must exists or sarg aborts. It is intended as a
 #       safety against incomplete reporting due to problems occuring with the
 #       logs.
 #
+#       If the file globbing was compiled in, the file name can contain shell
+#       wildcards such as * and ?. Tilde expension and variable expension are
+#       not supported. Special characters can be escaped with a backslash.
+#
 #       If some files are passed on the command line with "sarg -l file" or
 #       "sarg file", the files listed here are ignored.
 #
@@ -215,7 +219,11 @@
 #exclude_hosts none
 
 # TAG:  useragent_log file
-#       useragent.log file patch to generate useragent report.
+#       useragent.log file to generate useragent report.
+#
+#       This option may be repeated multiple times to process several files.
+#
+#       Wildcards are allowed (see access_log).
 #
 #useragent_log none
 
@@ -765,6 +773,15 @@
 #
 #ntlm_user_format domainname+username
 
+# TAG: strip_user_suffix suffix
+#      Remove a suffix from the user name. The suffix may be
+#      a Kerberos domain name. It must be at the end of the
+#      user name (as is implied by a suffix).
+#
+#      This is a lightweight easy to configure option. For a
+#      more complete solution, see useralias.
+#strip_user_suffix @example.com
+
 # TAG: realtime_refresh_time num sec
 #      How many time to auto refresh the realtime report
 #      0 = disable
@@ -890,3 +907,18 @@
 #      Note that the max_successive_log_errors is still taken into account and
 #      cannot be disabled.
 #max_total_log_errors 50
+
+# TAG: include conffile
+#      Include the specified conffile. The full path must be provided to
+#      make sure the correct file is loaded.
+#
+#      Use this option to store common options in one file and include it
+#      in multiple sarg.conf dedicated to various reporting tasks.
+#
+#      Options declared last take precedence. Use it to include a file and
+#      then override some options after the include statement. Beware that
+#      some options are cumulative such as access_log, useragent_log or
+#      redirector_log. You can't override those options as explained here.
+#      Declaring them in the common file and the including file will merely
+#      add the latter to the list.
+#include /etc/sarg/sarg-common.conf