New variable $config_dir, $config_file. Bug 1553

[user/henk/code/exim.git] / src / src / spam.c

diff --git a/src/src/spam.c b/src/src/spam.c
index 3a5349fc37398ff5c4caa151a8f63057d0d8ec26..45a06931cdc4d2de600fcdeb021ba8c24b4139cf 100644 (file)
--- a/src/src/spam.c
+++ b/src/src/spam.c
@@ -95,11 +95,8 @@ spam(uschar **listptr)
     spam_ok = 0;
 
   /* if we scanned for this username last time, just return */
-  if ( spam_ok && Ustrcmp(prev_user_name, user_name) == 0)
-    if (override)
-      return OK;
-    else
-      return spam_rc;
+  if (spam_ok && Ustrcmp(prev_user_name, user_name) == 0)
+    return override ? OK : spam_rc;
 
   /* make sure the eml mbox file is spooled up */
   mbox_file = spool_mbox(&mbox_size, NULL);
@@ -136,7 +133,7 @@ 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,
           "%s warning - invalid spamd address: '%s'", loglabel, address);