X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsrc%2Fexim_dbmbuild.c;h=afd5095db0e4165eba8653d515651ba7ab918e1c;hb=93c931f83dfa0c448fbb4be09afe1d9fc753fe18;hp=611b6be38213eddc9f7732bbbb478a33b30d74df;hpb=d88f0784c1400a06efb1b09d0bfcfa31c284c7d7;p=user%2Fhenk%2Fcode%2Fexim.git

diff --git a/src/src/exim_dbmbuild.c b/src/src/exim_dbmbuild.c
index 611b6be38..afd5095db 100644
--- a/src/src/exim_dbmbuild.c
+++ b/src/src/exim_dbmbuild.c
@@ -2,7 +2,7 @@
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
-/* Copyright (c) University of Cambridge 1995 - 2015 */
+/* Copyright (c) University of Cambridge 1995 - 2018 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 
@@ -30,6 +30,7 @@ characters. */
 
 #include "exim.h"
 
+uschar * spool_directory = NULL;	/* dummy for dbstuff.h */
 
 #define max_insize   20000
 #define max_outsize 100000
@@ -151,6 +152,7 @@ uschar *bptr;
 uschar  keybuffer[256];
 uschar  temp_dbmname[512];
 uschar  real_dbmname[512];
+uschar  dirname[512];
 uschar *buffer = malloc(max_outsize);
 uschar *line = malloc(max_insize);
 
@@ -205,10 +207,16 @@ if (strlen(argv[arg+1]) > sizeof(temp_dbmname) - 20)
 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. */
 
-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)
   {
@@ -480,7 +488,7 @@ else
   printf("dbmbuild abandoned\n");
 #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_data] */
+  /* coverity[tainted_string] */
   Uunlink(temp_dbmname);
 #else
   if (is_db)