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
Call initgroups() when dropping privilege, in order that Exim runs with
[exim.git]
/
src
/
src
/
exim_dbmbuild.c
diff --git
a/src/src/exim_dbmbuild.c
b/src/src/exim_dbmbuild.c
index 04ae3362c3452e92958956273153c4a1a8fdab8d..f34448dd309abf9d732781f7b75832eb0940b9e3 100644
(file)
--- a/
src/src/exim_dbmbuild.c
+++ b/
src/src/exim_dbmbuild.c
@@
-1,10
+1,10
@@
-/* $Cambridge: exim/src/src/exim_dbmbuild.c,v 1.
1 2004/10/07 10:39:01
ph10 Exp $ */
+/* $Cambridge: exim/src/src/exim_dbmbuild.c,v 1.
6 2006/02/07 11:19:00
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
6
*/
/* See the file NOTICE for conditions of use and distribution. */
/* See the file NOTICE for conditions of use and distribution. */
@@
-58,12
+58,18
@@
return sys_errlist[n];
/* For Berkeley DB >= 2, we can define a function to be called in case of DB
errors. This should help with debugging strange DB problems, e.g. getting "File
/* For Berkeley DB >= 2, we can define a function to be called in case of DB
errors. This should help with debugging strange DB problems, e.g. getting "File
-exists" when you try to open a db file. */
+exists" when you try to open a db file.
The API changed at release 4.3.
*/
#if defined(USE_DB) && defined(DB_VERSION_STRING)
void
#if defined(USE_DB) && defined(DB_VERSION_STRING)
void
+#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3)
+dbfn_bdb_error_callback(const DB_ENV *dbenv, const char *pfx, const char *msg)
+{
+dbenv = dbenv;
+#else
dbfn_bdb_error_callback(const char *pfx, char *msg)
{
dbfn_bdb_error_callback(const char *pfx, char *msg)
{
+#endif
pfx = pfx;
printf("Berkeley DB error: %s\n", msg);
}
pfx = pfx;
printf("Berkeley DB error: %s\n", msg);
}
@@
-201,7
+207,7
@@
if (d == NULL)
{
printf("exim_dbmbuild: unable to create %s: %s\n", temp_dbmname,
strerror(errno));
{
printf("exim_dbmbuild: unable to create %s: %s\n", temp_dbmname,
strerror(errno));
- fclose(f);
+
(void)
fclose(f);
exit(1);
}
exit(1);
}
@@
-228,7
+234,8
@@
while (Ufgets(line, max_insize, f) != NULL)
if (len >= max_insize - 1 && p[-1] != '\n')
{
printf("Overlong line read: max permitted length is %d\n", max_insize - 1);
if (len >= max_insize - 1 && p[-1] != '\n')
{
printf("Overlong line read: max permitted length is %d\n", max_insize - 1);
- return 1;
+ yield = 2;
+ goto TIDYUP;
}
if (line[0] == '#') continue;
}
if (line[0] == '#') continue;
@@
-254,7
+261,8
@@
while (Ufgets(line, max_insize, f) != NULL)
{
printf("Continued set of lines is too long: max permitted length is %d\n",
max_outsize -1);
{
printf("Continued set of lines is too long: max permitted length is %d\n",
max_outsize -1);
- return 1;
+ yield = 2;
+ goto TIDYUP;
}
Ustrcpy(bptr, s);
}
Ustrcpy(bptr, s);
@@
-398,7
+406,7
@@
if (started)
TIDYUP:
EXIM_DBCLOSE(d);
TIDYUP:
EXIM_DBCLOSE(d);
-fclose(f);
+
(void)
fclose(f);
/* If successful, output the number of entries and rename the temporary
files. */
/* If successful, output the number of entries and rename the temporary
files. */