2,4c2,4
< --- a/src/expand.c	2015-02-11 14:32:38.787982270 +0200
< +++ b/src/expand.c	2015-02-11 14:32:53.467982467 +0200
< @@ -641,6 +641,7 @@
---
> --- a/src/expand.c	2015-01-06 01:40:11.000000000 +0200
> +++ b/src/expand.c	2015-02-11 15:01:19.287978945 +0200
> @@ -652,6 +652,7 @@
13,15c13,15
< --- a/src/globals.c	2015-02-11 14:32:38.815982283 +0200
< +++ b/src/globals.c	2015-02-11 14:32:53.467982467 +0200
< @@ -1257,6 +1257,7 @@
---
> --- a/src/globals.c	2015-01-06 01:40:11.000000000 +0200
> +++ b/src/globals.c	2015-02-11 15:01:19.287978945 +0200
> @@ -1276,6 +1276,7 @@
24,26c24,26
< --- a/src/globals.h	2015-02-11 14:32:38.835982265 +0200
< +++ b/src/globals.h	2015-02-11 14:32:53.467982467 +0200
< @@ -803,6 +803,7 @@
---
> --- a/src/globals.h	2015-01-06 01:40:11.000000000 +0200
> +++ b/src/globals.h	2015-02-11 15:01:19.287978945 +0200
> @@ -819,6 +819,7 @@
35,36c35,36
< --- a/src/spam.c	2015-02-11 14:32:38.803982272 +0200
< +++ b/src/spam.c	2015-02-11 14:34:39.287981868 +0200
---
> --- a/src/spam.c	2015-01-06 01:40:11.000000000 +0200
> +++ b/src/spam.c	2015-02-11 15:17:20.867976302 +0200
70,71c70,72
< -      if( sscanf(CS address, "%s %u", this_spamd->tcp_addr, &(this_spamd->tcp_port)) != 2 ) {
< +      if( sscanf(CS address, "%23s %hu", this_spamd->tcp_addr, &(this_spamd->tcp_port)) != 2 ) {
---
> -      if (sscanf(CS address, "%23s %u", this_spamd->tcp_addr, &(this_spamd->tcp_port)) != 2)
> +      if (sscanf(CS address, "%23s %hu", this_spamd->tcp_addr, &(this_spamd->tcp_port)) != 2)
>          {
74,75c75
<          continue;
< @@ -173,6 +183,7 @@
---
> @@ -174,6 +184,7 @@
83c83
< @@ -209,12 +220,28 @@
---
> @@ -210,12 +221,28 @@
114c114
< @@ -230,22 +257,50 @@
---
> @@ -231,22 +258,50 @@
175c175
< @@ -348,60 +403,93 @@
---
> @@ -349,60 +404,93 @@
298c298
< @@ -417,12 +505,12 @@
---
> @@ -418,12 +506,12 @@
316,317c316,317
< --- a/src/spam.h	2015-02-11 14:32:38.775982314 +0200
< +++ b/src/spam.h	2015-02-11 14:32:53.467982467 +0200
---
> --- a/src/spam.h	2015-01-06 01:40:11.000000000 +0200
> +++ b/src/spam.h	2015-02-11 15:01:19.291978935 +0200