Update version number and copyright year.

[exim.git] / src / src / exim_dbmbuild.c

diff --git a/src/src/exim_dbmbuild.c b/src/src/exim_dbmbuild.c
index 1c06b710a949286a36e5617f5204766db40eb1ef..e07a47ac131918614e62d964ef641a08976920ef 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.2 2005/01/04 10:00:42 ph10 Exp $ */
+/* $Cambridge: exim/src/src/exim_dbmbuild.c,v 1.8 2007/01/08 10:50:18 ph10 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
-/* Copyright (c) University of Cambridge 1995 - 2005 */
+/* Copyright (c) University of Cambridge 1995 - 2007 */
 /* 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
-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 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)
 {
+#endif
 pfx = pfx;
 printf("Berkeley DB error: %s\n", msg);
 }
@@ -145,8 +151,8 @@ EXIM_DB *d;
 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);
 
@@ -189,6 +195,15 @@ if (Ustrcmp(argv[arg], argv[arg+1]) == 0)
   }
 #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");
 
@@ -201,7 +216,7 @@ if (d == NULL)
   {
   printf("exim_dbmbuild: unable to create %s: %s\n", temp_dbmname,
     strerror(errno));
-  fclose(f);
+  (void)fclose(f);
   exit(1);
   }
 
@@ -228,7 +243,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);
-    return 1;
+    yield = 2;
+    goto TIDYUP;
     }
 
   if (line[0] == '#') continue;
@@ -254,7 +270,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);
-      return 1;
+      yield = 2;
+      goto TIDYUP;
       }
 
     Ustrcpy(bptr, s);
@@ -398,7 +415,7 @@ if (started)
 TIDYUP:
 
 EXIM_DBCLOSE(d);
-fclose(f);
+(void)fclose(f);
 
 /* If successful, output the number of entries and rename the temporary
 files. */