Fix mariadb/mysql macro confusion

[exim.git] / src / src / buildconfig.c

diff --git a/src/src/buildconfig.c b/src/src/buildconfig.c
index 17197ce99d77a7a82013123cdb1f0fbb6f526870..4ed2874141548a2e1cb6a6294c550112f36f95fb 100644 (file)
--- a/src/src/buildconfig.c
+++ b/src/src/buildconfig.c
@@ -1,10 +1,8 @@
-/* $Cambridge: exim/src/src/buildconfig.c,v 1.13 2007/01/08 10:50:17 ph10 Exp $ */
-

 /*************************************************
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 

-/* Copyright (c) University of Cambridge 1995 - 2007 */
+/* Copyright (c) University of Cambridge 1995 - 2016 */

 /* See the file NOTICE for conditions of use and distribution. */
 
 
 /* See the file NOTICE for conditions of use and distribution. */
 
 


@@ -42,16 +40,16 @@ normally called independently. */
 #include <grp.h>
 
 typedef struct {
 #include <grp.h>
 
 typedef struct {

-  char *name;
+  const char *name;

   int *flag;
 } have_item;
 
 typedef struct {
   int *flag;
 } have_item;
 
 typedef struct {

-  char *name;
+  const char *name;

   char *data;
 } save_item;
 
   char *data;
 } save_item;
 

-static char *db_opts[] = { "", "USE_DB", "USE_GDBM", "USE_TDB" };
+static const char *db_opts[] = { "", "USE_DB", "USE_GDBM", "USE_TDB" };

 
 static int have_ipv6 = 0;
 static int have_iconv = 0;
 
 static int have_ipv6 = 0;
 static int have_iconv = 0;


@@ -103,6 +101,14 @@ main(int argc, char **argv)
 {
 off_t test_off_t = 0;
 time_t test_time_t = 0;
 {
 off_t test_off_t = 0;
 time_t test_time_t = 0;

+#if ! (__STDC_VERSION__ >= 199901L)
+size_t test_size_t = 0;
+ssize_t test_ssize_t = 0;
+unsigned long test_ulong_t = 0L;
+unsigned int test_uint_t = 0;
+#endif
+long test_long_t = 0;
+int test_int_t = 0;

 FILE *base;
 FILE *new;
 int last_initial = 'A';
 FILE *base;
 FILE *new;
 int last_initial = 'A';


@@ -145,7 +151,7 @@ printing long long variables, and there will be support for the long long type.
 This assumption is known to be OK for the common operating systems. */
 
 fprintf(new, "#ifndef OFF_T_FMT\n");
 This assumption is known to be OK for the common operating systems. */
 
 fprintf(new, "#ifndef OFF_T_FMT\n");

-if (sizeof(test_off_t) > 4)
+if (sizeof(test_off_t) > sizeof(test_long_t))

   {
   fprintf(new, "#define OFF_T_FMT  \"%%lld\"\n");
   fprintf(new, "#define LONGLONG_T long long int\n");
   {
   fprintf(new, "#define OFF_T_FMT  \"%%lld\"\n");
   fprintf(new, "#define LONGLONG_T long long int\n");


@@ -163,7 +169,7 @@ length is 4 or less, we can leave LONGLONG_T to whatever was defined above for
 off_t. */
 
 fprintf(new, "#ifndef TIME_T_FMT\n");
 off_t. */
 
 fprintf(new, "#ifndef TIME_T_FMT\n");

-if (sizeof(test_time_t) > 4)
+if (sizeof(test_time_t) > sizeof(test_long_t))

   {
   fprintf(new, "#define TIME_T_FMT  \"%%lld\"\n");
   fprintf(new, "#undef  LONGLONG_T\n");
   {
   fprintf(new, "#define TIME_T_FMT  \"%%lld\"\n");
   fprintf(new, "#undef  LONGLONG_T\n");


@@ -175,6 +181,30 @@ else
   }
 fprintf(new, "#endif\n\n");
 
   }
 fprintf(new, "#endif\n\n");
 

+/* And for sizeof() results, size_t, which should with C99 be just %zu, deal
+with C99 not being ubiquitous yet.  Unfortunately.  Assume ssize_t is same
+size as size_t on C99; if someone comes up with a version where it's not, fix
+it then. */
+
+#if __STDC_VERSION__ >= 199901L
+fprintf(new, "#define SIZE_T_FMT  \"%%zu\"\n");
+fprintf(new, "#define SSIZE_T_FMT  \"%%zd\"\n");
+#else
+if (sizeof(test_size_t) > sizeof (test_ulong_t))
+  fprintf(new, "#define SIZE_T_FMT  \"%%llu\"\n");
+else if (sizeof(test_size_t) > sizeof (test_uint_t))
+  fprintf(new, "#define SIZE_T_FMT  \"%%lu\"\n");
+else
+  fprintf(new, "#define SIZE_T_FMT  \"%%u\"\n");
+
+if (sizeof(test_ssize_t) > sizeof(test_long_t))
+  fprintf(new, "#define SSIZE_T_FMT  \"%%lld\"\n");
+else if (sizeof(test_ssize_t) > sizeof(test_int_t))
+  fprintf(new, "#define SSIZE_T_FMT  \"%%ld\"\n");
+else
+  fprintf(new, "#define SSIZE_T_FMT  \"%%d\"\n");
+#endif
+

 /* Now search the makefile for certain settings */
 
 base = fopen("Makefile", "rb");
 /* Now search the makefile for certain settings */
 
 base = fopen("Makefile", "rb");


@@ -317,6 +347,16 @@ while (fgets(buffer, sizeof(buffer), base) != NULL)
 
   while (*p == ' ' || *p == '\t') p++;
 
 
   while (*p == ' ' || *p == '\t') p++;
 

+  if (strncmp(p, "#ifdef ", 7) == 0
+   || strncmp(p, "#ifndef ", 8) == 0
+   || strncmp(p, "#if ", 4) == 0
+   || strncmp(p, "#endif", 6) == 0
+     )
+    {
+    fputs(buffer, new);
+    continue;
+    }
+

   if (strncmp(p, "#define ", 8) != 0) continue;
 
   p += 8;
   if (strncmp(p, "#define ", 8) != 0) continue;
 
   p += 8;


@@ -356,6 +396,7 @@ while (fgets(buffer, sizeof(buffer), base) != NULL)
     uid_t uid = 0;
     gid_t gid = 0;
     int gid_set = 0;
     uid_t uid = 0;
     gid_t gid = 0;
     int gid_set = 0;

+    int uid_not_set = 0;

     char *username = NULL;
     char *groupname = NULL;
     char *s;
     char *username = NULL;
     char *groupname = NULL;
     char *s;


@@ -410,6 +451,7 @@ while (fgets(buffer, sizeof(buffer), base) != NULL)
       while (isspace(*user)) user++;
       username = user;
       gid_set = 1;
       while (isspace(*user)) user++;
       username = user;
       gid_set = 1;

+      uid_not_set = 1;

       }
 
     else
       }
 
     else


@@ -503,6 +545,19 @@ while (fgets(buffer, sizeof(buffer), base) != NULL)
       return 1;
       }
 
       return 1;
       }
 

