Fix the log_archive function call so that it is compatible with db 3 3.3.x.

diff --git a/ChangeLog b/ChangeLog
index 03e7d48411f53d1861c3742e34acd7e7915bdd0c..b4ea18cb309c4c9dbbf5dc57a86aab9c2e544089 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
 
+2001-09-28  joe c   <marcus@marcuscom.com>
+
+       * libatalk/cnid/cnid_close.c: Add more db3 3.3.x compatibility to CNID DB
+
 2001-09-27  joe c   <marcus@marcuscom.com>
 
        * libatalk/cnid/cnid_open.c: Set internal deadlock detection

diff --git a/libatalk/cnid/cnid_close.c b/libatalk/cnid/cnid_close.c
index 648168a6e1919b0a737362e9db8cea40184dede5..01c0d8d21f9b00c6cb6737500916940c86df7de1 100644 (file)
--- a/libatalk/cnid/cnid_close.c
+++ b/libatalk/cnid/cnid_close.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_close.c,v 1.7 2001-09-23 19:08:23 jmarcus Exp $
+ * $Id: cnid_close.c,v 1.8 2001-09-28 14:51:47 jmarcus Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -48,7 +48,11 @@ void cnid_close(void *CNID)
       /* we've checkpointed, so clean up the log files.
        * NOTE: any real problems will make log_archive return an error. */
       chdir(db->dbenv->db_log_dir ? db->dbenv->db_log_dir : db->dbenv->db_home);
+#if DB_VERSION_MINOR > 2
+      if (!log_archive(db->dbenv, &first, DB_ARCH_LOG)) {
+#else /* DB_VERSION_MINOR < 2 */
       if (!log_archive(db->dbenv, &first, DB_ARCH_LOG, NULL)) {
+#endif /* DB_VERSION_MINOR */
        list = first;
        while (*list) {
          if (truncate(*list, 0) < 0)