Accept IPv6 addresses in squidGuard's log

The buffer to store a IP address from squidGuard's log was not big
enough to hold an IPv6 address. That resulted in a getword loop error.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 756181d9c49d974440bc70863db6e059adcefd98..d84c30728c3e0b77a9185a588d76b292c933f052 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ PROJECT(sarg C)
 SET(sarg_VERSION 2)
 SET(sarg_REVISION "3.2-pre1")
 SET(sarg_BUILD "")
-SET(sarg_BUILDDATE "Jan-27-2011")
+SET(sarg_BUILDDATE "Feb-02-2011")
 
 INCLUDE(AddFileDependencies)
 INCLUDE(CheckIncludeFile)

diff --git a/include/info.h b/include/info.h
index 2d4d8b502f7e171a77851d9a6abc889c4ef71eb7..2f77f547b4f203406af3e7d1e22ab90020f33ca5 100755 (executable)
--- a/include/info.h
+++ b/include/info.h
@@ -1,3 +1,3 @@
-#define VERSION PACKAGE_VERSION" Jan-27-2011"
+#define VERSION PACKAGE_VERSION" Feb-02-2011"
 #define PGM PACKAGE_NAME
 #define URL "http://sarg.sourceforge.net"

diff --git a/squidguard_log.c b/squidguard_log.c
index 1ed40352ea44daf60b3060efa0453eded9fc2705..16406b9ad3280b2234d3e45f299db2853b7b478a 100644 (file)
--- a/squidguard_log.c
+++ b/squidguard_log.c
@@ -40,7 +40,7 @@ static void read_log(const char *wentp, FILE *fp_ou,int dfrom,int duntil)
        char source[128], list[128];
        char url[MAX_URL_LEN];
        char user[MAX_USER_LEN];
-       char ip[25];
+       char ip[45];
        long long int lmon, lday, lyear;
        int mon, day, year;
        int  idata=0;

diff --git a/squidguard_report.c b/squidguard_report.c
index cded053908543c2e295fcbf372b6e44c20360725..111cd70f6c819876c98a6625fbd65e9c59153899 100644 (file)
--- a/squidguard_report.c
+++ b/squidguard_report.c
@@ -35,9 +35,9 @@ void squidguard_report(void)
        char *url;
        char squidguard_in[MAXLEN];
        char report[MAXLEN];
-       char ip[MAXLEN];
+       char ip[45];
        char rule[255];
-       char oip[MAXLEN];
+       char oip[45];
        char user[MAXLEN];
        char ouser[MAXLEN];
        char data[15];