git://git.exim.org / exim.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
ACL: bsearch for controls
[exim.git] / src / src / readconf.c
diff --git a/src/src/readconf.c b/src/src/readconf.c
index 646932412663baf99381ac374051bcb6a0acb12f..0a06559f48df83dfd3a16ccfe6faeb522a7d9e7c 100644 (file)
--- a/src/src/readconf.c
+++ b/src/src/readconf.c
@@ -488,8 +488,7 @@ static optionlist optionlist_config[] = {
   { "write_rejectlog",          opt_bool,        &write_rejectlog }
 };
 
-static int optionlist_config_size =
-  sizeof(optionlist_config)/sizeof(optionlist);
+static int optionlist_config_size = nelem(optionlist_config);
 
 
 
@@ -517,7 +516,7 @@ transport_instance *t;
 for (i = 0; i < optionlist_config_size; i++)
   if (p == optionlist_config[i].value) return US optionlist_config[i].name;
 
-for (r = routers; r != NULL; r = r->next)
+for (r = routers; r; r = r->next)
   {
   router_info *ri = r->info;
   for (i = 0; i < *ri->options_count; i++)
@@ -528,7 +527,7 @@ for (r = routers; r != NULL; r = r->next)
     }
   }
 
-for (t = transports; t != NULL; t = t->next)
+for (t = transports; t; t = t->next)
   {
   transport_info *ti = t->info;
   for (i = 0; i < *ti->options_count; i++)
@@ -1163,9 +1162,10 @@ while (last > first)
   {
   int middle = (first + last)/2;
   int c = Ustrcmp(name, ol[middle].name);
+
   if (c == 0) return ol + middle;
-    else if (c > 0) first = middle + 1;
-      else last = middle;
+  else if (c > 0) first = middle + 1;
+  else last = middle;
   }
 return NULL;
 }
@@ -1509,9 +1509,7 @@ if (Ustrncmp(name, "not_", 4) == 0)
 /* Search the list for the given name. A non-existent name, or an option that
 is set twice, is a disaster. */
 
-ol = find_option(name + offset, oltop, last);
-
-if (ol == NULL)
+if (!(ol = find_option(name + offset, oltop, last)))
   {
   if (unknown_txt == NULL) return FALSE;
   log_write(0, LOG_PANIC_DIE|LOG_CONFIG_IN, CS unknown_txt, name);
@@ -1985,7 +1983,7 @@ switch (type)
   inttype = US"octal ";
 
   /*  Integer: a simple(ish) case; allow octal and hex formats, and
-  suffixes K and M. The different types affect output, not input. */
+  suffixes K, M and G. The different types affect output, not input. */
 
   case opt_mkint:
   case opt_int:
@@ -2001,7 +1999,6 @@ switch (type)
         inttype, name);
 
     if (errno != ERANGE)
-      {
       if (tolower(*endptr) == 'k')
         {
         if (lvalue > INT_MAX/1024 || lvalue < INT_MIN/1024) errno = ERANGE;
@@ -2015,7 +2012,13 @@ switch (type)
         else lvalue *= 1024*1024;
         endptr++;
         }
-      }
+      else if (tolower(*endptr) == 'g')
+        {
+        if (lvalue > INT_MAX/(1024*1024*1024) || lvalue < INT_MIN/(1024*1024*1024))
+          errno = ERANGE;
+        else lvalue *= 1024*1024*1024;
+        endptr++;
+        }
 
     if (errno == ERANGE || lvalue > INT_MAX || lvalue < INT_MIN)
       log_write(0, LOG_PANIC_DIE|LOG_CONFIG_IN,
@@ -2034,8 +2037,8 @@ switch (type)
     *((int *)((uschar *)data_block + (long int)(ol->value))) = value;
   break;
 
-  /*  Integer held in K: again, allow octal and hex formats, and suffixes K and
-  M. */
+  /*  Integer held in K: again, allow octal and hex formats, and suffixes K, M
+  and G. */
   /*XXX consider moving to int_eximarith_t (but mind the overflow test 0415) */
 
   case opt_Kint:
@@ -2049,22 +2052,26 @@ switch (type)
         inttype, name);
 
     if (errno != ERANGE)
