Bug#644794: [PATCH] Fix buffer lengths for IPv6 adresses logging

Le dimanche 9 octobre 2011 15:11:10, Julien Valroff a écrit :
> Hi,
> 
> Here is an attempt to fix Debian bug #644794 [0] stating the logged
> IPv6 addresses are truncated.
> 
> Cheers,
> Julien

I would like to propose a patch myself too. Size of ip array should be 128 but 
I'm thinking about replacing this array by a more appropriate structure (like 
union of struct in_addr or struct in6_addr). but I want to check it's adequate 
first.

Congrats for your quick reaction Julien.
> 
> [0] http://bugs.debian.org/644794
> 
> ---
>  CHANGELOG   |    2 ++
>  src/dspam.c |    6 +++---
>  2 files changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/CHANGELOG b/CHANGELOG
> index 0ca9952..5098f71 100644
> --- a/CHANGELOG
> +++ b/CHANGELOG
> @@ -1,3 +1,5 @@
> +[20111009:1500] jvalroff: Fix buffer lengths for IPv6 adresses logging
> +
>  [20111001:1200] sbajic: Fix typo and formatting issues in dspam.conf
> 
>  [20111001:1030] sbajic: Fix compiler warnings (unused function) in MySQL
> driver diff --git a/src/dspam.c b/src/dspam.c
> index 2668aba..48c12aa 100644
> --- a/src/dspam.c
> +++ b/src/dspam.c
> @@ -409,7 +409,7 @@ process_message (
>        strcmp(_ds_pref_val(ATX->PTX, "optOutClamAV"), "on"))
>    {
>      if (has_virus(message)) {
> -      char ip[32];
> +      char ip[46];
>        CTX->result = DSR_ISSPAM;
>        CTX->probability = 1.0;
>        CTX->confidence = 1.0;
> @@ -3823,7 +3823,7 @@ MEM_ALLOC:
>   */
> 
>  int tracksource(DSPAM_CTX *CTX) {
> -  char ip[32];
> +  char ip[46];
> 
>    if (!dspam_getsource (CTX, ip, sizeof (ip)))
>    {
> @@ -4010,7 +4010,7 @@ int is_blacklisted(DSPAM_CTX *CTX, AGENT_CTX *ATX) {
>    /* No cygwin support for IP Blacklisting */
>    return 0;
>  #else
> -  char ip[32];
> +  char ip[46];
>    int bad = 0;
>    struct attribute *attrib;
>    struct addrinfo *res = NULL;

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iQIcBAABCAAGBQJOkdcKAAoJENADhS+9UlKep0cP/16yJ6UmOHztZMTLZxB2R90n
o0dMaB4V9kHl/cGq+GtNusU3ONrrjvlkTDUZ5pS2lW6krgZ0vu1lWk35VAlhUkDK
ybCbFvqzFeCT37NNqpeeWLX1tZ4hKmeAWxrogSqWrfz3LrxWXJY9KsYxhbSx+ghA
obawVkbDDKIfDyQnmYCpez6EFsqR/uTAn2GS2n9+g/InmMQbrJuRByxulKpwoLwT
QtUpw1bocNj6jXTAT33oXM88Bdc8zfpkmi2qYc26+j8M2FnYMI/7KEedEuSLveZR
L8FZsLszSsp2+Bmr15y5XQe6GtiRD5zkuTws0puty/yooqsWIj5akZpV1HRsfmz9
Eb/bqr+mTGxTnYLS9MUHZu28twXW2PM2J1aukpJT0QHLAV3h5CZ5pFeTT7KHeygU
Zio5MW9+08kgB1Q20/ksfsMBUvTKGpB0oI60c/fPSBExRX6ugTDa6i7tIlwZVaBS
fAgGwGrYXyuJpVDp361UzXgRvYMX5wTJ/YiMpZyW8gNgQi6PGc2d1yEmT3h1UKCk
o5ZsNjbKFKzAZUoYfHpCDGhWVIyWyM5G6Vb2wZqsRaU+79l5I8OJmkQAzUtDtuT6
0W+X4/bc1PNXt3nn0r1Tzl72OgPrdX6PMpmr/7d8yPS4aPe1NHSIkyTj5pPCSJhN
VAj7DdDTRu44XvMJio8h
=Nytk
-----END PGP SIGNATURE-----