X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/f1e894f37fb99398f7447220925a915bd031491a..17c761988f30054827a9951761d93ffeeaad0cb7:/src/src/buildconfig.c diff --git a/src/src/buildconfig.c b/src/src/buildconfig.c index e7be3eab1..1eaf2f505 100644 --- a/src/src/buildconfig.c +++ b/src/src/buildconfig.c @@ -1,10 +1,8 @@ -/* $Cambridge: exim/src/src/buildconfig.c,v 1.10 2005/06/27 14:29:43 ph10 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. */ @@ -42,16 +40,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; @@ -103,6 +101,12 @@ 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; +ssize_t test_ssize_t = 0; +unsigned long test_ulong_t = 0L; +#endif +long test_long_t = 0; FILE *base; FILE *new; int last_initial = 'A'; @@ -145,7 +149,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"); -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"); @@ -163,7 +167,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"); -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"); @@ -175,6 +179,25 @@ else } 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 + 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 */ base = fopen("Makefile", "rb"); @@ -285,10 +308,11 @@ 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"); } @@ -316,6 +340,16 @@ while (fgets(buffer, sizeof(buffer), base) != NULL) 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; @@ -355,6 +389,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; @@ -409,6 +444,7 @@ while (fgets(buffer, sizeof(buffer), base) != NULL) while (isspace(*user)) user++; username = user; gid_set = 1; + uid_not_set = 1; } else @@ -502,6 +538,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. */ @@ -526,9 +575,9 @@ while (fgets(buffer, sizeof(buffer), base) != NULL) 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++; @@ -569,8 +618,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) @@ -679,7 +727,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; @@ -768,10 +817,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 */