From: Frédéric Marchal <fmarchal@users.sourceforge.net>
Date: Tue, 22 Sep 2009 07:09:14 +0000 (+0000)
Subject: Fixed bug #2863485.
X-Git-Tag: v2_2_6~19
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=39186a2fe3464873d428c7e5c1127169e0dc87ac;p=thirdparty%2Fsarg.git

Fixed bug #2863485.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cce90da..cef9498 100755
--- 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 2c795a3..7bfc057 100644
--- 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 dbd076e..7eff6ee 100755
--- 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 cf20401..d874e21 100644
--- 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 5ed7254..6f7cdfd 100644
--- 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;