X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsrc%2Fspam.c;h=c0c3fb3730148a9595c1e7cb5a0c437360049f87;hb=a466d09b249d5018ecb0f1ec45adba545c02c75b;hp=3a5349fc37398ff5c4caa151a8f63057d0d8ec26;hpb=2b08f19207269c2862fe616598791b28d65187dd;p=user%2Fhenk%2Fcode%2Fexim.git

diff --git a/src/src/spam.c b/src/src/spam.c
index 3a5349fc3..c0c3fb373 100644
--- a/src/src/spam.c
+++ b/src/src/spam.c
@@ -48,7 +48,7 @@ spam(uschar **listptr)
   fd_set select_fd;
 #endif
   uschar *spamd_address_work;
-  static const char * loglabel = US"spam acl condition:";
+  static const uschar * loglabel = US"spam acl condition:";
 
   /* stop compiler warning */
   result = 0;
@@ -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);