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
Logging: fix syslog logging for syslog_timestamp=no and log_selector +millisec
[exim.git]
/
src
/
src
/
exim_dbmbuild.c
diff --git
a/src/src/exim_dbmbuild.c
b/src/src/exim_dbmbuild.c
index 1c06b710a949286a36e5617f5204766db40eb1ef..afd5095db0e4165eba8653d515651ba7ab918e1c 100644
(file)
--- a/
src/src/exim_dbmbuild.c
+++ b/
src/src/exim_dbmbuild.c
@@
-1,10
+1,8
@@
-/* $Cambridge: exim/src/src/exim_dbmbuild.c,v 1.2 2005/01/04 10:00:42 ph10 Exp $ */
-
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 20
05
*/
+/* Copyright (c) University of Cambridge 1995 - 20
18
*/
/* See the file NOTICE for conditions of use and distribution. */
/* See the file NOTICE for conditions of use and distribution. */
@@
-32,6
+30,7
@@
characters. */
#include "exim.h"
#include "exim.h"
+uschar * spool_directory = NULL; /* dummy for dbstuff.h */
#define max_insize 20000
#define max_outsize 100000
#define max_insize 20000
#define max_outsize 100000
@@
-39,7
+38,7
@@
characters. */
/* This is global because it's defined in the headers and compilers grumble
if it is made static. */
/* This is global because it's defined in the headers and compilers grumble
if it is made static. */
-
uschar *hex_digits =
US"0123456789abcdef";
+
const uschar *hex_digits = C
US"0123456789abcdef";
#ifdef STRERROR_FROM_ERRLIST
#ifdef STRERROR_FROM_ERRLIST
@@
-58,12
+57,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);
}
@@
-84,10
+89,10
@@
Returns: the value of the character escape
*/
int
*/
int
-string_interpret_escape(uschar **pp)
+string_interpret_escape(
const
uschar **pp)
{
int ch;
{
int ch;
-uschar *p = *pp;
+
const
uschar *p = *pp;
ch = *(++p);
if (isdigit(ch) && ch != '8' && ch != '9')
{
ch = *(++p);
if (isdigit(ch) && ch != '8' && ch != '9')
{
@@
-145,8
+150,9
@@
EXIM_DB *d;
EXIM_DATUM key, content;
uschar *bptr;
uschar keybuffer[256];
EXIM_DATUM key, content;
uschar *bptr;
uschar keybuffer[256];
-uschar temp_dbmname[256];
-uschar real_dbmname[256];
+uschar temp_dbmname[512];
+uschar real_dbmname[512];
+uschar dirname[512];
uschar *buffer = malloc(max_outsize);
uschar *line = malloc(max_insize);
uschar *buffer = malloc(max_outsize);
uschar *line = malloc(max_insize);
@@
-189,19
+195,34
@@
if (Ustrcmp(argv[arg], argv[arg+1]) == 0)
}
#endif
}
#endif
+/* Check length of filename; allow for adding .dbmbuild_temp and .db or
+.dir/.pag later. */
+
+if (strlen(argv[arg+1]) > sizeof(temp_dbmname) - 20)
+ {
+ printf("exim_dbmbuild: output filename is ridiculously long\n");
+ exit(1);
+ }
+
Ustrcpy(temp_dbmname, argv[arg+1]);
Ustrcat(temp_dbmname, ".dbmbuild_temp");
Ustrcpy(temp_dbmname, argv[arg+1]);
Ustrcat(temp_dbmname, ".dbmbuild_temp");
+Ustrcpy(dirname, temp_dbmname);
+if ((bptr = Ustrrchr(dirname, '/')))
+ *bptr = '\0';
+else
+ Ustrcpy(dirname, ".");
+
/* It is apparently necessary to open with O_RDWR for this to work
with gdbm-1.7.3, though no reading is actually going to be done. */
/* It is apparently necessary to open with O_RDWR for this to work
with gdbm-1.7.3, though no reading is actually going to be done. */
-EXIM_DBOPEN(temp_dbmname, O_RDWR|O_CREAT|O_EXCL, 0644, &d);
+EXIM_DBOPEN(temp_dbmname,
dirname,
O_RDWR|O_CREAT|O_EXCL, 0644, &d);
if (d == NULL)
{
printf("exim_dbmbuild: unable to create %s: %s\n", temp_dbmname,
strerror(errno));
if (d == NULL)
{
printf("exim_dbmbuild: unable to create %s: %s\n", temp_dbmname,
strerror(errno));
- fclose(f);
+
(void)
fclose(f);
exit(1);
}
exit(1);
}
@@
-228,7
+249,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
+276,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);
@@
-314,7
+337,7
@@
while (Ufgets(line, max_insize, f) != NULL)
keystart = t;
while (*s != 0 && *s != '\"')
{
keystart = t;
while (*s != 0 && *s != '\"')
{
- if (*s == '\\') *t++ = string_interpret_escape(&s);
+ if (*s == '\\') *t++ = string_interpret_escape(
(const uschar **)
&s);
else *t++ = *s;
s++;
}
else *t++ = *s;
s++;
}
@@
-398,7
+421,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. */
@@
-463,9
+486,11
@@
if (yield == 0 || yield == 1)
else
{
printf("dbmbuild abandoned\n");
else
{
printf("dbmbuild abandoned\n");
- #if defined(USE_DB) || defined(USE_TDB) || defined(USE_GDBM)
+#if defined(USE_DB) || defined(USE_TDB) || defined(USE_GDBM)
+ /* We created it, so safe to delete despite the name coming from outside */
+ /* coverity[tainted_string] */
Uunlink(temp_dbmname);
Uunlink(temp_dbmname);
-
#else
+#else
if (is_db)
{
sprintf(CS real_dbmname, "%s.db", temp_dbmname);
if (is_db)
{
sprintf(CS real_dbmname, "%s.db", temp_dbmname);
@@
-478,7
+503,7
@@
else
sprintf(CS real_dbmname, "%s.pag", temp_dbmname);
Uunlink(real_dbmname);
}
sprintf(CS real_dbmname, "%s.pag", temp_dbmname);
Uunlink(real_dbmname);
}
-
#endif /* USE_DB || USE_TDB */
+#endif /* USE_DB || USE_TDB */
}
return yield;
}
return yield;