move logging of BDB version to the start of cnid_open

diff --git a/libatalk/cnid/cdb/cnid_cdb_open.c b/libatalk/cnid/cdb/cnid_cdb_open.c
index dc76f497c097f6e7d17ab9f8334e3a68cbafac6d..c3ee641e015d8bbcdbe2b3c5fe6cb19af147ad04 100644 (file)
--- a/libatalk/cnid/cdb/cnid_cdb_open.c
+++ b/libatalk/cnid/cdb/cnid_cdb_open.c
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cnid_cdb_open.c,v 1.1.4.8 2004-02-07 19:46:09 didg Exp $
+ * $Id: cnid_cdb_open.c,v 1.1.4.9 2004-03-02 13:30:28 bfernhomberg Exp $
  *
  * Copyright (c) 1999. Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved. See COPYRIGHT.
@@ -257,6 +257,12 @@ struct _cnid_db *cnid_cdb_open(const char *dir, mode_t mask)
        goto fail_adouble;
     }
 
+    /* Print out the version of BDB we're linked against. */
+    if (!first) {
+        first = 1;
+        LOG(log_info, logtype_default, "CNID DB initialized using %s", db_version(NULL, NULL, NULL));
+    }
+
     open_flag = DB_CREATE;
 
     /* We need to be able to open the database environment with full
@@ -390,12 +396,6 @@ struct _cnid_db *cnid_cdb_open(const char *dir, mode_t mask)
     }
 #endif /* 0 */
 
-    /* Print out the version of BDB we're linked against. */
-    if (!first) {
-        first = 1;
-        LOG(log_info, logtype_default, "CNID DB initialized using %s", db_version(NULL, NULL, NULL));
-    }
-
     db_env_set_func_yield(my_yield);
     return cdb;
 

diff --git a/libatalk/cnid/db3/cnid_db3_open.c b/libatalk/cnid/db3/cnid_db3_open.c
index c4aed39d152618de8955fce8d72e3a1ab51e98d0..98356749e9cc1926c134580fe6b16e6dd27c8a7a 100644 (file)
--- a/libatalk/cnid/db3/cnid_db3_open.c
+++ b/libatalk/cnid/db3/cnid_db3_open.c
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cnid_db3_open.c,v 1.1.4.3 2004-01-10 06:25:18 bfernhomberg Exp $
+ * $Id: cnid_db3_open.c,v 1.1.4.4 2004-03-02 13:30:29 bfernhomberg Exp $
  *
  * Copyright (c) 1999. Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved. See COPYRIGHT.
@@ -322,6 +322,9 @@ struct _cnid_db *cnid_db3_open(const char *dir, mode_t mask)
     path[len + DBHOMELEN] = '\0';
     open_flag = DB_CREATE;
 
+    /* Print out the version of BDB we're linked against. */
+    LOG(log_info, logtype_default, "CNID DB initializing using %s", db_version(NULL, NULL, NULL));
+
     /* We need to be able to open the database environment with full
      * transaction, logging, and locking support if we ever hope to 
      * be a true multi-acess file server. */
@@ -471,8 +474,6 @@ struct _cnid_db *cnid_db3_open(const char *dir, mode_t mask)
         goto fail_appinit;
     }
 
-    /* Print out the version of BDB we're linked against. */
-    LOG(log_info, logtype_default, "CNID DB initialized using %s", db_version(NULL, NULL, NULL));
 #if 0
     db_env_set_func_yield(my_yield);
 #endif