  uschar *spam_score_int         = NULL;
  #endif
 diff --git a/src/globals.h b/src/globals.h
-index 800ec9c..3a30a5a 100644
+index 2bedcf5..d5716a6 100644
 --- a/src/globals.h
 +++ b/src/globals.h
-@@ -811,6 +811,7 @@ extern BOOL    smtp_use_size;          /* Global for passed connections */
+@@ -803,6 +803,7 @@ extern BOOL    smtp_use_size;          /* Global for passed connections */
  extern uschar *spamd_address;          /* address for the spamassassin daemon */
  extern uschar *spam_bar;               /* the spam "bar" (textual representation of spam_score) */
  extern uschar *spam_report;            /* the spamd report (multiline) */

       (void)fclose(mbox_file);
       (void)close(spamd_sock);
       return DEFER;
@@ -230,22 +263,67 @@ spam(uschar **listptr)
     return DEFER;
   }
 

 
   /* now send the file */
   /* spamd sometimes accepts conections but doesn't read data off
@@ -348,60 +429,93 @@ again:
   /* reading done */
   (void)close(spamd_sock);
 
