]> git.ipfire.org Git - thirdparty/sarg.git/commitdiff
Ported r225 from branches/v2_2_7 (remove Pedro Orso's mail from headers)
authorFrédéric Marchal <fmarchal@users.sourceforge.net>
Tue, 2 Feb 2010 11:21:15 +0000 (11:21 +0000)
committerFrédéric Marchal <fmarchal@users.sourceforge.net>
Tue, 2 Feb 2010 11:21:15 +0000 (11:21 +0000)
23 files changed:
1  2 
CMakeLists.txt
ChangeLog
authfail.c
dansguardian_report.c
datafile.c
denied.c
download.c
getconf.c
grepday.c
html.c
index.c
log.c
realtime.c
repday.c
report.c
siteuser.c
sort.c
squidguard_report.c
topsites.c
topuser.c
totday.c
useragent.c
util.c

diff --cc CMakeLists.txt
index 8ebe2457c695d48b584d7c9a524fa0648dd6db4c,a802e0bff8fd193190b60e7fc90431067399e84f..81d546673478302fa8f3207c9cdd8a25ebec7ff5
@@@ -1,9 -1,9 +1,9 @@@
  CMAKE_MINIMUM_REQUIRED (VERSION 2.6)
  PROJECT(sarg C)
  SET(sarg_VERSION 2)
 -SET(sarg_REVISION 2)
 -SET(sarg_BUILD "7")
 +SET(sarg_REVISION "3rc1")
 +SET(sarg_BUILD "")
- SET(sarg_BUILDDATE "Jan-30-2010")
+ SET(sarg_BUILDDATE "Feb-02-2010")
  
  INCLUDE(AddFileDependencies)
  INCLUDE(CheckIncludeFile)
diff --cc ChangeLog
index b03788498155ebb3bb8c6d688c71e4bbbcc5c149,08453da1911e5c04c8c87db1fcd1ac09da34807e..d5dcf03bbc6609d50f965cf7f1c3170b55efac15
+++ b/ChangeLog
@@@ -1,13 -1,6 +1,13 @@@
  SARG ChangeLog
  
- Jan-28-2010 Version 2.2.7
 +Jan-27-2009 Version 2.3
 +              - LDAP usertab added. 
 +                Now you can have your users in a LDAP Server.
 +                Use these tags in sarg.conf: LDAPHost, LDAPPort, LDAPBindDN, LDAPBindPW,
 +                                             LDAPBaseSearch, LDAPFilterSearch
 +              - Parse the string flags from sarg.conf once during the reading of sarg.conf instead of manipulating and duplicating the tests of the strings where they are used.
 +
+ Jan-29-2010 Version 2.2.7
                - Extra compile and run time protection (FORTIFY_SOURCE) fixed in configure.
                - Use tabulations as columns separator in intermediary files to avoid problems when a field of the log contains a space.
                - Input log file type detection partly rewritten to clearly distinguish which type is processed where.
diff --cc authfail.c
Simple merge
Simple merge
diff --cc datafile.c
Simple merge
diff --cc denied.c
Simple merge
diff --cc download.c
Simple merge
diff --cc getconf.c
Simple merge
diff --cc grepday.c
Simple merge
diff --cc html.c
Simple merge
diff --cc index.c
Simple merge
diff --cc log.c
Simple merge
diff --cc realtime.c
Simple merge
diff --cc repday.c
Simple merge
diff --cc report.c
Simple merge
diff --cc siteuser.c
Simple merge
diff --cc sort.c
Simple merge
Simple merge
diff --cc topsites.c
Simple merge
diff --cc topuser.c
index c25f7ab0fd1ec2eb828dd6999a207197f008f32b,636066007ef09966e329e7a073133b6019ad5055..5a441c9d2dbb069790f5843f904d795e3a4a09cf
+++ b/topuser.c
@@@ -230,10 -258,10 +231,10 @@@ void topuser(void
  
     fprintf(fp_top3, "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n<html>\n<head>\n  <meta http-equiv=\"Content-Type\" content=\"text/html; charset=%s\">\n",CharSet);
     css(fp_top3);
--   fprintf(fp_top3,"</head>\n<body class=\"body\">");
++   fputs("</head>\n<body class=\"body\">",fp_top3);
     write_logo_image(fp_top3);
  
 -   if(strcmp(IndexTree,"date") == 0)
 +   if(IndexTree == INDEX_TREE_DATE)
        show_sarg(fp_top3, "../../..");
     else
        show_sarg(fp_top3, "..");
diff --cc totday.c
Simple merge
diff --cc useragent.c
Simple merge
diff --cc util.c
Simple merge