Move ESMPT LIMITS extension from experimental to mainline

[exim.git] / src / src / functions.h

diff --git a/src/src/functions.h b/src/src/functions.h
index 74cd15424cd7a2b7fcb0daaaa30d59c67028d989..77323a5c12f5e88ab9870175d81f40d39e480f47 100644 (file)
--- a/src/src/functions.h
+++ b/src/src/functions.h
@@ -632,7 +632,7 @@ extern void    transport_do_pass_socket(const uschar *, const uschar *,
                 const uschar *, uschar *, int);
 extern void    transport_init(void);
 extern BOOL    transport_pass_socket(const uschar *, const uschar *, const uschar *, uschar *, int
-#ifdef EXPERIMENTAL_ESMTP_LIMITS
+#ifndef DISABLE_ESMTP_LIMITS
                        , unsigned, unsigned, unsigned
 #endif
                        );
@@ -760,7 +760,7 @@ return US strncpy(CS dst, CCS src, n);
 
 
 /* Advance the string pointer given over any whitespace.
-Return the next char as there's enought places using it to be useful. */
+Return the next char as there's enough places using it to be useful. */
 
 #define Uskip_whitespace(sp) skip_whitespace(CUSS sp)
 
@@ -1400,6 +1400,11 @@ HDEBUG(D_transport|D_acl|D_v) debug_printf_indent("  SMTP%c> %s\n",
     client_cmd_log = string_catn(client_cmd_log, US"|", 1); 
     (void) string_from_gstring(client_cmd_log);
     }
+  else if (mode == SCMD_MORE)
+    {
+    client_cmd_log = string_catn(client_cmd_log, US"+", 1);
+    (void) string_from_gstring(client_cmd_log);
+    }
   store_pool = old_pool;
   }
 #  endif