X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/c6e692d7701edfba04166fa67dcff9922a66972b..b3c261f710276f28ea23bf86dddacdf5fb4612b4:/src/src/buildconfig.c diff --git a/src/src/buildconfig.c b/src/src/buildconfig.c index ce39a2c53..56939770d 100644 --- a/src/src/buildconfig.c +++ b/src/src/buildconfig.c @@ -1,10 +1,10 @@ -/* $Cambridge: exim/src/src/buildconfig.c,v 1.4 2004/12/29 16:24:03 ph10 Exp $ */ +/* $Cambridge: exim/src/src/buildconfig.c,v 1.21 2010/06/13 08:26:40 pdp Exp $ */ /************************************************* * Exim - an Internet mail transport agent * *************************************************/ -/* Copyright (c) University of Cambridge 1995 - 2004 */ +/* Copyright (c) University of Cambridge 1995 - 2009 */ /* See the file NOTICE for conditions of use and distribution. */ @@ -15,8 +15,13 @@ /* This auxiliary program builds the file config.h by the following process: -First it reads Makefile, looking for certain OS-specific definitions which it -uses to define macros. Then it reads the defaults file config.h.defaults. +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 +config.h.defaults. The defaults file contains normal C #define statements for various macros; if the name of a macro is found in the environment, the environment value replaces @@ -37,16 +42,16 @@ normally called independently. */ #include typedef struct { - char *name; + const char *name; int *flag; } have_item; typedef struct { - char *name; + const char *name; 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; @@ -96,6 +101,13 @@ if (!OK) int main(int argc, char **argv) { +off_t test_off_t = 0; +time_t test_time_t = 0; +#if ! (__STDC_VERSION__ >= 199901L) +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'; @@ -132,13 +144,61 @@ fprintf(new, "using values specified in the configuration file Local/Makefile.\n fprintf(new, "Do not edit it. Instead, edit Local/Makefile and " "rerun make. */\n\n"); -/* First, search the makefile for certain settings */ +/* First, deal with the printing format for off_t variables. We assume that if +the size of off_t is greater than 4, "%lld" will be available as a format for +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) > sizeof(test_long_t)) + { + fprintf(new, "#define OFF_T_FMT \"%%lld\"\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 +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 + +/* 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); } @@ -242,15 +302,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 */ @@ -259,7 +320,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); } @@ -312,6 +373,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; @@ -366,6 +428,7 @@ while (fgets(buffer, sizeof(buffer), base) != NULL) while (isspace(*user)) user++; username = user; gid_set = 1; + uid_not_set = 1; } else @@ -459,6 +522,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. */ @@ -480,12 +556,12 @@ while (fgets(buffer, sizeof(buffer), base) != NULL) if (strcmp(name, "CONFIGURE_OWNER") == 0 || strcmp(name, "CONFIGURE_GROUP") == 0) { - int isgroup = name[10] == 'G'; + int isgroup = name[10] == 'G'; uid_t uid = 0; - gid_t gid = 0; - char *s; - char *username = NULL; - char *user = getenv(name); + gid_t gid = 0; + const char *s; + const char *username = NULL; + const char *user = getenv(name); if (user == NULL) user = ""; while (isspace((unsigned char)(*user))) user++; @@ -512,7 +588,7 @@ while (fgets(buffer, sizeof(buffer), base) != NULL) { if (isgroup) gid = (gid_t)atoi(user); - else + else uid = (uid_t)atoi(user); } @@ -526,8 +602,7 @@ while (fgets(buffer, sizeof(buffer), base) != NULL) while (isspace(*user)) user++; username = user; } - - else if (isgroup) +else if (isgroup) { struct group *gr = getgrnam(user); if (gr == NULL) @@ -560,13 +635,13 @@ while (fgets(buffer, sizeof(buffer), base) != NULL) { if (isgroup) fprintf(new, "#define CONFIGURE_GROUPNAME \"%s\"\n", username); - else + else fprintf(new, "#define CONFIGURE_OWNERNAME \"%s\"\n", username); } - + if (isgroup) fprintf(new, "#define CONFIGURE_GROUP %d\n", (int)gid); - else + else fprintf(new, "#define CONFIGURE_OWNER %d\n", (int)uid); continue; } @@ -595,16 +670,16 @@ while (fgets(buffer, sizeof(buffer), base) != NULL) for (i = 1, j = 0; i <= count; list++, i++) { char name[64]; - + p = list; while (*list != 0 && *list != ':') list++; strncpy(name, p, list-p); name[list-p] = 0; - + if (name[0] == 0) { - continue; - } + continue; + } else if (name[strspn(name, "0123456789")] == 0) { vector[j++] = (uid_t)atoi(name); @@ -629,18 +704,19 @@ while (fgets(buffer, sizeof(buffer), base) != NULL) 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 either it or + WITH_OLD_DEMIME is set. */ if (strcmp(name, "WITH_CONTENT_SCAN") == 0) { 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; - } + } /* Otherwise, check whether a value exists in the environment. Remember if it is an AUTH setting or SUPPORT_CRYPTEQ. */ @@ -677,6 +753,7 @@ while (fgets(buffer, sizeof(buffer), base) != NULL) else if (strcmp(name, "RADIUS_LIB_TYPE") == 0) { if (strcmp(value, "RADIUSCLIENT") == 0 || + strcmp(value, "RADIUSCLIENTNEW") == 0 || strcmp(value, "RADLIB") == 0) { fprintf(new, "#define RADIUS_LIB_%s\n", value); @@ -724,10 +801,13 @@ while (fgets(buffer, sizeof(buffer), base) != NULL) 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|| - 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); /* For others, quote any paths and don't quote anything else */ @@ -771,7 +851,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. */ @@ -785,7 +865,7 @@ if (have_auth) /* End off */ fprintf(new, "\n/* End of config.h */\n"); -fclose(new); +(void)fclose(new); return 0; }