Fix build with heimdal-gssapi. Bug 2501

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

diff --git a/src/src/spam.c b/src/src/spam.c
index 3ffc514f09cf13432f38beedc442929dfe9c3dcc..4cc4a9ae0967c9f069baba3feeae58b14120c186 100644 (file)
--- a/src/src/spam.c
+++ b/src/src/spam.c
@@ -293,7 +293,7 @@ start = time(NULL);
     uschar * s;
 
     DEBUG(D_acl) debug_printf_indent("spamd: addr entry '%s'\n", address);
-    sd = (spamd_address_container *)store_get(sizeof(spamd_address_container));
+    sd = store_get(sizeof(spamd_address_container), FALSE);
 
     for (sublist = address, args = 0, spamd_param_init(sd);
         (s = string_nextinlist(&sublist, &sublist_sep, NULL, 0));
@@ -503,7 +503,7 @@ offset = 0;
 while ((i = ip_recv(&spamd_cctx,
                   spamd_buffer + offset,
                   sizeof(spamd_buffer) - offset - 1,
-                  sd->timeout - time(NULL) + start)) > 0)
+                  sd->timeout + start)) > 0)
   offset += i;
 spamd_buffer[offset] = '\0';   /* guard byte */
 
@@ -565,7 +565,7 @@ else
     }
 
   Ustrcpy(spam_action_buffer,
-    spamd_score >= spamd_threshold ? "reject" : "no action");
+    spamd_score >= spamd_threshold ? US"reject" : US"no action");
   }
 
 /* Create report. Since this is a multiline string,