+    /* security sanity checks
+    if ref: is being used, we can never be sure, but we can take reasonable
+    steps to filter out the most obvious ones.  */
+
+    if ((!uid_not_set && uid == 0) ||
+        ((username != NULL) && (
+          (strcmp(username, "root") == 0) ||
+          (strcmp(username, "toor") == 0) )))
+      {
+      printf("\n*** Exim's internal user must not be root.\n\n");
+      return 1;
+      }
+

     /* Output user and group names or uid/gid. When names are set, uid/gid
     are set to zero but will be replaced at runtime. */
 
     /* Output user and group names or uid/gid. When names are set, uid/gid
     are set to zero but will be replaced at runtime. */
 


@@ -527,9 +582,9 @@ while (fgets(buffer, sizeof(buffer), base) != NULL)
     int isgroup = name[10] == 'G';
     uid_t uid = 0;
     gid_t gid = 0;
     int isgroup = name[10] == 'G';
     uid_t uid = 0;
     gid_t gid = 0;

-    char *s;
-    char *username = NULL;
-    char *user = getenv(name);
+    const char *s;
+    const char *username = NULL;
+    const char *user = getenv(name);

 
     if (user == NULL) user = "";
     while (isspace((unsigned char)(*user))) user++;
 
     if (user == NULL) user = "";
     while (isspace((unsigned char)(*user))) user++;


@@ -570,8 +625,7 @@ while (fgets(buffer, sizeof(buffer), base) != NULL)
       while (isspace(*user)) user++;
       username = user;
       }
       while (isspace(*user)) user++;
       username = user;
       }

-
-    else if (isgroup)
+else if (isgroup)

       {
       struct group *gr = getgrnam(user);
       if (gr == NULL)
       {
       struct group *gr = getgrnam(user);
       if (gr == NULL)


@@ -673,16 +727,31 @@ while (fgets(buffer, sizeof(buffer), base) != NULL)
     continue;
     }
 
     continue;
     }
 

