Fixed bug #2863485.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cce90dae348a4c552320f62579544de8e400caa2..cef9498f678325c6abd68d1aabefae0ace97a590 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ PROJECT(sarg C)
 SET(sarg_VERSION 2)
 SET(sarg_REVISION 2)
 SET(sarg_BUILD "6rc1")
-SET(sarg_BUILDDATE "Sep-17-2009")
+SET(sarg_BUILDDATE "Sep-22-2009")
 
 INCLUDE(AddFileDependencies)
 INCLUDE(CheckIncludeFile)

diff --git a/ChangeLog b/ChangeLog
index 2c795a31a145f2eddda4c10daff8ff933c88831f..7bfc0574f83dd28ed2ddb94c7d83df3d161f5130 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 SARG ChangeLog
 
-Sep-17-2009 Version 2.2.6rc
+Sep-22-2009 Version 2.2.6rc1
                - Protection against buffer overflows in getword and friends and report the origin of the error instead of always blaming access.log.
                - Patch #2224623 applied.
                - Updated to autoconf 2.61.
@@ -64,6 +64,7 @@ Sep-17-2009 Version 2.2.6rc
                - Add cmake configuration files.
                - Compute the report date without resorting to the system command.
                - Allow the use of spaces in the temporary directory.
+               - Fixed bug #2863485.
 
 Mar-03-2008    Version 2.2.5
                - new fix to the script insertion vulnerability via user-agent

diff --git a/include/info.h b/include/info.h
index dbd076e03a62ebca3550b20c44bbbbf2e70729ec..7eff6ee44616df33737b10a89b3f1315515465be 100755 (executable)
--- a/include/info.h
+++ b/include/info.h
@@ -1,3 +1,3 @@
-#define VERSION PACKAGE_VERSION" Sep-17-2009"
+#define VERSION PACKAGE_VERSION" Sep-22-2009"
 #define PGM PACKAGE_NAME
 #define URL "http://sarg.sourceforge.net"

diff --git a/log.c b/log.c
index cf204018f07b955c6b07a1e54f05385087dc5d62..d874e211288a71eb573bf400d0166d1e922817de 100644 (file)
--- a/log.c
+++ b/log.c
@@ -1561,7 +1561,7 @@ static void getusers(const char *pwdfile, int debug)
    FILE *fp_usr;
    char buf[255];
    char *str;
-   unsigned long int nreg=0;
+   long int nreg=0;
 
    if(debug)
       debuga("%s: %s",text[60],pwdfile);
@@ -1609,7 +1609,7 @@ static void gethexclude(const char *hexfile, int debug)
 
    FILE *fp_ex;
    char buf[255];
-   unsigned long int nreg=0;
+   long int nreg=0;
 
    if(debug)
       debuga("%s: %s",text[67],hexfile);
@@ -1656,7 +1656,7 @@ static void getuexclude(const char *uexfile, int debug)
 
    FILE *fp_ex;
    char buf[255];
-   unsigned long int nreg=0;
+   long int nreg=0;
 
    if(debug)
       debuga("%s: %s",text[67],uexfile);

diff --git a/util.c b/util.c
index 5ed7254d6174dd468d44e871e43cf7866daf47d4..6f7cdfd260778a3cc7b83a6246f9231a96ae9498 100644 (file)
--- a/util.c
+++ b/util.c
@@ -1450,7 +1450,7 @@ char *get_param_value(const char *param,char *line)
 void read_usertab(const char *UserTabFile)
 {
    FILE *fp_usr;
-   unsigned int nreg;
+   long int nreg;
    char buf[MAXLEN];
    char bufy[MAXLEN];
    int z2;