From: Frédéric Marchal Date: Tue, 2 Feb 2010 11:21:15 +0000 (+0000) Subject: Ported r225 from branches/v2_2_7 (remove Pedro Orso's mail from headers) X-Git-Tag: v2.3-pre2~104 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e2f13031e7a88b3d5ccad8923cfad573842aadd0;p=thirdparty%2Fsarg.git Ported r225 from branches/v2_2_7 (remove Pedro Orso's mail from headers) --- e2f13031e7a88b3d5ccad8923cfad573842aadd0 diff --cc CMakeLists.txt index 8ebe245,a802e0b..81d5466 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@@ -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 b037884,08453da..d5dcf03 --- a/ChangeLog +++ b/ChangeLog @@@ -1,13 -1,6 +1,13 @@@ SARG ChangeLog +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-28-2010 Version 2.2.7 + 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 topuser.c index c25f7ab,6360660..5a441c9 --- a/topuser.c +++ b/topuser.c @@@ -230,10 -258,10 +231,10 @@@ void topuser(void fprintf(fp_top3, "\n\n\n \n",CharSet); css(fp_top3); -- fprintf(fp_top3,"\n"); ++ fputs("\n",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, "..");