-      {
-      if (tolower(*endptr) == 'm')
+      if (tolower(*endptr) == 'g')
         {
-        if (value > INT_MAX/1024 || value < INT_MIN/1024) errno = ERANGE;
-          else value *= 1024;
+        if (value > INT_MAX/(1024*1024) || value < INT_MIN/(1024*1024))
+         errno = ERANGE;
+       else
+         value *= 1024*1024;
         endptr++;
         }
-      else if (tolower(*endptr) == 'k')
+      else if (tolower(*endptr) == 'm')
         {
+        if (value > INT_MAX/1024 || value < INT_MIN/1024)
+         errno = ERANGE;
+       else
+         value *= 1024;
         endptr++;
         }
+      else if (tolower(*endptr) == 'k')
+        endptr++;
       else
-        {
         value = (value + 512)/1024;
-        }
-      }
 
     if (errno == ERANGE) log_write(0, LOG_PANIC_DIE|LOG_CONFIG_IN,
       "absolute value of integer \"%s\" is too large (overflow)", s);
@@ -2609,8 +2616,8 @@ if (type == NULL)
     return;
     }
 
-  if ( Ustrcmp(name, "configure_file") == 0
-     ||Ustrcmp(name, "config_file") == 0)
+  if (  Ustrcmp(name, "configure_file") == 0
+     || Ustrcmp(name, "config_file") == 0)
     {
     printf("%s\n", CS config_main_filename);
     return;
@@ -3013,220 +3020,220 @@ macros are stored, but this will do for now. Some names are awkward
 due to conflicts with other common macros. */
 
 #ifdef SUPPORT_CRYPTEQ
-  read_macro_assignment("_HAVE_CRYPTEQ=y");
+  read_macro_assignment(US"_HAVE_CRYPTEQ=y");
 #endif
 #if HAVE_ICONV
-  read_macro_assignment("_HAVE_ICONV=y");
+  read_macro_assignment(US"_HAVE_ICONV=y");
 #endif
 #if HAVE_IPV6
-  read_macro_assignment("_HAVE_IPV6=y");
+  read_macro_assignment(US"_HAVE_IPV6=y");
 #endif
 #ifdef HAVE_SETCLASSRESOURCES
-  read_macro_assignment("_HAVE_SETCLASSRESOURCES=y");
+  read_macro_assignment(US"_HAVE_SETCLASSRESOURCES=y");
 #endif
 #ifdef SUPPORT_PAM
-  read_macro_assignment("_HAVE_PAM=y");
+  read_macro_assignment(US"_HAVE_PAM=y");
 #endif
 #ifdef EXIM_PERL
-  read_macro_assignment("_HAVE_PERL=y");
+  read_macro_assignment(US"_HAVE_PERL=y");
 #endif
 #ifdef EXPAND_DLFUNC
-  read_macro_assignment("_HAVE_DLFUNC=y");
+  read_macro_assignment(US"_HAVE_DLFUNC=y");
 #endif
 #ifdef USE_TCP_WRAPPERS
-  read_macro_assignment("_HAVE_TCPWRAPPERS=y");
+  read_macro_assignment(US"_HAVE_TCPWRAPPERS=y");
 #endif
 #ifdef SUPPORT_TLS
-  read_macro_assignment("_HAVE_TLS=y");
+  read_macro_assignment(US"_HAVE_TLS=y");
 # ifdef USE_GNUTLS
-  read_macro_assignment("_HAVE_GNUTLS=y");
+  read_macro_assignment(US"_HAVE_GNUTLS=y");
 # else
-  read_macro_assignment("_HAVE_OPENSSL=y");
+  read_macro_assignment(US"_HAVE_OPENSSL=y");
 # endif
 #endif
 #ifdef SUPPORT_TRANSLATE_IP_ADDRESS
-  read_macro_assignment("_HAVE_TRANSLATE_IP_ADDRESS=y");
+  read_macro_assignment(US"_HAVE_TRANSLATE_IP_ADDRESS=y");
 #endif
 #ifdef SUPPORT_MOVE_FROZEN_MESSAGES
-  read_macro_assignment("_HAVE_MOVE_FROZEN_MESSAGES=y");
+  read_macro_assignment(US"_HAVE_MOVE_FROZEN_MESSAGES=y");
 #endif
 #ifdef WITH_CONTENT_SCAN
-  read_macro_assignment("_HAVE_CONTENT_SCANNING=y");
+  read_macro_assignment(US"_HAVE_CONTENT_SCANNING=y");
 #endif
 #ifndef DISABLE_DKIM
-  read_macro_assignment("_HAVE_DKIM=y");
+  read_macro_assignment(US"_HAVE_DKIM=y");
 #endif
 #ifndef DISABLE_DNSSEC
-  read_macro_assignment("_HAVE_DNSSEC=y");
+  read_macro_assignment(US"_HAVE_DNSSEC=y");
 #endif
 #ifndef DISABLE_EVENT
-  read_macro_assignment("_HAVE_Event=y");
+  read_macro_assignment(US"_HAVE_Event=y");
 #endif
 #ifdef SUPPORT_I18N
-  read_macro_assignment("_HAVE_I18N=y");
+  read_macro_assignment(US"_HAVE_I18N=y");
 #endif
 #ifndef DISABLE_OCSP
-  read_macro_assignment("_HAVE_OCSP=y");
+  read_macro_assignment(US"_HAVE_OCSP=y");
 #endif
 #ifndef DISABLE_PRDR
-  read_macro_assignment("_HAVE_PRDR=y");
+  read_macro_assignment(US"_HAVE_PRDR=y");
 #endif
 #ifdef SUPPORT_PROXY
-  read_macro_assignment("_HAVE_PROXY=y");
+  read_macro_assignment(US"_HAVE_PROXY=y");
 #endif
 #ifdef SUPPORT_SOCKS
-  read_macro_assignment("_HAVE_SOCKS=y");
+  read_macro_assignment(US"_HAVE_SOCKS=y");
 #endif
 #ifdef EXPERIMENTAL_LMDB
-  read_macro_assignment("_HAVE_LMDB=y");
+  read_macro_assignment(US"_HAVE_LMDB=y");
 #endif
 #ifdef EXPERIMENTAL_SPF
-  read_macro_assignment("_HAVE_SPF=y");
+  read_macro_assignment(US"_HAVE_SPF=y");
 #endif
 #ifdef EXPERIMENTAL_SRS
-  read_macro_assignment("_HAVE_SRS=y");
+  read_macro_assignment(US"_HAVE_SRS=y");
 #endif
 #ifdef EXPERIMENTAL_BRIGHTMAIL
-  read_macro_assignment("_HAVE_BRIGHTMAIL=y");
+  read_macro_assignment(US"_HAVE_BRIGHTMAIL=y");
 #endif
 #ifdef EXPERIMENTAL_DANE
-  read_macro_assignment("_HAVE_DANE=y");
+  read_macro_assignment(US"_HAVE_DANE=y");
 #endif
 #ifdef EXPERIMENTAL_DCC
-  read_macro_assignment("_HAVE_DCC=y");
+  read_macro_assignment(US"_HAVE_DCC=y");
 #endif
 #ifdef EXPERIMENTAL_DMARC
-  read_macro_assignment("_HAVE_DMARC=y");
+  read_macro_assignment(US"_HAVE_DMARC=y");
 #endif
 #ifdef EXPERIMENTAL_DSN_INFO
-  read_macro_assignment("_HAVE_DSN_INFO=y");
+  read_macro_assignment(US"_HAVE_DSN_INFO=y");
 #endif
 
 #ifdef LOOKUP_LSEARCH
-  read_macro_assignment("_HAVE_LKUP_LSEARCH=y");
+  read_macro_assignment(US"_HAVE_LKUP_LSEARCH=y");
 #endif
 #ifdef LOOKUP_CDB
-  read_macro_assignment("_HAVE_LKUP_CDB=y");
+  read_macro_assignment(US"_HAVE_LKUP_CDB=y");
 #endif
 #ifdef LOOKUP_DBM
-  read_macro_assignment("_HAVE_LKUP_DBM=y");
+  read_macro_assignment(US"_HAVE_LKUP_DBM=y");
 #endif
 #ifdef LOOKUP_DNSDB
-  read_macro_assignment("_HAVE_LKUP_DNSDB=y");
+  read_macro_assignment(US"_HAVE_LKUP_DNSDB=y");
 #endif
 #ifdef LOOKUP_DSEARCH
-  read_macro_assignment("_HAVE_LKUP_DSEARCH=y");
+  read_macro_assignment(US"_HAVE_LKUP_DSEARCH=y");
 #endif
 #ifdef LOOKUP_IBASE
-  read_macro_assignment("_HAVE_LKUP_IBASE=y");
+  read_macro_assignment(US"_HAVE_LKUP_IBASE=y");
 #endif
 #ifdef LOOKUP_LDAP
-  read_macro_assignment("_HAVE_LKUP_LDAP=y");
+  read_macro_assignment(US"_HAVE_LKUP_LDAP=y");
 #endif
 #ifdef EXPERIMENTAL_LMDB
-  read_macro_assignment("_HAVE_LKUP_LMDB=y");
+  read_macro_assignment(US"_HAVE_LKUP_LMDB=y");
 #endif
 #ifdef LOOKUP_MYSQL
-  read_macro_assignment("_HAVE_LKUP_MYSQL=y");
+  read_macro_assignment(US"_HAVE_LKUP_MYSQL=y");
 #endif
 #ifdef LOOKUP_NIS
-  read_macro_assignment("_HAVE_LKUP_NIS=y");
+  read_macro_assignment(US"_HAVE_LKUP_NIS=y");
 #endif
 #ifdef LOOKUP_NISPLUS
-  read_macro_assignment("_HAVE_LKUP_NISPLUS=y");
+  read_macro_assignment(US"_HAVE_LKUP_NISPLUS=y");
 #endif
 #ifdef LOOKUP_ORACLE
-  read_macro_assignment("_HAVE_LKUP_ORACLE=y");
+  read_macro_assignment(US"_HAVE_LKUP_ORACLE=y");
 #endif
 #ifdef LOOKUP_PASSWD
-  read_macro_assignment("_HAVE_LKUP_PASSWD=y");
+  read_macro_assignment(US"_HAVE_LKUP_PASSWD=y");
 #endif
 #ifdef LOOKUP_PGSQL
-  read_macro_assignment("_HAVE_LKUP_PGSQL=y");
+  read_macro_assignment(US"_HAVE_LKUP_PGSQL=y");
 #endif
 #ifdef LOOKUP_REDIS
-  read_macro_assignment("_HAVE_LKUP_REDIS=y");
+  read_macro_assignment(US"_HAVE_LKUP_REDIS=y");
 #endif
 #ifdef LOOKUP_SQLITE
-  read_macro_assignment("_HAVE_LKUP_SQLITE=y");
+  read_macro_assignment(US"_HAVE_LKUP_SQLITE=y");
 #endif
 #ifdef LOOKUP_TESTDB
-  read_macro_assignment("_HAVE_LKUP_TESTDB=y");
+  read_macro_assignment(US"_HAVE_LKUP_TESTDB=y");
 #endif
 #ifdef LOOKUP_WHOSON
-  read_macro_assignment("_HAVE_LKUP_WHOSON=y");
+  read_macro_assignment(US"_HAVE_LKUP_WHOSON=y");
 #endif
 
 #ifdef AUTH_CRAM_MD5
-  read_macro_assignment("_HAVE_AUTH_CRAM_MD5=y");
+  read_macro_assignment(US"_HAVE_AUTH_CRAM_MD5=y");
 #endif
 #ifdef AUTH_CYRUS_SASL
-  read_macro_assignment("_HAVE_AUTH_CYRUS_SASL=y");
+  read_macro_assignment(US"_HAVE_AUTH_CYRUS_SASL=y");
 #endif
 #ifdef AUTH_DOVECOT
-  read_macro_assignment("_HAVE_AUTH_DOVECOT=y");
+  read_macro_assignment(US"_HAVE_AUTH_DOVECOT=y");
 #endif
 #ifdef AUTH_GSASL
-  read_macro_assignment("_HAVE_AUTH_GSASL=y");
+  read_macro_assignment(US"_HAVE_AUTH_GSASL=y");
 #endif
 #ifdef AUTH_HEIMDAL_GSSAPI
-  read_macro_assignment("_HAVE_AUTH_HEIMDAL_GSSAPI=y");
+  read_macro_assignment(US"_HAVE_AUTH_HEIMDAL_GSSAPI=y");
 #endif
 #ifdef AUTH_PLAINTEXT
-  read_macro_assignment("_HAVE_AUTH_PLAINTEXT=y");
+  read_macro_assignment(US"_HAVE_AUTH_PLAINTEXT=y");
 #endif
 #ifdef AUTH_SPA
-  read_macro_assignment("_HAVE_AUTH_SPA=y");
+  read_macro_assignment(US"_HAVE_AUTH_SPA=y");
 #endif
 #ifdef AUTH_TLS
-  read_macro_assignment("_HAVE_AUTH_TLS=y");
+  read_macro_assignment(US"_HAVE_AUTH_TLS=y");
 #endif
 
 #ifdef ROUTER_ACCEPT
-  read_macro_assignment("_HAVE_RTR_ACCEPT=y");
+  read_macro_assignment(US"_HAVE_RTR_ACCEPT=y");
 #endif
 #ifdef ROUTER_DNSLOOKUP
-  read_macro_assignment("_HAVE_RTR_DNSLOOKUP=y");
+  read_macro_assignment(US"_HAVE_RTR_DNSLOOKUP=y");
 #endif
 #ifdef ROUTER_IPLITERAL
-  read_macro_assignment("_HAVE_RTR_IPLITERAL=y");
+  read_macro_assignment(US"_HAVE_RTR_IPLITERAL=y");
 #endif
 #ifdef ROUTER_IPLOOKUP
-  read_macro_assignment("_HAVE_RTR_IPLOOKUP=y");
+  read_macro_assignment(US"_HAVE_RTR_IPLOOKUP=y");
 #endif
 #ifdef ROUTER_MANUALROUTE
-  read_macro_assignment("_HAVE_RTR_MANUALROUTE=y");
+  read_macro_assignment(US"_HAVE_RTR_MANUALROUTE=y");
 #endif
 #ifdef ROUTER_QUERYPROGRAM
-  read_macro_assignment("_HAVE_RTR_QUERYPROGRAM=y");
+  read_macro_assignment(US"_HAVE_RTR_QUERYPROGRAM=y");
 #endif
 #ifdef ROUTER_REDIRECT
-  read_macro_assignment("_HAVE_RTR_REDRCT=y");
+  read_macro_assignment(US"_HAVE_RTR_REDRCT=y");
 #endif
 
 #ifdef TRANSPORT_APPENDFILE
-  read_macro_assignment("_HAVE_TPT_APPENDFILE=y");
+  read_macro_assignment(US"_HAVE_TPT_APPENDFILE=y");
 # ifdef SUPPORT_MAILDIR
-  read_macro_assignment("_HAVE_TPT_APPEND_MAILDR=y");
+  read_macro_assignment(US"_HAVE_TPT_APPEND_MAILDR=y");
 # endif
 # ifdef SUPPORT_MAILSTORE
-  read_macro_assignment("_HAVE_TPT_APPEND_MAILSTORE=y");
+  read_macro_assignment(US"_HAVE_TPT_APPEND_MAILSTORE=y");
 # endif
 # ifdef SUPPORT_MBX
-  read_macro_assignment("_HAVE_TPT_APPEND_MBX=y");
+  read_macro_assignment(US"_HAVE_TPT_APPEND_MBX=y");
 # endif
 #endif
 #ifdef TRANSPORT_AUTOREPLY
-  read_macro_assignment("_HAVE_TPT_AUTOREPLY=y");
+  read_macro_assignment(US"_HAVE_TPT_AUTOREPLY=y");
 #endif
 #ifdef TRANSPORT_LMTP
-  read_macro_assignment("_HAVE_TPT_LMTP=y");
+  read_macro_assignment(US"_HAVE_TPT_LMTP=y");
 #endif
 #ifdef TRANSPORT_PIPE
-  read_macro_assignment("_HAVE_TPT_PIPE=y");
+  read_macro_assignment(US"_HAVE_TPT_PIPE=y");
 #endif
 #ifdef TRANSPORT_SMTP
-  read_macro_assignment("_HAVE_TPT_SMTP=y");
+  read_macro_assignment(US"_HAVE_TPT_SMTP=y");
 #endif
 }
 
Master Exim source repository