X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsrc%2Fbuildconfig.c;h=780800c5831ef298f3b8cc154c73ac5036a19716;hb=655c589513d20178c1979517320fc446f1a197f6;hp=ee5e431a9172d965d562be662cffd65a54329095;hpb=b1c749bb7f147e7f9215fe6067c848cf02938b92;p=exim.git diff --git a/src/src/buildconfig.c b/src/src/buildconfig.c index ee5e431a9..780800c58 100644 --- a/src/src/buildconfig.c +++ b/src/src/buildconfig.c @@ -1,10 +1,10 @@ -/* $Cambridge: exim/src/src/buildconfig.c,v 1.8 2005/06/16 14:10:13 ph10 Exp $ */ +/* $Cambridge: exim/src/src/buildconfig.c,v 1.19 2010/06/07 18:25:57 pdp Exp $ */ /************************************************* * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2005 */ +/* Copyright (c) University of Cambridge 1995 - 2009 */ /* See the file NOTICE for conditions of use and distribution. */ @@ -15,9 +15,9 @@ /* This auxiliary program builds the file config.h by the following process: -First, it determines the size of off_t variables, and generates macro code to -define OFF_T_FMT as a suitable format, if it is not already defined in the -system-specific header file. +First, it determines the size of off_t and time_t variables, and generates +macro code to define OFF_T_FMT and TIME_T_FMT as suitable formats, if they are +not already defined in the system-specific header file. Then it reads Makefile, looking for certain OS-specific definitions which it uses to define some specific macros. Finally, it reads the defaults file @@ -34,6 +34,7 @@ normally called independently. */ #include +#include #include #include #include @@ -102,6 +103,12 @@ int main(int argc, char **argv) { off_t test_off_t = 0; +time_t test_time_t = 0; +#if !(__STDC_VERSION__ >= 199901L) && !defined(PRIdMAX) +size_t test_size_t = 0; +unsigned long test_ulong_t = 0L; +#endif +long test_long_t = 0; FILE *base; FILE *new; int last_initial = 'A'; @@ -144,24 +151,59 @@ 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"); -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 ASSUME_LONG_LONG_SUPPORT\n"); + fprintf(new, "#define LONGLONG_T long long int\n"); } else { fprintf(new, "#define OFF_T_FMT \"%%ld\"\n"); + fprintf(new, "#define LONGLONG_T long int\n"); } fprintf(new, "#endif\n\n"); +/* Now do the same thing for time_t variables. If the length is greater than +4, we want to assume long long support (even if off_t was less than 4). If the +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"); +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 LONGLONG_T long long int\n"); + } +else + { + fprintf(new, "#define TIME_T_FMT \"%%ld\"\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. */ + +#if __STDC_VERSION__ >= 199901L +fprintf(new, "#define SIZE_T_FMT \"%%zu\"\n"); +#else +# ifdef PRIdMAX +fprintf(new, "#define SIZE_T_FMT \"%%" PRIdMAX "\"\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"); +# endif +#endif + /* Now search the makefile for certain settings */ base = fopen("Makefile", "rb"); if (base == NULL) { printf("*** Buildconfig: failed to open Makefile\n"); - fclose(new); + (void)fclose(new); exit(1); } @@ -265,15 +307,16 @@ fprintf(new, "#define HAVE_ICONV %s\n", if (errno_quota[0] != 0) fprintf(new, "\n#define ERRNO_QUOTA %s\n", errno_quota); -if (strcmp(cc, "gcc") == 0 && strstr(ostype, "IRIX") != NULL) +if (strcmp(cc, "gcc") == 0 && + (strstr(ostype, "IRIX") != NULL || strstr(ostype, "AIX") != NULL)) { fprintf(new, "\n/* This switch includes the code to fix the inet_ntoa() */"); - fprintf(new, "\n/* bug when using gcc on an IRIX system. */"); + fprintf(new, "\n/* bug when using gcc on an IRIX or AIX system. */"); fprintf(new, "\n#define USE_INET_NTOA_FIX"); } fprintf(new, "\n"); -fclose(base); +(void)fclose(base); /* Now handle the macros listed in the defaults */ @@ -282,7 +325,7 @@ base = fopen("../src/config.h.defaults", "rb"); if (base == NULL) { printf("*** Buildconfig: failed to open ../src/config.h.defaults\n"); - fclose(new); + (void)fclose(new); exit(1); } @@ -335,6 +378,7 @@ while (fgets(buffer, sizeof(buffer), base) != NULL) 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; @@ -389,6 +433,7 @@ while (fgets(buffer, sizeof(buffer), base) != NULL) while (isspace(*user)) user++; username = user; gid_set = 1; + uid_not_set = 1; } else @@ -482,6 +527,19 @@ while (fgets(buffer, sizeof(buffer), base) != NULL) 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. */ @@ -659,7 +717,8 @@ while (fgets(buffer, sizeof(buffer), base) != NULL) { char *wcs = getenv("WITH_CONTENT_SCAN"); char *wod = getenv("WITH_OLD_DEMIME"); - if (wcs != NULL || wod != NULL) + char *dcc = getenv("EXPERIMENTAL_DCC"); + if (wcs != NULL || wod != NULL || dcc != NULL) fprintf(new, "#define WITH_CONTENT_SCAN yes\n"); else fprintf(new, "/* WITH_CONTENT_SCAN not set */\n"); continue; @@ -795,7 +854,7 @@ while (fgets(buffer, sizeof(buffer), base) != NULL) } } -fclose(base); +(void)fclose(base); /* If any AUTH macros were defined, ensure that SUPPORT_CRYPTEQ is also defined. */ @@ -809,7 +868,7 @@ if (have_auth) /* End off */ fprintf(new, "\n/* End of config.h */\n"); -fclose(new); +(void)fclose(new); return 0; }