From: Andrew Lewis <nerf@judo.za.org>
Date: Sun, 15 May 2016 16:29:58 +0000 (+0200)
Subject: [Fix] Fix Exim shutdown patch
X-Git-Tag: 1.2.7~8^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F630%2Fhead;p=rspamd.git

[Fix] Fix Exim shutdown patch
---

diff --git a/contrib/exim/shutdown.patch b/contrib/exim/shutdown.patch
index 39007130f..e8bf8a057 100644
--- a/contrib/exim/shutdown.patch
+++ b/contrib/exim/shutdown.patch
@@ -1,14 +1,14 @@
-diff -ru exim-4.86.orig/src/spam.c exim-4.86/src/spam.c
---- exim-4.86.orig/src/spam.c	2016-04-09 13:54:51.583800284 +0200
-+++ exim-4.86/src/spam.c	2016-04-09 13:55:16.659806242 +0200
-@@ -499,7 +499,9 @@
+--- exim4-4.86.2.orig/src/spam.c
++++ exim4-4.86.2/src/spam.c
+@@ -499,7 +499,10 @@ if (ferror(mbox_file))
  (void)fclose(mbox_file);
  
  /* we're done sending, close socket for writing */
 -shutdown(spamd_sock,SHUT_WR);
-+if (!is_rspamd) {
++if (!sd->is_rspamd)
++  {
 +  shutdown(spamd_sock,SHUT_WR);
-+}
++  }
  
  /* read spamd response using what's left of the timeout.  */
  memset(spamd_buffer, 0, sizeof(spamd_buffer));