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
On callout avoid SIZE every time but noncacheable rcpt main-verify. Bug 2151
[exim.git]
/
src
/
src
/
exim.c
diff --git
a/src/src/exim.c
b/src/src/exim.c
index 42cb710ebb3439dfe79073c0289d9e4689704687..37cf8bc6e3faac30f1c7141d37c86f626334cfe0 100644
(file)
--- a/
src/src/exim.c
+++ b/
src/src/exim.c
@@
-1443,10
+1443,9
@@
for (m = macros; m; m = m->next) if (m->command_line)
}
if (!found)
return FALSE;
}
if (!found)
return FALSE;
- if (
m->replacement == NULL
)
+ if (
!m->replacement
)
continue;
continue;
- len = Ustrlen(m->replacement);
- if (len == 0)
+ if ((len = m->replen) == 0)
continue;
n = pcre_exec(regex_whitelisted_macro, NULL, CS m->replacement, len,
0, PCRE_EOPT, NULL, 0);
continue;
n = pcre_exec(regex_whitelisted_macro, NULL, CS m->replacement, len,
0, PCRE_EOPT, NULL, 0);
@@
-2739,7
+2738,7
@@
for (i = 1; i < argc; i++)
/* -MCD: set the smtp_use_dsn flag; this indicates that the host
that exim is connected to supports the esmtp extension DSN */
/* -MCD: set the smtp_use_dsn flag; this indicates that the host
that exim is connected to supports the esmtp extension DSN */
- case 'D': smtp_peer_options |=
PEER_OFFERED
_DSN; break;
+ case 'D': smtp_peer_options |=
OPTION
_DSN; break;
/* -MCG: set the queue name, to a non-default value */
/* -MCG: set the queue name, to a non-default value */
@@
-2749,12
+2748,12
@@
for (i = 1; i < argc; i++)
/* -MCK: the peer offered CHUNKING. Must precede -MC */
/* -MCK: the peer offered CHUNKING. Must precede -MC */
- case 'K': smtp_peer_options |=
PEER_OFFERED
_CHUNKING; break;
+ case 'K': smtp_peer_options |=
OPTION
_CHUNKING; break;
/* -MCP: set the smtp_use_pipelining flag; this is useful only when
it preceded -MC (see above) */
/* -MCP: set the smtp_use_pipelining flag; this is useful only when
it preceded -MC (see above) */
- case 'P': smtp_peer_options |=
PEER_OFFERED
_PIPE; break;
+ case 'P': smtp_peer_options |=
OPTION
_PIPE; break;
/* -MCQ: pass on the pid of the queue-running process that started
this chain of deliveries and the fd of its synchronizing pipe; this
/* -MCQ: pass on the pid of the queue-running process that started
this chain of deliveries and the fd of its synchronizing pipe; this
@@
-2769,7
+2768,7
@@
for (i = 1; i < argc; i++)
/* -MCS: set the smtp_use_size flag; this is useful only when it
precedes -MC (see above) */
/* -MCS: set the smtp_use_size flag; this is useful only when it
precedes -MC (see above) */
- case 'S': smtp_peer_options |=
PEER_OFFERED
_SIZE; break;
+ case 'S': smtp_peer_options |=
OPTION
_SIZE; break;
#ifdef SUPPORT_TLS
/* -MCt: similar to -MCT below but the connection is still open
#ifdef SUPPORT_TLS
/* -MCt: similar to -MCT below but the connection is still open
@@
-2789,7
+2788,7
@@
for (i = 1; i < argc; i++)
precedes -MC (see above). The flag indicates that the host to which
Exim is connected has offered TLS support. */
precedes -MC (see above). The flag indicates that the host to which
Exim is connected has offered TLS support. */
- case 'T': smtp_peer_options |=
PEER_OFFERED
_TLS; break;
+ case 'T': smtp_peer_options |=
OPTION
_TLS; break;
#endif
default: badarg = TRUE; break;
#endif
default: badarg = TRUE; break;