X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/53cc1417d804b27674f9e18fec09dee3badd080b..a1108b5118d32e969c5fe91b2110944f7483a7cb:/src/src/exim.c

diff --git a/src/src/exim.c b/src/src/exim.c
index 8f33bde26..8526cbbf3 100644
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -1010,6 +1010,9 @@ g = string_cat(NULL, US"Support for:");
 #ifdef EXPERIMENTAL_DSN_INFO
   g = string_cat(g, US" Experimental_DSN_info");
 #endif
+#ifdef EXPERIMENTAL_ESMTP_LIMITS
+  g = string_cat(g, US" Experimental_ESMTP_Limits");
+#endif
 #ifdef EXPERIMENTAL_QUEUEFILE
   g = string_cat(g, US" Experimental_QUEUEFILE");
 #endif
@@ -1669,6 +1672,8 @@ extern char **environ;
 (void)gettimeofday(&timestamp_startup, NULL);
 #endif
 
+store_init();	/* Initialise the memory allocation susbsystem */
+
 /* If the Exim user and/or group and/or the configuration file owner/group were
 defined by ref:name at build time, we must now find the actual uid/gid values.
 This is a feature to make the lives of binary distributors easier. */
@@ -2255,7 +2260,7 @@ on the second character (the one after '-'), to save some effort. */
 	case 'P':
 
 	  /* -bP config: we need to setup here, because later,
-	   * when list_options is checked, the config is read already */
+	  when list_options is checked, the config is read already */
 	  if (*argrest)
 	    badarg = TRUE;
 	  else if (argv[i+1] && Ustrcmp(argv[i+1], "config") == 0)
@@ -2786,11 +2791,42 @@ on the second character (the one after '-'), to save some effort. */
 
 	case 'K': smtp_peer_options |= OPTION_CHUNKING; break;
 
+#ifdef EXPERIMENTAL_ESMTP_LIMITS
+    /* -MCL: peer used LIMITS RCPTMAX and/or RCPTDOMAINMAX */
+	case 'L': if (++i < argc) continue_limit_mail = Uatoi(argv[i]);
+		  else badarg = TRUE;
+		  if (++i < argc) continue_limit_rcpt = Uatoi(argv[i]);
+		  else badarg = TRUE;
+		  if (++i < argc) continue_limit_rcptdom = Uatoi(argv[i]);
+		  else badarg = TRUE;
+		  break;
+#endif
+
     /* -MCP: set the smtp_use_pipelining flag; this is useful only when
     it preceded -MC (see above) */
 
 	case 'P': smtp_peer_options |= OPTION_PIPE; break;
 
+#ifdef SUPPORT_SOCKS
+    /* -MCp: Socks proxy in use; nearside IP, port, external IP, port */
+	case 'p': proxy_session = TRUE;
+		  if (++i < argc)
+		    {
+		    proxy_local_address = string_copy_taint(argv[i], TRUE);
+		    if (++i < argc)
+		      {
+		      proxy_local_port = Uatoi(argv[i]);
+		      if (++i < argc)
+			{
+			proxy_external_address = string_copy_taint(argv[i], TRUE);
+			if (++i < argc)
+			  {
+			  proxy_external_port = Uatoi(argv[i]);
+			  break;
+		    } } } }
+		  badarg = TRUE;
+		  break;
+#endif
     /* -MCQ: pass on the pid of the queue-running process that started
     this chain of deliveries and the fd of its synchronizing pipe; this
     is useful only when it precedes -MC (see above) */