Add compile-time guard against BDB library version 6

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

diff --git a/src/src/moan.c b/src/src/moan.c
index 7d1a2c681d2b557c62177f362fc3038216ebca37..0228dcd4e965ec2dfa9c4c16b26078a8ce986b6d 100644 (file)
--- a/src/src/moan.c
+++ b/src/src/moan.c
@@ -2,7 +2,7 @@
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
-/* Copyright (c) University of Cambridge 1995 - 2015 */
+/* Copyright (c) University of Cambridge 1995 - 2017 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Functions for sending messages to sender or to mailmaster. */
@@ -279,14 +279,12 @@ if (bounce_return_message)
 
   if (bounce_return_body && message_file)
     {
-    int ch;
-    enum {midline, beginline, haddot} state = beginline;
     BOOL enddot = dot_ends && message_file == stdin;
     uschar * buf = store_get(bounce_return_linesize_limit+2);
 
     if (firstline) fprintf(f, "%s", CS firstline);
 
-    while (fgets(buf, bounce_return_linesize_limit+2, message_file))
+    while (fgets(CS buf, bounce_return_linesize_limit+2, message_file))
       {
       int len;
 
@@ -306,11 +304,11 @@ if (bounce_return_message)
       if (size_limit > 0 && len > size_limit - written)
        {
        buf[size_limit - written] = '\0';
-       fputs(buf, f);
+       fputs(CS buf, f);
        break;
        }
 
-      fputs(buf, f);
+      fputs(CS buf, f);
       }
     }
 #ifdef EXPERIMENTAL_DMARC
@@ -589,7 +587,7 @@ fprintf(stderr, "%d previous message%s successfully processed.\n",
 
 fprintf(stderr, "The rest of the batch was abandoned.\n");
 
-exim_exit(yield);
+exim_exit(yield, US"batch");
 }