Fix potential misaligned ipv6 result records from DNS search

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

diff --git a/src/src/buildconfig.c b/src/src/buildconfig.c
index 49d8c411ac1cbd904a82ecad8c2f164d0e335d09..f3390cb7513bfb91f9f3861811bbc28196ab4819 100644 (file)
--- a/src/src/buildconfig.c
+++ b/src/src/buildconfig.c
@@ -1,10 +1,8 @@
-/* $Cambridge: exim/src/src/buildconfig.c,v 1.21 2010/06/13 08:26:40 pdp Exp $ */
-

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

-/* Copyright (c) University of Cambridge 1995 - 2009 */
+/* Copyright (c) University of Cambridge 1995 - 2012 */

 /* 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,8 +101,11 @@ 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;
 size_t test_size_t = 0;

+ssize_t test_ssize_t = 0;

 unsigned long test_ulong_t = 0L;
 unsigned long test_ulong_t = 0L;

+#endif

 long test_long_t = 0;
 FILE *base;
 FILE *new;
 long test_long_t = 0;
 FILE *base;
 FILE *new;


@@ -179,15 +180,22 @@ else
 fprintf(new, "#endif\n\n");
 
 /* And for sizeof() results, size_t, which should with C99 be just %zu, deal
 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. */
+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");
 
 #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
   fprintf(new, "#define SIZE_T_FMT  \"%%lu\"\n");
 #else
 if (sizeof(test_size_t) > sizeof (test_ulong_t))
   fprintf(new, "#define SIZE_T_FMT  \"%%llu\"\n");
 else
   fprintf(new, "#define SIZE_T_FMT  \"%%lu\"\n");

+if (sizeof(test_ssize_t) > sizeof(test_long_t))
+  fprintf(new, "#define SSIZE_T_FMT  \"%%lld\"\n");
+else
+  fprintf(new, "#define SSIZE_T_FMT  \"%%ld\"\n");

 #endif
 
 /* Now search the makefile for certain settings */
 #endif
 
 /* Now search the makefile for certain settings */


@@ -332,6 +340,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;


@@ -557,9 +575,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++;


@@ -600,8 +618,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)


@@ -806,9 +823,51 @@ while (fgets(buffer, sizeof(buffer), base) != NULL)
       else if (strcmp(name, "TIMEZONE_DEFAULT") == 0||
                strcmp(name, "TCP_WRAPPERS_DAEMON_NAME") == 0||
                strcmp(name, "HEADERS_CHARSET") == 0||
       else if (strcmp(name, "TIMEZONE_DEFAULT") == 0||
                strcmp(name, "TCP_WRAPPERS_DAEMON_NAME") == 0||
                strcmp(name, "HEADERS_CHARSET") == 0||

-              strcmp(name, "WHITELIST_D_MACROS") == 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