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
Move ESMPT LIMITS extension from experimental to mainline
[exim.git]
/
src
/
src
/
exim.c
diff --git
a/src/src/exim.c
b/src/src/exim.c
index e5b72f11ae8442603507279b8681b86e8e5d03d2..1f76f8f1435347ae9571af16551c9c30e1fa6391 100644
(file)
--- a/
src/src/exim.c
+++ b/
src/src/exim.c
@@
-1105,6
+1105,9
@@
g = string_cat(g, US"Support for:");
#ifndef DISABLE_DNSSEC
g = string_cat(g, US" DNSSEC");
#endif
#ifndef DISABLE_DNSSEC
g = string_cat(g, US" DNSSEC");
#endif
+#ifndef DISABLE_ESMTP_LIMITS
+ g = string_cat(g, US" ESMTP_Limits");
+#endif
#ifndef DISABLE_EVENT
g = string_cat(g, US" Event");
#endif
#ifndef DISABLE_EVENT
g = string_cat(g, US" Event");
#endif
@@
-1151,9
+1154,6
@@
g = string_cat(g, US"Support for:");
#ifdef EXPERIMENTAL_DSN_INFO
g = string_cat(g, US" Experimental_DSN_info");
#endif
#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
#ifdef EXPERIMENTAL_QUEUEFILE
g = string_cat(g, US" Experimental_QUEUEFILE");
#endif
@@
-3019,7
+3019,7
@@
on the second character (the one after '-'), to save some effort. */
case 'K': smtp_peer_options |= OPTION_CHUNKING; break;
case 'K': smtp_peer_options |= OPTION_CHUNKING; break;
-#if
def EXPERIMENTAL
_ESMTP_LIMITS
+#if
ndef DISABLE
_ESMTP_LIMITS
/* -MCL: peer used LIMITS RCPTMAX and/or RCPTDOMAINMAX */
case 'L': if (++i < argc) continue_limit_mail = Uatoi(argv[i]);
else badarg = TRUE;
/* -MCL: peer used LIMITS RCPTMAX and/or RCPTDOMAINMAX */
case 'L': if (++i < argc) continue_limit_mail = Uatoi(argv[i]);
else badarg = TRUE;