From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Wed, 25 Mar 2015 20:59:17 +0000 (+0000)
Subject: ingress control
X-Git-Tag: exim-4_86_RC1~88^2~20
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=3d1451ea26e96e63a22d96a08dcfe2e80701c75c;p=exim.git

ingress control
---

diff --git a/src/src/globals.c b/src/src/globals.c
index ffaa53cd1..cb93a0192 100644
--- a/src/src/globals.c
+++ b/src/src/globals.c
@@ -1273,6 +1273,9 @@ int     smtp_rlr_limit         = 0;
 int     smtp_rlr_threshold     = INT_MAX;
 BOOL    smtp_use_pipelining    = FALSE;
 BOOL    smtp_use_size          = FALSE;
+#ifdef EXPERIMENTAL_INTERNATIONAL
+uschar *smtputf8_advertise_hosts = US"*";
+#endif
 
 #ifdef WITH_CONTENT_SCAN
 uschar *spamd_address          = US"127.0.0.1 783";
diff --git a/src/src/globals.h b/src/src/globals.h
index 38b2a9dd6..d5b34201b 100644
--- a/src/src/globals.h
+++ b/src/src/globals.h
@@ -825,6 +825,9 @@ extern int     smtp_rlr_limit;         /* Max delay */
 extern int     smtp_rlr_threshold;     /* Threshold for RCPT rate limit */
 extern BOOL    smtp_use_pipelining;    /* Global for passed connections */
 extern BOOL    smtp_use_size;          /* Global for passed connections */
+#ifdef EXPERIMENTAL_INTERNATIONAL
+extern uschar *smtputf8_advertise_hosts; /* ingress control */
+#endif
 
 #ifdef WITH_CONTENT_SCAN
 extern uschar *spamd_address;          /* address for the spamassassin daemon */
diff --git a/src/src/readconf.c b/src/src/readconf.c
index e2d3c518f..67241cb36 100644
--- a/src/src/readconf.c
+++ b/src/src/readconf.c
@@ -398,6 +398,9 @@ static optionlist optionlist_config[] = {
   { "smtp_receive_timeout",     opt_func,        &fn_smtp_receive_timeout },
   { "smtp_reserve_hosts",       opt_stringptr,   &smtp_reserve_hosts },
   { "smtp_return_error_details",opt_bool,        &smtp_return_error_details },
+#ifdef EXPERIMENTAL_INTERNATIONAL
+  { "smtputf8_advertise_hosts", opt_stringptr,   &smtputf8_advertise_hosts },
+#endif
 #ifdef WITH_CONTENT_SCAN
   { "spamd_address",            opt_stringptr,   &spamd_address },
 #endif