X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/3c90bbcdc7cf73298156f7bcd5f5e750e7814e72..cf39dad3d551222a3e1f681995c287eb53e2596f:/src/src/exim.c

diff --git a/src/src/exim.c b/src/src/exim.c
index c0ef9150a..1244aee0b 100644
--- a/src/src/exim.c
+++ b/src/src/exim.c
@@ -1669,6 +1669,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. */
@@ -2373,6 +2375,7 @@ on the second character (the one after '-'), to save some effort. */
       int len = Ustrlen(ALT_CONFIG_PREFIX);
       const uschar *list = argrest;
       uschar *filename;
+      /* The argv is untainted, so big_buffer (also untainted) is ok to use */
       while((filename = string_nextinlist(&list, &sep, big_buffer,
              big_buffer_size)))
         if (  (  Ustrlen(filename) < len
@@ -2790,6 +2793,26 @@ on the second character (the one after '-'), to save some effort. */
 
 	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) */
@@ -2813,10 +2836,22 @@ on the second character (the one after '-'), to save some effort. */
 	case 'S': smtp_peer_options |= OPTION_SIZE; break;
 
 #ifndef DISABLE_TLS
+    /* -MCs: used with -MCt; SNI was sent */
+    /* -MCr: ditto, DANE */
+
+	case 'r':
+	case 's': if (++i < argc)
+		    {
+		    continue_proxy_sni = string_copy_taint(argv[i], TRUE);
+		    if (argrest[1] == 'r') continue_proxy_dane = TRUE;
+		    }
+		  else badarg = TRUE;
+		  break;
+
     /* -MCt: similar to -MCT below but the connection is still open
     via a proxy process which handles the TLS context and coding.
     Require three arguments for the proxied local address and port,
-    and the TLS cipher.  */
+    and the TLS cipher. */
 
 	case 't': if (++i < argc)
 		    sending_ip_address = string_copy_taint(argv[i], TRUE);
@@ -3208,6 +3243,13 @@ on the second character (the one after '-'), to save some effort. */
 	else override_local_interfaces = string_copy_taint(argv[++i], TRUE);
 	break;
 
+      /* -oY: Override creation of daemon notifier socket */
+
+      case 'Y':
+	if (*argrest) badarg = TRUE;
+	else notifier_socket = NULL;
+	break;
+
       /* Unknown -o argument */
 
       default:
@@ -4775,7 +4817,7 @@ if (!originator_login || f.running_in_test_harness)
 /* Ensure that the user name is in a suitable form for use as a "phrase" in an
 RFC822 address.*/
 
-originator_name = parse_fix_phrase(originator_name, Ustrlen(originator_name));
+originator_name = US parse_fix_phrase(originator_name, Ustrlen(originator_name));
 
 /* If a message is created by this call of Exim, the uid/gid of its originator
 are those of the caller. These values are overridden if an existing message is