Fix dns authority-name lookup

[user/henk/code/exim.git] / src / src / readconf.c

diff --git a/src/src/readconf.c b/src/src/readconf.c
index a452a46d533dc24a5a1bc3f2f9222e480343cffd..f53a5d27a80c64dae2cf82b8ef12ba394fc701bb 100644 (file)
--- a/src/src/readconf.c
+++ b/src/src/readconf.c
@@ -604,7 +604,7 @@ Arguments:
 Returns:       nothing
 */
 
-void
+static void
 read_macro_assignment(uschar *s)
 {
 uschar name[64];
@@ -762,6 +762,9 @@ due to conflicts with other common macros. */
 #ifdef SUPPORT_SOCKS
   macro_create(US"_HAVE_SOCKS", US"y", FALSE, TRUE);
 #endif
+#ifdef TCP_FASTOPEN
+  macro_create(US"_HAVE_TCP_FASTOPEN", US"y", FALSE, TRUE);
+#endif
 #ifdef EXPERIMENTAL_LMDB
   macro_create(US"_HAVE_LMDB", US"y", FALSE, TRUE);
 #endif
@@ -2334,6 +2337,11 @@ switch (type)
   if (value < 0) log_write(0, LOG_PANIC_DIE|LOG_CONFIG_IN,
     "integer \"%s\" is too large (overflow)", s);
 
+  /* We get a coverity error here for using count, as it derived
+  from the tainted buffer pointed to by s, as parsed by sscanf().
+  By the definition of sscanf we must be aceessing between start
+  and end of s (assuming it is nul-terminated...) so ignore the error.  */
+  /* coverity[tainted_data] */
   if (s[count] == '.')
     {
     int d = 100;