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
Support log_selector smtp_confirmation for the lmtp transport. Bug 1157
[exim.git]
/
src
/
src
/
exim_dbmbuild.c
diff --git
a/src/src/exim_dbmbuild.c
b/src/src/exim_dbmbuild.c
index d9f3bfc6aad946b0b5c4d3efef79c8d2eec85b9e..ce06f16e79a5afabfa0ec44a550c52bacc9a4b79 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.4 2005/06/27 14:29:43 ph10 Exp $ */
-
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
/*************************************************
* Exim - an Internet mail transport agent *
*************************************************/
-/* Copyright (c) University of Cambridge 1995 - 200
5
*/
+/* Copyright (c) University of Cambridge 1995 - 200
9
*/
/* See the file NOTICE for conditions of use and distribution. */
/* See the file NOTICE for conditions of use and distribution. */
@@
-39,7
+37,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
@@
-151,8
+149,8
@@
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 *buffer = malloc(max_outsize);
uschar *line = malloc(max_insize);
uschar *buffer = malloc(max_outsize);
uschar *line = malloc(max_insize);
@@
-195,6
+193,15
@@
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");
@@
-234,7
+241,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;
@@
-260,7
+268,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);