nicer retry message

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

diff --git a/src/src/demime.c b/src/src/demime.c
index c64c397346b28051dbb17cdcbf728b0cba42dcb2..fc778fae49273319ec2905b9f0b5a154dc04bd22 100644 (file)
--- a/src/src/demime.c
+++ b/src/src/demime.c
@@ -1,11 +1,11 @@
-/* $Cambridge: exim/src/src/demime.c,v 1.10 2010/06/05 11:13:29 pdp Exp $ */
-
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
-/* Copyright (c) Tom Kistner <tom@duncanthrax.net> 2003-???? */
-/* License: GPL */
+/* Copyright (c) Tom Kistner <tom@duncanthrax.net> 2003-????
+ * License: GPL
+ * Copyright (c) The Exim Maintainers 2016
+ */
 
 /* Code for unpacking MIME containers. Called from acl.c. */
 
@@ -17,9 +17,9 @@
 uschar demime_reason_buffer[1024];
 struct file_extension *file_extensions = NULL;
 
-int demime(uschar **listptr) {
+int demime(const uschar **listptr) {
   int sep = 0;
-  uschar *list = *listptr;
+  const uschar *list = *listptr;
   uschar *option;
   uschar option_buffer[64];
   unsigned long mbox_size;
@@ -823,7 +823,7 @@ void mime_trigger_error(int level, uschar *format, ...) {
     (void)string_vformat(US f, 16383,(char *)format, ap);
     va_end(ap);
     f-=22;
-    log_write(0, LOG_MAIN, f);
+    log_write(0, LOG_MAIN, "%s", f);
     /* then copy to demime_reason_buffer if new
     level is greater than old level */
     if (level > demime_errorlevel) {