/*
- * $Id: cnid_open.c,v 1.30 2002-01-04 04:45:48 sibaz 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.
* 1 -- parent of root directory (handled by afpd)
* 2 -- root directory (handled by afpd)
*
- * so, CNID_START begins at 3.
+ * CNIDs 4-16 are reserved according to page 31 of the AFP 3.0 spec so,
+ * CNID_START begins at 17.
*/
#ifdef HAVE_CONFIG_H
#define DBDIDNAME "didname.db" /* did/full name mapping */
#define DBSHORTNAME "shortname.db" /* did/8+3 mapping */
#define DBMACNAME "macname.db" /* did/31 mapping */
+#define DBMANGLE "mangle.db" /* filename mangling */
#define DBLONGNAME "longname.db" /* did/unicode mapping */
#define DBLOCKFILE "cnid.lock"
#define DBRECOVERFILE "cnid.dbrecover"
#define DBVERSION1 0x00000001U
#define DBVERSION DBVERSION1
-#if DB_VERSION_MINOR > 1
+#ifdef CNID_DB_CDB
+#define DBOPTIONS (DB_CREATE | DB_INIT_CDB | DB_INIT_MPOOL)
+#else /* !CNID_DB_CDB */
+#if DB_VERSION_MAJOR >= 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 1)
#define DBOPTIONS (DB_CREATE | DB_INIT_MPOOL | DB_INIT_LOCK | \
DB_INIT_LOG | DB_INIT_TXN)
#else /* DB_VERSION_MINOR < 1 */
-#define DBOPTIONS (DB_CREATE | DB_INIT_MPOOL | DB_INIT_LOCK | \
-DB_INIT_LOG | DB_INIT_TXN | DB_TXN_NOSYNC)
/*#define DBOPTIONS (DB_CREATE | DB_INIT_MPOOL | DB_INIT_LOCK | \
-DB_INIT_LOG | DB_INIT_TXN)*/
+DB_INIT_LOG | DB_INIT_TXN | DB_TXN_NOSYNC)*/
+#define DBOPTIONS (DB_CREATE | DB_INIT_MPOOL | DB_INIT_LOCK | \
+DB_INIT_LOG | DB_INIT_TXN)
#endif /* DB_VERSION_MINOR */
+#endif /* CNID_DB_CDB */
-/* Let's try and use the random deadlock decider if available. This adds
- * a bit of entropy to the mix that might be beneficial. If random isn't
- * available, we'll decide deadlocks by kicking off the youngest process.
- * If we can't do that, then let DB3 use its default deadlock detector. */
-#ifdef DB_LOCK_RANDOM
-#define DEAD_LOCK_DETECT DB_LOCK_RANDOM
-#elif defined DB_LOCK_YOUNGEST
+#ifndef CNID_DB_CDB
+/* Let's try and use the youngest lock detector if present.
+ * 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_RANDOM */
+#else /* DB_LOCK_YOUNGEST */
#define DEAD_LOCK_DETECT DB_LOCK_DEFAULT
-#endif /* DB_LOCK_RANDOM */
+#endif /* DB_LOCK_YOUNGEST */
+#endif /* CNID_DB_CDB */
#define MAXITER 0xFFFF /* maximum number of simultaneously open CNID
* databases. */
/* sort did's and then names. this is for unix paths.
* i.e., did/unixname lookups. */
-#if DB_VERSION_MINOR > 1
+#if DB_VERSION_MAJOR >= 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 1)
static int compare_unix(DB *db, const DBT *a, const DBT *b)
#else /* DB_VERSION_MINOR < 1 */
static int compare_unix(const DBT *a, const DBT *b)
* did/macname, and did/shortname. i think did/longname needs a
* unicode table to work. also, we can't use strdiacasecmp as that
* returns a match if a < b. */
-#if DB_VERSION_MINOR > 1
+#if DB_VERSION_MAJOR >= 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 1)
static int compare_mac(DB *db, const DBT *a, const DBT *b)
#else /* DB_VERSION_MINOR < 1 */
static int compare_mac(const DBT *a, const DBT *b)
/* for unicode names -- right now it's the same as compare_mac. */
-#if DB_VERSION_MINOR > 1
+#if DB_VERSION_MAJOR >= 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 1)
static int compare_unicode(DB *db, const DBT *a, const DBT *b)
#else /* DB_VERSION_MINOR < 1 */
static int compare_unicode(const DBT *a, const DBT *b)
#endif /* DB_VERSION_MINOR */
{
-#if DB_VERSION_MINOR > 1
+#if DB_VERSION_MAJOR >= 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 1)
return compare_mac(db,a,b);
#else /* DB_VERSION_MINOR < 1 */
return compare_mac(a,b);
#endif /* DB_VERSION_MINOR */
}
-static int have_lock = 0;
-
-void *cnid_open(const char *dir) {
- struct stat st, rsb, csb;
+void *cnid_open(const char *dir, mode_t mask) {
+ struct stat st;
+#ifndef CNID_DB_CDB
struct flock lock;
- char path[MAXPATHLEN + 1];
- char recover_file[MAXPATHLEN + 1];
+#endif /* CNID_DB_CDB */
+char path[MAXPATHLEN + 1];
CNID_private *db;
DBT key, data;
DB_TXN *tid;
- u_int32_t DBEXTRAS = 0;
int open_flag, len;
- int rc, rfd = -1;
+ int rc;
if (!dir) {
return NULL;
len++;
}
- lock.l_type = F_WRLCK;
- lock.l_whence = SEEK_SET;
-
strcpy(path + len, DBHOME);
- if ((stat(path, &st) < 0) && (ad_mkdir(path, 0777) < 0)) {
+ if ((stat(path, &st) < 0) && (ad_mkdir(path, 0777 & ~mask) < 0)) {
LOG(log_error, logtype_default, "cnid_open: DBHOME mkdir failed for %s", path);
goto fail_adouble;
}
+#ifndef CNID_DB_CDB
+ lock.l_type = F_WRLCK;
+ lock.l_whence = SEEK_SET;
/* Make sure cnid.lock goes in .AppleDB. */
strcat(path, "/");
len++;
- strcpy(db->close_file, path);
- strcat(db->close_file, DBCLOSEFILE);
-
- /* Check to make sure that a client isn't in the process of closing
- * the database environment. To do this, select on the close file. */
- while(stat(db->close_file, &csb) == 0) {
- struct timeval ct;
- ct.tv_sec = 1;
- ct.tv_usec = 0;
- (void)select(0, NULL, NULL, NULL, &ct);
- }
-
- strcpy(recover_file, path);
- strcat(recover_file, DBRECOVERFILE);
-
/* Search for a byte lock. This allows us to cleanup the log files
* at cnid_close() in a clean fashion.
*
* NOTE: This won't work if multiple volumes for the same user refer
* to the sahe directory. */
strcat(path, DBLOCKFILE);
- if ((db->lockfd = open(path, O_RDWR | O_CREAT, 0666)) > -1) {
+ strcpy(db->lock_file, path);
+ if ((db->lockfd = open(path, O_RDWR | O_CREAT, 0666 & ~mask)) > -1) {
lock.l_start = 0;
lock.l_len = 1;
while (fcntl(db->lockfd, F_SETLK, &lock) < 0) {
else {
LOG(log_error, logtype_default, "cnid_open: Cannot establish logfile cleanup lock for database environment %s (open() failed)", path);
}
-
- /* Create a file to represent database recovery. While this file
- * exists, the database is being recovered, and all other clients will
- * select until recovery is complete, and this file goes away. */
- if (!have_lock && db->lockfd > -1 && lock.l_start == 0) {
- if (stat(recover_file, &rsb) == 0) {
- (void)remove(recover_file);
- }
- if ((rfd = open(recover_file, O_RDWR | O_CREAT, 0666)) > -1) {
- DBEXTRAS |= DB_RECOVER;
- have_lock = 1;
- }
- }
- else if (!have_lock) {
- while (stat(recover_file, &rsb) == 0) {
- struct timeval rt;
- rt.tv_sec = 1;
- rt.tv_usec = 0;
- (void)select(0, NULL, NULL, NULL, &rt);
- }
- }
+#endif /* CNID_DB_CDB */
path[len + DBHOMELEN] = '\0';
open_flag = DB_CREATE;
goto fail_lock;
}
+#ifndef CNID_DB_CDB
/* Setup internal deadlock detection. */
if ((rc = db->dbenv->set_lk_detect(db->dbenv, DEAD_LOCK_DETECT)) != 0) {
LOG(log_error, logtype_default, "cnid_open: set_lk_detect: %s", db_strerror(rc));
goto fail_lock;
}
+#endif /* CNID_DB_CDB */
-#if DB_VERSION_MINOR > 1
+#ifndef CNID_DB_CDB
+#if DB_VERSION_MAJOR >= 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 1)
+#if 0
/* Take care of setting the DB_TXN_NOSYNC flag in db3 > 3.1.x. */
if ((rc = db->dbenv->set_flags(db->dbenv, DB_TXN_NOSYNC, 1)) != 0) {
LOG(log_error, logtype_default, "cnid_open: set_flags: %s", db_strerror(rc));
goto fail_lock;
}
+#endif
#endif /* DB_VERSION_MINOR > 1 */
+#endif /* CNID_DB_CDB */
/* Open the database environment. */
- if ((rc = db->dbenv->open(db->dbenv, path, DBOPTIONS | DBEXTRAS, 0666)) != 0) {
+ if ((rc = db->dbenv->open(db->dbenv, path, DBOPTIONS, 0666 & ~mask)) != 0) {
if (rc == DB_RUNRECOVERY) {
/* This is the mother of all errors. We _must_ fail here. */
LOG(log_error, logtype_default, "cnid_open: CATASTROPHIC ERROR opening database environment %s. Run db_recovery -c immediately", path);
/* We can't get a full transactional environment, so multi-access
* is out of the question. Let's assume a read-only environment,
* and try to at least get a shared memory pool. */
- if ((rc = db->dbenv->open(db->dbenv, path, DB_INIT_MPOOL, 0666)) != 0) {
+ if ((rc = db->dbenv->open(db->dbenv, path, DB_INIT_MPOOL, 0666 & ~mask)) != 0) {
/* Nope, not a MPOOL, either. Last-ditch effort: we'll try to
* open the environment with no flags. */
- if ((rc = db->dbenv->open(db->dbenv, path, 0, 0666)) != 0) {
+ if ((rc = db->dbenv->open(db->dbenv, path, 0, 0666 & ~mask)) != 0) {
LOG(log_error, logtype_default, "cnid_open: dbenv->open of %s failed: %s",
- path, db_strerror(rc));
+ path, db_strerror(rc));
goto fail_lock;
}
}
LOG(log_info, logtype_default, "cnid_open: Obtained read-only database environment %s", path);
}
- /* If we have the recovery lock, close the file, remove it, so other
- * clients can proceed opening the DB environment. */
- if (rfd > -1) {
- (void)remove(recover_file);
- switch(errno) {
- case 0:
- case ENOENT:
- break;
- default:
- LOG(log_error, logtype_default, "cnid_open: Unable to remove %s: %s",
- recover_file, strerror(errno));
- }
- close(rfd);
- rfd = -1;
- }
-
/* did/name reverse mapping. We use a BTree for this one. */
if ((rc = db_create(&db->db_didname, db->dbenv, 0)) != 0) {
LOG(log_error, logtype_default, "cnid_open: Failed to create did/name database: %s",
- db_strerror(rc));
+ db_strerror(rc));
goto fail_appinit;
}
- db->db_didname->set_bt_compare(db->db_didname, &compare_unix);
+ /*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))) {
+#else
if ((rc = db->db_didname->open(db->db_didname, DBDIDNAME, NULL,
- DB_BTREE, open_flag, 0666))) {
+ DB_HASH, open_flag, 0666 & ~mask))) {
+#endif /* DB_VERSION_MAJOR >= 4 */
LOG(log_error, logtype_default, "cnid_open: Failed to open did/name database: %s",
- db_strerror(rc));
+ db_strerror(rc));
goto fail_appinit;
}
key.data = DBVERSION_KEY;
key.size = DBVERSION_KEYLEN;
+#ifdef CNID_DB_CDB
+ if ((rc = db->db_didname->get(db->db_didname, NULL, &key, &data, 0)) != 0) {
+ int ret;
+ {
+ u_int32_t version = htonl(DBVERSION);
+
+ data.data = &version;
+ data.size = sizeof(version);
+ }
+ if ((ret = db->db_didname->put(db->db_didname, NULL, &key, &data,
+ DB_NOOVERWRITE))) {
+ LOG(log_error, logtype_default, "cnid_open: Error putting new version: %s",
+ db_strerror(ret));
+ db->db_didname->close(db->db_didname, 0);
+ goto fail_appinit;
+ }
+ }
+#else /* CNID_DB_CDB */
dbversion_retry:
if ((rc = txn_begin(db->dbenv, NULL, &tid, 0)) != 0) {
LOG(log_error, logtype_default, "cnid_open: txn_begin: failed to check db version: %s",
- db_strerror(rc));
+ db_strerror(rc));
db->db_didname->close(db->db_didname, 0);
goto fail_appinit;
}
if (ret == DB_LOCK_DEADLOCK) {
if ((ret = txn_abort(tid)) != 0) {
LOG(log_error, logtype_default, "cnid_open: txn_abort: %s",
- db_strerror(ret));
+ db_strerror(ret));
db->db_didname->close(db->db_didname, 0);
goto fail_appinit;
}
}
else if (ret == DB_RUNRECOVERY) {
/* At this point, we don't care if the transaction aborts
- * successfully or not. */
+ * successfully or not. */
txn_abort(tid);
LOG(log_error, logtype_default, "cnid_open: Error putting new version: %s",
- db_strerror(ret));
+ db_strerror(ret));
db->db_didname->close(db->db_didname, 0);
goto fail_appinit;
}
default:
txn_abort(tid);
LOG(log_error, logtype_default, "cnid_open: Failed to check db version: %s",
- db_strerror(rc));
+ db_strerror(rc));
db->db_didname->close(db->db_didname, 0);
goto fail_appinit;
}
if ((rc = txn_commit(tid, 0)) != 0) {
LOG(log_error, logtype_default, "cnid_open: Failed to commit db version: %s",
- db_strerror(rc));
+ db_strerror(rc));
db->db_didname->close(db->db_didname, 0);
goto fail_appinit;
}
+#endif /* CNID_DB_CDB */
/* TODO In the future we might check for version number here. */
#if 0
/* did/macname (31 character) mapping. Use a BTree for this one. */
if ((rc = db_create(&db->db_macname, db->dbenv, 0)) != 0) {
LOG(log_error, logtype_default, "cnid_open: Failed to create did/macname database: %s",
- db_strerror(rc));
+ db_strerror(rc));
db->db_didname->close(db->db_didname, 0);
goto fail_appinit;
}
db->db_macname->set_bt_compare(db->db_macname, &compare_mac);
- if ((rc = db->db_macname->open(db->db_macname, DBMACNAME, NULL, DB_BTREE, open_flag, 0666)) != 0) {
+#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
+ if ((rc = db->db_macname->open(db->db_macname, NULL, DBMACNAME, NULL, DB_BTREE, open_flag | DB_AUTO_COMMIT, 0666 & ~mask)) != 0) {
+#else
+ if ((rc = db->db_macname->open(db->db_macname, DBMACNAME, NULL, DB_BTREE, open_flag, 0666 & ~mask)) != 0) {
+#endif /* DB_VERSION_MAJOR >= 4 */
LOG(log_error, logtype_default, "cnid_open: Failed to open did/macname database: %s",
- db_strerror(rc));
+ db_strerror(rc));
db->db_didname->close(db->db_didname, 0);
goto fail_appinit;
}
/* did/shortname (DOS 8.3) mapping. Use a BTree for this one. */
if ((rc = db_create(&db->db_shortname, db->dbenv, 0)) != 0) {
LOG(log_error, logtype_default, "cnid_open: Failed to create did/shortname database: %s",
- db_strerror(rc));
+ db_strerror(rc));
db->db_didname->close(db->db_didname, 0);
db->db_macname->close(db->db_macname, 0);
goto fail_appinit;
}
db->db_shortname->set_bt_compare(db->db_shortname, &compare_mac);
- if ((rc = db->db_shortname->open(db->db_shortname, DBSHORTNAME, NULL, DB_BTREE, open_flag, 0666)) != 0) {
+#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
+ if ((rc = db->db_shortname->open(db->db_shortname, NULL, DBSHORTNAME, NULL, DB_BTREE, open_flag | DB_AUTO_COMMIT, 0666 & ~mask)) != 0) {
+#else
+ if ((rc = db->db_shortname->open(db->db_shortname, DBSHORTNAME, NULL, DB_BTREE, open_flag, 0666 & ~mask)) != 0) {
+#endif /* DB_VERSION_MAJOR >= 4 */
LOG(log_error, logtype_default, "cnid_open: Failed to open did/shortname database: %s",
- db_strerror(rc));
+ db_strerror(rc));
db->db_didname->close(db->db_didname, 0);
db->db_macname->close(db->db_macname, 0);
goto fail_appinit;
/* did/longname (Unicode) mapping. Use a BTree for this one. */
if ((rc = db_create(&db->db_longname, db->dbenv, 0)) != 0) {
LOG(log_error, logtype_default, "cnid_open: Failed to create did/longname database: %s",
- db_strerror(rc));
+ db_strerror(rc));
db->db_didname->close(db->db_didname, 0);
db->db_macname->close(db->db_macname, 0);
db->db_shortname->close(db->db_shortname, 0);
}
db->db_longname->set_bt_compare(db->db_longname, &compare_unicode);
- if ((rc = db->db_longname->open(db->db_longname, DBLONGNAME, NULL, DB_BTREE, open_flag, 0666)) != 0) {
+#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
+ if ((rc = db->db_longname->open(db->db_longname, NULL, DBLONGNAME, NULL, DB_BTREE, open_flag | DB_AUTO_COMMIT, 0666 & ~mask)) != 0) {
+#else
+ if ((rc = db->db_longname->open(db->db_longname, DBLONGNAME, NULL, DB_BTREE, open_flag, 0666 & ~mask)) != 0) {
+#endif /* DB_VERSION_MAJOR >= 4 */
LOG(log_error, logtype_default, "cnid_open: Failed to open did/longname database: %s",
- db_strerror(rc));
+ db_strerror(rc));
db->db_didname->close(db->db_didname, 0);
db->db_macname->close(db->db_macname, 0);
db->db_shortname->close(db->db_shortname, 0);
/* dev/ino reverse mapping. Use a hash for this one. */
if ((rc = db_create(&db->db_devino, db->dbenv, 0)) != 0) {
LOG(log_error, logtype_default, "cnid_open: Failed to create dev/ino database: %s",
- db_strerror(rc));
+ db_strerror(rc));
db->db_didname->close(db->db_didname, 0);
#ifdef EXTENDED_DB
db->db_macname->close(db->db_macname, 0);
goto fail_appinit;
}
- if ((rc = db->db_devino->open(db->db_devino, DBDEVINO, NULL, DB_HASH, open_flag, 0666)) != 0) {
+#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
+ if ((rc = db->db_devino->open(db->db_devino, NULL, DBDEVINO, NULL, DB_HASH, open_flag | DB_AUTO_COMMIT, 0666 & ~mask)) != 0) {
+#else
+ if ((rc = db->db_devino->open(db->db_devino, DBDEVINO, NULL, DB_HASH, open_flag, 0666 & ~mask)) != 0) {
+#endif /* DB_VERSION_MAJOR >= 4 */
LOG(log_error, logtype_default, "cnid_open: Failed to open devino database: %s",
- db_strerror(rc));
+ db_strerror(rc));
db->db_didname->close(db->db_didname, 0);
#ifdef EXTENDED_DB
db->db_macname->close(db->db_macname, 0);
/* Main CNID database. Use a hash for this one. */
if ((rc = db_create(&db->db_cnid, db->dbenv, 0)) != 0) {
LOG(log_error, logtype_default, "cnid_open: Failed to create cnid database: %s",
- db_strerror(rc));
+ db_strerror(rc));
db->db_didname->close(db->db_didname, 0);
#ifdef EXTENDED_DB
db->db_macname->close(db->db_macname, 0);
}
- if ((rc = db->db_cnid->open(db->db_cnid, DBCNID, NULL, DB_HASH, open_flag, 0666)) != 0) {
+#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
+ if ((rc = db->db_cnid->open(db->db_cnid, NULL, DBCNID, NULL, DB_HASH, open_flag | DB_AUTO_COMMIT, 0666 & ~mask)) != 0) {
+#else
+ if ((rc = db->db_cnid->open(db->db_cnid, DBCNID, NULL, DB_HASH, open_flag, 0666 & ~mask)) != 0) {
+#endif /* DB_VERSION_MAJOR >= 4 */
LOG(log_error, logtype_default, "cnid_open: Failed to open dev/ino database: %s",
- db_strerror(rc));
+ db_strerror(rc));
db->db_didname->close(db->db_didname, 0);
#ifdef EXTENDED_DB
db->db_macname->close(db->db_macname, 0);
db->db_shortname->close(db->db_shortname, 0);
db->db_longname->close(db->db_longname, 0);
#endif /* EXTENDED_DB */
+ db->db_devino->close(db->db_devino, 0);
goto fail_appinit;
}
+#ifdef FILE_MANGLING
+ /* filename mangling database. Use a hash for this one. */
+ if ((rc = db_create(&db->db_mangle, db->dbenv, 0)) != 0) {
+ LOG(log_error, logtype_default, "cnid_open: Failed to create mangle database: %s", db_strerror(rc));
+ db->db_didname->close(db->db_didname, 0);
+ db->db_devino->close(db->db_devino, 0);
+ db->db_cnid->close(db->db_cnid, 0);
+#ifdef EXTENDED_DB
+ db->db_macname->close(db->db_macname, 0);
+ db->db_shortname->close(db->db_shortname, 0);
+ db->db_longname->close(db->db_longname, 0);
+#endif /* EXTENDED_DB */
+ goto fail_appinit;
+ }
+
+#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
+ if ((rc = db->db_mangle->open(db->db_mangle, NULL, DBMANGLE, NULL, DB_HASH, open_flag | DB_AUTO_COMMIT, 0666 & ~mask)) != 0) {
+#else
+ if ((rc = db->db_mangle->open(db->db_mangle, DBMANGLE, NULL, DB_HASH, open_flag, 0666 & ~mask)) != 0) {
+#endif /* DB_VERSION_MAJOR >= 4 */
+ LOG(log_error, logtype_default, "cnid_open: Failed to open mangle database: %s", db_strerror(rc));
+ db->db_didname->close(db->db_didname, 0);
+ db->db_devino->close(db->db_devino, 0);
+ db->db_cnid->close(db->db_cnid, 0);
+#ifdef EXTENDED_DB
+ db->db_macname->close(db->db_macname, 0);
+ db->db_shortname->close(db->db_shortname, 0);
+ db->db_longname->close(db->db_longname, 0);
+#endif /* EXTENDED_DB */
+ goto fail_appinit;
+ }
+#endif /* FILE_MANGLING */
+
+ /* 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));
+
return db;
fail_appinit:
db->dbenv->close(db->dbenv, 0);
fail_lock:
+#ifndef CNID_DB_CDB
if (db->lockfd > -1) {
close(db->lockfd);
+ (void)remove(db->lock_file);
}
- if (rfd > -1) {
- (void)remove(recover_file);
- close(rfd);
- }
+#endif /* CNID_DB_CDB */
fail_adouble:
projects / netatalk.git / blobdiff