Ported r215 from branches/v2_2_7 (user ID mangling)

diff --cc CMakeLists.txt
index 578ee22fb079aa6e0add7cdc38bb379a94a957ec,062869d52c498e2816f368c272acfae4974980f9..d5724e8200c9103010278318a5c24aa4edf4a11c
--- 1/CMakeLists.txt
--- 2/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 3)
 +SET(sarg_BUILD "")
- SET(sarg_BUILDDATE "Jan-24-2010")
+ SET(sarg_BUILDDATE "Jan-28-2010")
  
  INCLUDE(AddFileDependencies)
  INCLUDE(CheckIncludeFile)

diff --cc ChangeLog
index 522bfc585c2d1b8f45f7e6378fb6a232700c0c56,0026169ff68e6964050e7dc798dc6e63836d545e..b03788498155ebb3bb8c6d688c71e4bbbcc5c149
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,13 -1,6 +1,13 @@@
  SARG ChangeLog
  
- Jan-22-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-28-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 getconf.c
Simple merge

diff --cc html.c
Simple merge

diff --cc log.c
Simple merge

diff --cc report.c
Simple merge