projects
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Support "hide" on named-list definition lines
[exim.git]
/
src
/
src
/
child.c
diff --git
a/src/src/child.c
b/src/src/child.c
index 2262678eb47c5716e577ea0ecde7f86c2aca8e51..d3cd88201d46c5422588e11e894a10d4996af718 100644
(file)
--- a/
src/src/child.c
+++ b/
src/src/child.c
@@
-10,10
+10,6
@@
static void (*oldsignal)(int);
static void (*oldsignal)(int);
-#if defined(SUPPORT_TLS) && defined(EXPERIMENTAL_REQUIRETLS)
-static uschar tls_requiretls_copy = 0;
-#endif
-
/*************************************************
* Ensure an fd has a given value *
/*************************************************
* Ensure an fd has a given value *
@@
-79,11
+75,7
@@
int n = 0;
int extra = pcount ? *pcount : 0;
uschar **argv;
int extra = pcount ? *pcount : 0;
uschar **argv;
-#if defined(SUPPORT_TLS) && defined(EXPERIMENTAL_REQUIRETLS)
-if (tls_requiretls) extra++;
-#endif
-
-argv = store_get((extra + acount + MAX_CLMACROS + 18) * sizeof(char *));
+argv = store_get((extra + acount + MAX_CLMACROS + 18) * sizeof(char *), FALSE);
/* In all case, the list starts out with the path, any macros, and a changed
config file. */
/* In all case, the list starts out with the path, any macros, and a changed
config file. */
@@
-129,11
+121,6
@@
if (!minimal)
}
}
}
}
-#if defined(SUPPORT_TLS) && defined(EXPERIMENTAL_REQUIRETLS)
-if (tls_requiretls_copy & REQUIRETLS_MSG)
- argv[n++] = US"-MS";
-#endif
-
/* Now add in any others that are in the call. Remember which they were,
for more helpful diagnosis on failure. */
/* Now add in any others that are in the call. Remember which they were,
for more helpful diagnosis on failure. */
@@
-243,9
+230,6
@@
occur. */
if (pid == 0)
{
if (pid == 0)
{
-#if defined(SUPPORT_TLS) && defined(EXPERIMENTAL_REQUIRETLS)
- tls_requiretls_copy = tls_requiretls;
-#endif
force_fd(pfd[pipe_read], 0);
(void)close(pfd[pipe_write]);
if (debug_fd > 0) force_fd(debug_fd, 2);
force_fd(pfd[pipe_read], 0);
(void)close(pfd[pipe_write]);
if (debug_fd > 0) force_fd(debug_fd, 2);