git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PIPE_CONNECT: promote from experimental
[exim.git]
/
src
/
src
/
deliver.c
diff --git
a/src/src/deliver.c
b/src/src/deliver.c
index f79522d8e8a948c82f81529b5111b6f949694b63..b26e5dbd407a778ac0e57595e04bb70b12e0aef3 100644
(file)
--- a/
src/src/deliver.c
+++ b/
src/src/deliver.c
@@
-801,7
+801,7
@@
return g;
-#if
def SUPPORT
_TLS
+#if
ndef DISABLE
_TLS
static gstring *
d_tlslog(gstring * g, address_item * addr)
{
static gstring *
d_tlslog(gstring * g, address_item * addr)
{
@@
-1231,7
+1231,7
@@
else
#endif
}
#endif
}
-#if
def SUPPORT
_TLS
+#if
ndef DISABLE
_TLS
g = d_tlslog(g, addr);
#endif
g = d_tlslog(g, addr);
#endif
@@
-1250,7
+1250,7
@@
else
{
if (testflag(addr, af_pipelining))
g = string_catn(g, US" L", 2);
{
if (testflag(addr, af_pipelining))
g = string_catn(g, US" L", 2);
-#ifdef
EXPERIMENTAL
_PIPE_CONNECT
+#ifdef
SUPPORT
_PIPE_CONNECT
if (testflag(addr, af_early_pipe))
g = string_catn(g, US"*", 1);
#endif
if (testflag(addr, af_early_pipe))
g = string_catn(g, US"*", 1);
#endif
@@
-1435,7
+1435,7
@@
if (addr->transport)
if (addr->host_used)
g = d_hostlog(g, addr);
if (addr->host_used)
g = d_hostlog(g, addr);
-#if
def SUPPORT
_TLS
+#if
ndef DISABLE
_TLS
g = d_tlslog(g, addr);
#endif
g = d_tlslog(g, addr);
#endif
@@
-1635,7
+1635,7
@@
if (result == OK)
}
/* Certificates for logging (via events) */
}
/* Certificates for logging (via events) */
-#if
def SUPPORT
_TLS
+#if
ndef DISABLE
_TLS
tls_out.ourcert = addr->ourcert;
addr->ourcert = NULL;
tls_out.peercert = addr->peercert;
tls_out.ourcert = addr->ourcert;
addr->ourcert = NULL;
tls_out.peercert = addr->peercert;
@@
-1651,7
+1651,7
@@
if (result == OK)
delivery_log(LOG_MAIN, addr, logchar, NULL);
delivery_log(LOG_MAIN, addr, logchar, NULL);
-#if
def SUPPORT
_TLS
+#if
ndef DISABLE
_TLS
tls_free_cert(&tls_out.ourcert);
tls_free_cert(&tls_out.peercert);
tls_out.cipher = NULL;
tls_free_cert(&tls_out.ourcert);
tls_free_cert(&tls_out.peercert);
tls_out.cipher = NULL;
@@
-3505,7
+3505,7
@@
while (!done)
it in with the other info, in order to keep each message short enough to
guarantee it won't be split in the pipe. */
it in with the other info, in order to keep each message short enough to
guarantee it won't be split in the pipe. */
-#if
def SUPPORT
_TLS
+#if
ndef DISABLE
_TLS
case 'X':
if (!addr) goto ADDR_MISMATCH; /* Below, in 'A' handler */
switch (*subid)
case 'X':
if (!addr) goto ADDR_MISMATCH; /* Below, in 'A' handler */
switch (*subid)
@@
-3543,7
+3543,7
@@
while (!done)
}
while (*ptr++);
break;
}
while (*ptr++);
break;
-#endif /*
SUPPORT
_TLS*/
+#endif /*
DISABLE
_TLS*/
case 'C': /* client authenticator information */
switch (*subid)
case 'C': /* client authenticator information */
switch (*subid)
@@
-3564,7
+3564,7
@@
while (!done)
case 'L':
switch (*subid)
{
case 'L':
switch (*subid)
{
-#ifdef
EXPERIMENTAL
_PIPE_CONNECT
+#ifdef
SUPPORT
_PIPE_CONNECT
case 2: setflag(addr, af_early_pipe); /*FALLTHROUGH*/
#endif
case 1: setflag(addr, af_pipelining); break;
case 2: setflag(addr, af_early_pipe); /*FALLTHROUGH*/
#endif
case 1: setflag(addr, af_pipelining); break;
@@
-4805,7
+4805,7
@@
all pipes, so I do not see a reason to use non-blocking IO here
# endif
/* Use an X item only if there's something to send */
# endif
/* Use an X item only if there's something to send */
-#if
def SUPPORT
_TLS
+#if
ndef DISABLE
_TLS
if (addr->cipher)
{
ptr = big_buffer + sprintf(CS big_buffer, "%.128s", addr->cipher) + 1;
if (addr->cipher)
{
ptr = big_buffer + sprintf(CS big_buffer, "%.128s", addr->cipher) + 1;
@@
-4848,7
+4848,7
@@
all pipes, so I do not see a reason to use non-blocking IO here
rmt_dlv_checked_write(fd, 'X', '4', big_buffer, ptr - big_buffer);
}
# endif
rmt_dlv_checked_write(fd, 'X', '4', big_buffer, ptr - big_buffer);
}
# endif
-#endif /*
SUPPORT
_TLS*/
+#endif /*
DISABLE
_TLS*/
if (client_authenticator)
{
if (client_authenticator)
{
@@
-4872,7
+4872,7
@@
all pipes, so I do not see a reason to use non-blocking IO here
#endif
if (testflag(addr, af_pipelining))
#endif
if (testflag(addr, af_pipelining))
-#ifdef
EXPERIMENTAL
_PIPE_CONNECT
+#ifdef
SUPPORT
_PIPE_CONNECT
if (testflag(addr, af_early_pipe))
rmt_dlv_checked_write(fd, 'L', '2', NULL, 0);
else
if (testflag(addr, af_early_pipe))
rmt_dlv_checked_write(fd, 'L', '2', NULL, 0);
else
@@
-5012,7
+5012,7
@@
all pipes, so I do not see a reason to use non-blocking IO here
if (cutthrough.cctx.sock >= 0 && cutthrough.callout_hold_only)
{
if (cutthrough.cctx.sock >= 0 && cutthrough.callout_hold_only)
{
-#if
def SUPPORT
_TLS
+#if
ndef DISABLE
_TLS
if (cutthrough.is_tls)
tls_close(cutthrough.cctx.tls_ctx, TLS_NO_SHUTDOWN);
#endif
if (cutthrough.is_tls)
tls_close(cutthrough.cctx.tls_ctx, TLS_NO_SHUTDOWN);
#endif
@@
-8513,7
+8513,7
@@
if (!regex_SIZE) regex_SIZE =
if (!regex_AUTH) regex_AUTH =
regex_must_compile(AUTHS_REGEX, FALSE, TRUE);
if (!regex_AUTH) regex_AUTH =
regex_must_compile(AUTHS_REGEX, FALSE, TRUE);
-#if
def SUPPORT
_TLS
+#if
ndef DISABLE
_TLS
if (!regex_STARTTLS) regex_STARTTLS =
regex_must_compile(US"\\n250[\\s\\-]STARTTLS(\\s|\\n|$)", FALSE, TRUE);
#endif
if (!regex_STARTTLS) regex_STARTTLS =
regex_must_compile(US"\\n250[\\s\\-]STARTTLS(\\s|\\n|$)", FALSE, TRUE);
#endif
@@
-8537,7
+8537,7
@@
if (!regex_DSN) regex_DSN =
if (!regex_IGNOREQUOTA) regex_IGNOREQUOTA =
regex_must_compile(US"\\n250[\\s\\-]IGNOREQUOTA(\\s|\\n|$)", FALSE, TRUE);
if (!regex_IGNOREQUOTA) regex_IGNOREQUOTA =
regex_must_compile(US"\\n250[\\s\\-]IGNOREQUOTA(\\s|\\n|$)", FALSE, TRUE);
-#ifdef
EXPERIMENTAL
_PIPE_CONNECT
+#ifdef
SUPPORT
_PIPE_CONNECT
if (!regex_EARLY_PIPE) regex_EARLY_PIPE =
regex_must_compile(US"\\n250[\\s\\-]" EARLY_PIPE_FEATURE_NAME "(\\s|\\n|$)", FALSE, TRUE);
#endif
if (!regex_EARLY_PIPE) regex_EARLY_PIPE =
regex_must_compile(US"\\n250[\\s\\-]" EARLY_PIPE_FEATURE_NAME "(\\s|\\n|$)", FALSE, TRUE);
#endif
@@
-8603,7
+8603,7
@@
if (cutthrough.cctx.sock >= 0 && cutthrough.callout_hold_only)
smtp_peer_options = cutthrough.peer_options;
continue_sequence = 0;
smtp_peer_options = cutthrough.peer_options;
continue_sequence = 0;
-#if
def SUPPORT
_TLS
+#if
ndef DISABLE
_TLS
if (cutthrough.is_tls)
{
int pfd[2], pid;
if (cutthrough.is_tls)
{
int pfd[2], pid;
@@
-8646,7
+8646,7
@@
else
}
return; /* compiler quietening; control does not reach here. */
}
return; /* compiler quietening; control does not reach here. */
-#if
def SUPPORT
_TLS
+#if
ndef DISABLE
_TLS
fail:
log_write(0,
LOG_MAIN | (exec_type == CEE_EXEC_EXIT ? LOG_PANIC : LOG_PANIC_DIE),
fail:
log_write(0,
LOG_MAIN | (exec_type == CEE_EXEC_EXIT ? LOG_PANIC : LOG_PANIC_DIE),