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
Upgrade appendfile so that it is capable of handling quotas that are
[exim.git]
/
src
/
src
/
buildconfig.c
diff --git
a/src/src/buildconfig.c
b/src/src/buildconfig.c
index ce39a2c539b0c5906111d3ad0284db4c68a72d66..46bf4738bc3d0b9415459b3680ae311efb739f7e 100644
(file)
--- 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.
7 2005/03/29 14:19:21
ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 200
4
*/
+/* Copyright (c) University of Cambridge 1995 - 200
5
*/
/* See the file NOTICE for conditions of use and distribution. */
/* See the file NOTICE for conditions of use and distribution. */
@@
-480,9
+480,9
@@
while (fgets(buffer, sizeof(buffer), base) != NULL)
if (strcmp(name, "CONFIGURE_OWNER") == 0 ||
strcmp(name, "CONFIGURE_GROUP") == 0)
{
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;
uid_t uid = 0;
- gid_t gid = 0;
+ gid_t gid = 0;
char *s;
char *username = NULL;
char *user = getenv(name);
char *s;
char *username = NULL;
char *user = getenv(name);
@@
-512,7
+512,7
@@
while (fgets(buffer, sizeof(buffer), base) != NULL)
{
if (isgroup)
gid = (gid_t)atoi(user);
{
if (isgroup)
gid = (gid_t)atoi(user);
- else
+ else
uid = (uid_t)atoi(user);
}
uid = (uid_t)atoi(user);
}
@@
-560,13
+560,13
@@
while (fgets(buffer, sizeof(buffer), base) != NULL)
{
if (isgroup)
fprintf(new, "#define CONFIGURE_GROUPNAME \"%s\"\n", username);
{
if (isgroup)
fprintf(new, "#define CONFIGURE_GROUPNAME \"%s\"\n", username);
- else
+ else
fprintf(new, "#define CONFIGURE_OWNERNAME \"%s\"\n", username);
}
fprintf(new, "#define CONFIGURE_OWNERNAME \"%s\"\n", username);
}
-
+
if (isgroup)
fprintf(new, "#define CONFIGURE_GROUP %d\n", (int)gid);
if (isgroup)
fprintf(new, "#define CONFIGURE_GROUP %d\n", (int)gid);
- else
+ else
fprintf(new, "#define CONFIGURE_OWNER %d\n", (int)uid);
continue;
}
fprintf(new, "#define CONFIGURE_OWNER %d\n", (int)uid);
continue;
}
@@
-595,16
+595,16
@@
while (fgets(buffer, sizeof(buffer), base) != NULL)
for (i = 1, j = 0; i <= count; list++, i++)
{
char name[64];
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;
p = list;
while (*list != 0 && *list != ':') list++;
strncpy(name, p, list-p);
name[list-p] = 0;
-
+
if (name[0] == 0)
{
if (name[0] == 0)
{
- continue;
- }
+ continue;
+ }
else if (name[strspn(name, "0123456789")] == 0)
{
vector[j++] = (uid_t)atoi(name);
else if (name[strspn(name, "0123456789")] == 0)
{
vector[j++] = (uid_t)atoi(name);
@@
-629,8
+629,8
@@
while (fgets(buffer, sizeof(buffer), base) != NULL)
continue;
}
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)
{
if (strcmp(name, "WITH_CONTENT_SCAN") == 0)
{
@@
-640,7
+640,7
@@
while (fgets(buffer, sizeof(buffer), base) != NULL)
fprintf(new, "#define WITH_CONTENT_SCAN yes\n");
else fprintf(new, "/* WITH_CONTENT_SCAN not set */\n");
continue;
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. */
/* Otherwise, check whether a value exists in the environment. Remember if
it is an AUTH setting or SUPPORT_CRYPTEQ. */
@@
-677,6
+677,7
@@
while (fgets(buffer, sizeof(buffer), base) != NULL)
else if (strcmp(name, "RADIUS_LIB_TYPE") == 0)
{
if (strcmp(value, "RADIUSCLIENT") == 0 ||
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);
strcmp(value, "RADLIB") == 0)
{
fprintf(new, "#define RADIUS_LIB_%s\n", value);