git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add tcp_wrappers_daemon_name (closes: bug #278)
[exim.git]
/
src
/
src
/
buildconfig.c
diff --git
a/src/src/buildconfig.c
b/src/src/buildconfig.c
index b53869cf1c477317a89c0058de7bdec5e386adf2..38ed0311f170d62fff599d83584d47f1dc1c5876 100644
(file)
--- a/
src/src/buildconfig.c
+++ b/
src/src/buildconfig.c
@@
-1,4
+1,4
@@
-/* $Cambridge: exim/src/src/buildconfig.c,v 1.
17 2010/06/07 00:12:42 pdp
Exp $ */
+/* $Cambridge: exim/src/src/buildconfig.c,v 1.
20 2010/06/12 15:21:26 jetmore
Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
/*************************************************
* Exim - an Internet mail transport agent *
@@
-104,8
+104,10
@@
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) && !defined(PRIdMAX)
size_t test_size_t = 0;
unsigned long test_ulong_t = 0L;
size_t test_size_t = 0;
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;
@@
-185,8
+187,7
@@
with C99 not being ubiquitous yet. Unfortunately. */
#if __STDC_VERSION__ >= 199901L
fprintf(new, "#define SIZE_T_FMT \"%%zu\"\n");
#else
#if __STDC_VERSION__ >= 199901L
fprintf(new, "#define SIZE_T_FMT \"%%zu\"\n");
#else
-/*# ifdef PRIdMAX */
-#if 0
+# 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 \"%%" PRIdMAX "\"\n");
# else
if (sizeof(test_size_t) > sizeof (test_ulong_t))
@@
-531,8
+532,9
@@
while (fgets(buffer, sizeof(buffer), base) != NULL)
steps to filter out the most obvious ones. */
if ((!uid_not_set && uid == 0) ||
steps to filter out the most obvious ones. */
if ((!uid_not_set && uid == 0) ||
- (strcmp(username, "root") == 0) ||
- (strcmp(username, "toor") == 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;
{
printf("\n*** Exim's internal user must not be root.\n\n");
return 1;
@@
-805,9
+807,10
@@
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, and TCP_WRAPPERS_DAEMON_NAME
get quoted */
else if (strcmp(name, "TIMEZONE_DEFAULT") == 0||
else if (strcmp(name, "TIMEZONE_DEFAULT") == 0||
+ strcmp(name, "TCP_WRAPPERS_DAEMON_NAME") == 0||
strcmp(name, "HEADERS_CHARSET") == 0)
fprintf(new, "\"%s\"\n", value);
strcmp(name, "HEADERS_CHARSET") == 0)
fprintf(new, "\"%s\"\n", value);