-  /* WITH_CONTENT_SCAN is another special case: it must be set if either it or
-  WITH_OLD_DEMIME is set. */
+  /* WITH_CONTENT_SCAN is another special case: it must be set if it or
+  EXPERIMENTAL_DCC is set. */

 
   if (strcmp(name, "WITH_CONTENT_SCAN") == 0)
     {
     char *wcs = getenv("WITH_CONTENT_SCAN");
 
   if (strcmp(name, "WITH_CONTENT_SCAN") == 0)
     {
     char *wcs = getenv("WITH_CONTENT_SCAN");

-    char *wod = getenv("WITH_OLD_DEMIME");
-    if (wcs != NULL || wod != NULL)
-      fprintf(new, "#define WITH_CONTENT_SCAN     yes\n");
-    else fprintf(new, "/* WITH_CONTENT_SCAN not set */\n");
+    char *dcc = getenv("EXPERIMENTAL_DCC");
+    fprintf(new, wcs || dcc
+      ? "#define WITH_CONTENT_SCAN     yes\n"
+      : "/* WITH_CONTENT_SCAN not set */\n");
+    continue;
+    }
+
+  /* DISABLE_DKIM is special; must be forced if no SUPPORT_TLS */
+  if (strcmp(name, "DISABLE_DKIM") == 0)
+    {
+    char *d_dkim = getenv("DISABLE_DKIM");
+    char *tls = getenv("SUPPORT_TLS");
+
+    if (d_dkim)
+      fprintf(new, "#define DISABLE_DKIM          yes\n");
+    else if (!tls)
+      fprintf(new, "#define DISABLE_DKIM          yes /* forced by lack of TLS */\n");
+    else
+      fprintf(new, "/* DISABLE_DKIM not set */\n");

     continue;
     }
 
     continue;
     }
 


@@ -756,7 +825,11 @@ while (fgets(buffer, sizeof(buffer), base) != NULL)
             strncpy(buffer, ss, sss-ss);
             buffer[sss-ss] = 0;  /* For empty case */
             }
             strncpy(buffer, ss, sss-ss);
             buffer[sss-ss] = 0;  /* For empty case */
             }

-          else strcpy(buffer, ss);
+          else
+           {
+                   strncpy(buffer, ss, sizeof(buffer));
+           buffer[sizeof(buffer)-1] = 0;
+           }

           pp = buffer + (int)strlen(buffer);
           while (pp > buffer && isspace((unsigned char)pp[-1])) pp--;
           *pp = 0;
           pp = buffer + (int)strlen(buffer);
           while (pp > buffer && isspace((unsigned char)pp[-1])) pp--;
           *pp = 0;


@@ -769,12 +842,57 @@ while (fgets(buffer, sizeof(buffer), base) != NULL)
         fprintf(new, "\"%s\"\n", value);
         }
 
         fprintf(new, "\"%s\"\n", value);
         }
 

-      /* Timezone values and HEADERS_CHARSET get quoted */
+      /* Timezone values HEADERS_CHARSET, TCP_WRAPPERS_DAEMON_NAME and
+      WHITELIST_D_MACROS get quoted */

 
       else if (strcmp(name, "TIMEZONE_DEFAULT") == 0||
 
       else if (strcmp(name, "TIMEZONE_DEFAULT") == 0||

-               strcmp(name, "HEADERS_CHARSET") == 0)
+               strcmp(name, "TCP_WRAPPERS_DAEMON_NAME") == 0||
+               strcmp(name, "HEADERS_CHARSET") == 0||
+               strcmp(name, "WHITELIST_D_MACROS") == 0)

         fprintf(new, "\"%s\"\n", value);
 
         fprintf(new, "\"%s\"\n", value);
 

+      /* GnuTLS constants; first is for debugging, others are tuning */
+
+      /* less than 0 is not-active; 0-9 are normal, API suggests higher
+      taken without problems */
+      else if (strcmp(name, "EXIM_GNUTLS_LIBRARY_LOG_LEVEL") == 0)
+        {
+        long nv;
+        char *end;
+        nv = strtol(value, &end, 10);
+        if (end != value && *end == '\0' && nv >= -1 && nv <= 100)
+          {
+          fprintf(new, "%s\n", value);
+          }
+        else
+          {
+          printf("Value of %s should be -1..9\n", name);
+          return 1;
+          }
+        }
+
+      /* how many bits Exim, as a client, demands must be in D-H */
+      /* 1024 is a historical figure; some sites actually use lower, so we
+      permit the value to be lowered "dangerously" low, but not "insanely"
+      low.  Though actually, 1024 is becoming "dangerous". */
+      else if ((strcmp(name, "EXIM_CLIENT_DH_MIN_MIN_BITS") == 0) ||
+               (strcmp(name, "EXIM_CLIENT_DH_DEFAULT_MIN_BITS") == 0) ||
+               (strcmp(name, "EXIM_SERVER_DH_BITS_PRE2_12") == 0))
+        {
+        long nv;
+        char *end;
+        nv = strtol(value, &end, 10);
+        if (end != value && *end == '\0' && nv >= 512 && nv < 500000)
+          {
+          fprintf(new, "%s\n", value);
+          }
+        else
+          {
+          printf("Unreasonable value (%s) of \"%s\".\n", value, name);
+          return 1;
+          }
+        }
+

       /* For others, quote any paths and don't quote anything else */
 
       else
       /* For others, quote any paths and don't quote anything else */
 
       else