Change all references to db3/DB3 to BDB. We now support Berkeley DB

[netatalk.git] / libatalk / cnid / cnid_open.c

diff --git a/libatalk/cnid/cnid_open.c b/libatalk/cnid/cnid_open.c
index ccf069c38a9372edad0bdb5aacd89fbf9bd2c096..674343efe1cb9c4ad06cb5d223b116ef4fcf2137 100644 (file)
--- a/libatalk/cnid/cnid_open.c
+++ b/libatalk/cnid/cnid_open.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_open.c,v 1.46 2003-01-04 20:49:33 jmarcus Exp $
+ * $Id: cnid_open.c,v 1.49 2003-01-04 21:41:49 jmarcus Exp $
  *
  * Copyright (c) 1999. Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved. See COPYRIGHT.
@@ -106,7 +106,7 @@ DB_INIT_LOG | DB_INIT_TXN)
 
 #ifndef CNID_DB_CDB
 /* Let's try and use the youngest lock detector if present.
- * If we can't do that, then let DB3 use its default deadlock detector. */
+ * If we can't do that, then let BDB use its default deadlock detector. */
 #if defined DB_LOCK_YOUNGEST
 #define DEAD_LOCK_DETECT DB_LOCK_YOUNGEST
 #else /* DB_LOCK_YOUNGEST */
@@ -330,7 +330,7 @@ char path[MAXPATHLEN + 1];
     /*db->db_didname->set_bt_compare(db->db_didname, &compare_unix);*/
 #if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
     if ((rc = db->db_didname->open(db->db_didname, NULL, DBDIDNAME, NULL,
-                                   DB_HASH, open_flag DB_AUTO_COMMIT, 0666 & ~mask))) {
+                                   DB_HASH, open_flag | DB_AUTO_COMMIT, 0666 & ~mask))) {
 #else
     if ((rc = db->db_didname->open(db->db_didname, DBDIDNAME, NULL,
                                    DB_HASH, open_flag, 0666 & ~mask))) {
@@ -600,7 +600,7 @@ dbversion_retry:
     }
 #endif /* FILE_MANGLING */
 
-    /* Print out the version of DB3 we're linked against. */
+    /* 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));