Make the retry_include_ip_address smtp transport option expanded. Bug 1545

[exim.git] / src / src / spam.c

diff --git a/src/src/spam.c b/src/src/spam.c
index 63395f2d54cc0521f5ff31954666dd3c0e3c2aa5..76bf7d67fc8bcc70988cdf7bf358f96d3925099c 100644 (file)
--- a/src/src/spam.c
+++ b/src/src/spam.c
@@ -20,7 +20,9 @@ int spam_ok = 0;
 int spam_rc = 0;
 uschar *prev_spamd_address_work = NULL;
 
-int spam(uschar **listptr) {
+int
+spam(uschar **listptr)
+{
   int sep = 0;
   uschar *list = *listptr;
   uschar *user_name;
@@ -127,7 +129,8 @@ int spam(uschar **listptr) {
         (spamd_address_container *)store_get(sizeof(spamd_address_container));
 
       /* grok spamd address and port */
-      if( sscanf(CS address, "%s %u", this_spamd->tcp_addr, &(this_spamd->tcp_port)) != 2 ) {
+      if (sscanf(CS address, "%23s %u", this_spamd->tcp_addr, &(this_spamd->tcp_port)) != 2)
+        {
         log_write(0, LOG_MAIN,
           "spam acl condition: warning - invalid spamd address: '%s'", address);
         continue;
@@ -286,7 +289,7 @@ again:
             "spam acl condition: %s on spamd socket", strerror(errno));
         else {
           if (time(NULL) - start < SPAMD_TIMEOUT)
-          goto again;
+            goto again;
           log_write(0, LOG_MAIN|LOG_PANIC,
             "spam acl condition: timed out writing spamd socket");
         }