]> arthur.barton.de Git - netatalk.git/blobdiff - libatalk/cnid/cnid_open.c
Re-added code to enable on-the-fly database recovery. This was originally
[netatalk.git] / libatalk / cnid / cnid_open.c
index bcbd8786ae044d3a0473c44ecb564508c18ddc20..2207a55a28e6fdd7cdafb805fc3c0dd9a4f595eb 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_open.c,v 1.13 2001-09-27 15:51:27 jmarcus Exp $
+ * $Id: cnid_open.c,v 1.17 2001-11-04 17:34:15 jmarcus Exp $
  *
  * Copyright (c) 1999. Adrian Sun (asun@zoology.washington.edu)
  * All Rights Reserved. See COPYRIGHT.
 #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_TXN_NOSYNC)
+DB_INIT_LOG | DB_INIT_TXN)
 #endif /* DB_VERSION_MINOR */
 
 #define MAXITER     0xFFFF /* maximum number of simultaneously open CNID
-                           * databases. */
+                            * databases. */
 
 /* the first compare that's always done. */
 static __inline__ int compare_did(const DBT *a, const DBT *b)
@@ -149,7 +151,7 @@ static int compare_mac(const DBT *a, const DBT *b)
   sb = (u_int8_t *) b->data + 4;
   for (len = MIN(a->size, b->size); len-- > 4; sa++, sb++)
     if ((ret = (_diacasemap[*sa] - _diacasemap[*sb])))
-         return ret; /* sort by lexical ordering */
+      return ret; /* sort by lexical ordering */
 
   return a->size - b->size; /* sort by length */
 }
@@ -163,240 +165,357 @@ static int compare_unicode(const DBT *a, const DBT *b)
 #endif /* DB_VERSION_MINOR */
 {
 #if DB_VERSION_MINOR > 1
-       return compare_mac(db,a,b);
+    return compare_mac(db,a,b);
 #else /* DB_VERSION_MINOR < 1 */
-       return compare_mac(a,b);
+    return compare_mac(a,b);
 #endif /* DB_VERSION_MINOR */
 }
 
-void *cnid_open(const char *dir)
-{
-  struct stat st;
-  struct flock lock;
-  char path[MAXPATHLEN + 1];
-  CNID_private *db;
-  DBT key, data;
-  int open_flag, len;
-  int rc = 0;
-
-  if (!dir)
-    return NULL;
-
-  /* this checks .AppleDB */
-  if ((len = strlen(dir)) > (MAXPATHLEN - DBLEN - 1)) {
-    syslog(LOG_ERR, "cnid_open: path too large");
-    return NULL;
-  }
-  
-  if ((db = (CNID_private *) calloc(1, sizeof(CNID_private))) == NULL) {
-    syslog(LOG_ERR, "cnid_open: unable to allocate memory");
-    return NULL;
-  }
-  db->magic = CNID_DB_MAGIC;
-
-  strcpy(path, dir);
-  if (path[len - 1] != '/') {
-    strcat(path, "/");
-    len++;
-  }
-
-  lock.l_type = F_WRLCK;
-  lock.l_whence = SEEK_SET;
-
-mkdir_appledb:
-  strcpy(path + len, DBHOME);
-  if ((stat(path, &st) < 0) && (ad_mkdir(path, 0777) < 0)) {
-    syslog(LOG_ERR, "cnid_open: mkdir failed");
-    goto fail_adouble;
-  }
-
-  /* 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 same directory. */
-  strcat(path, DBLOCKFILE);
-  if ((db->lockfd = open(path, O_RDWR | O_CREAT, 0666)) > -1) {
-    lock.l_start = 0;
-    lock.l_len = 1;
-    while (fcntl(db->lockfd, F_SETLK, &lock) < 0) {
-      if (++lock.l_start > MAXITER) {
-       syslog(LOG_INFO, "cnid_open: can't establish logfile cleanup lock.");
-       close(db->lockfd);
-       db->lockfd = -1;
-       break;
-      }
-    }
-  }
-
-  path[len + DBHOMELEN] = '\0';
-  open_flag = DB_CREATE;
-  /* try a full-blown transactional environment */
-  if (db_env_create(&db->dbenv, 0)) {
-    syslog(LOG_ERR, "cnid_open: db_env_create failed");
-    goto fail_lock;
-  }
-
-  /* Setup internal deadlock detection. */
-  if ((rc = db->dbenv->set_lk_detect(db->dbenv, DB_LOCK_DEFAULT)) != 0) {
-    syslog(LOG_ERR, "cnid_open: set_lk_detect failed (%d)", rc);
-    goto fail_lock;
-  }
+void *cnid_open(const char *dir) {
+       struct stat st;
+       struct flock lock;
+       char path[MAXPATHLEN + 1];
+       CNID_private *db;
+       DBT key, data;
+       DB_TXN *tid;
+       u_int32_t DBEXTRAS = 0;
+       int open_flag, len;
+       int rc;
+
+       if (!dir) {
+               return NULL;
+       }
+
+       /* this checks .AppleDB */
+       if ((len = strlen(dir)) > (MAXPATHLEN - DBLEN - 1)) {
+               syslog(LOG_ERR, "cnid_open: Pathname too large: %s", dir);
+               return NULL;
+       }
+
+       if ((db = (CNID_private *)calloc(1, sizeof(CNID_private))) == NULL) {
+               syslog(LOG_ERR, "cnid_open: Unable to allocate memory for database");
+               return NULL;
+       }
+
+       db->magic = CNID_DB_MAGIC;
+
+       strcpy(path, dir);
+       if (path[len - 1] != '/') {
+               strcat(path, "/");
+               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)) {
+               syslog(LOG_ERR, "cnid_open: DBHOME mkdir failed");
+               goto fail_adouble;
+       }
+
+       /* 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) {
+               lock.l_start = 0;
+               lock.l_len = 1;
+               while (fcntl(db->lockfd, F_SETLK, &lock) < 0) {
+                       if (++lock.l_start > MAXITER) {
+                               syslog(LOG_INFO, "cnid_open: Cannot establish logfile cleanup lock (lock failed)");
+                               close(db->lockfd);
+                               db->lockfd = -1;
+                               break;
+                       }
+               }
+       }
+       else {
+               syslog(LOG_INFO, "cnid_open: Cannot establish logfile cleanup lock (open() failed)");
+       }
+       
+       if (db->lockfd > -1 && lock.l_start == 0) {
+               /* We test to see if we have exclusive database access.  If we do, we
+                * will open the database with the DB_RECOVER flag.
+                */
+#ifdef DEBUG
+               syslog(LOG_INFO, "cnid_open: Opening database with DB_RECOVER flag");
+#endif
+               DBEXTRAS |= DB_RECOVER;
+       }
+
+
+       path[len + DBHOMELEN] = '\0';
+       open_flag = DB_CREATE;
+
+       /* 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. */
+       if ((rc = db_env_create(&db->dbenv, 0)) != 0) {
+               syslog(LOG_ERR, "cnid_open: db_env_create: %s", db_strerror(rc));
+               goto fail_lock;
+       }
+
+       /* Setup internal deadlock detection. */
+       if ((rc = db->dbenv->set_lk_detect(db->dbenv, DB_LOCK_DEFAULT)) != 0) {
+               syslog(LOG_ERR, "cnid_open: set_lk_detect: %s", db_strerror(rc));
+               goto fail_lock;
+       }
 
 #if DB_VERSION_MINOR > 1
-  /* Take care of setting the NOSYNC flag in db3 > 3.1.x. */
-  if ((rc = db->dbenv->set_flags(db->dbenv, DB_TXN_NOSYNC, 1)) != 0 ) {
-         syslog(LOG_ERR, "cnid_open: set_flags failed (%d)", rc);
-         goto fail_lock;
-  }
+       /* 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) {
+               syslog(LOG_ERR, "cnid_open: set_flags: %s", db_strerror(rc));
+               goto fail_lock;
+       }*/
 #endif /* DB_VERSION_MINOR > 1 */
 
-  /* Check to see if a DBENV already exists.  If it does, join it. */
-/*  if (db->dbenv->open(db->dbenv, path, DB_JOINENV, 0666)) {*/
-  if (db->dbenv->open(db->dbenv, path, DBOPTIONS, 0666)) {
+       /* Open the database environment. */
+       if ((rc = db->dbenv->open(db->dbenv, path, DBOPTIONS | DBEXTRAS, 0666)) != 0) {
+               if (rc == DB_RUNRECOVERY) {
+                       /* This is the mother of all errors.  We _must_ fail here. */
+                       syslog(LOG_ERR, "cnid_open: CATASTROPHIC ERROR opening database environment.  Run db_recovery -c immediately");
+                       goto fail_lock;
+               }
+
+               /* We can't get a full transactional environment, so multi-access
+                * is out of the question.  Let's assume a read-only environment,
+                * and trry to at least get a shared memory pool. */
+               if ((rc = db->dbenv->open(db->dbenv, path, DB_INIT_MPOOL, 0666)) != 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) {
+                               syslog(LOG_ERR, "cnid_open: dbenv->open of %s failed: %s",
+                                      path, db_strerror(rc));
+                               goto fail_lock;
+                       }
+               }
+               db->flags |= CNIDFLAG_DB_RO;
+               open_flag = DB_RDONLY;
+               syslog(LOG_INFO, "cnid_open: Obtained read-only database environment");
+       }
 
-    /* try with a shared memory pool */
-       if (db->dbenv->open(db->dbenv, path, DB_INIT_MPOOL, 0666)) {
+       /* did/name reverse mapping.  We use a BTree for this one. */
+       if ((rc = db_create(&db->db_didname, db->dbenv, 0)) != 0) {
+               syslog(LOG_ERR, "cnid_open: Failed to create did/name database: %s", 
+                      db_strerror(rc));
+               goto fail_appinit;
+       }
 
-      /* try without any options. */
-      if (db->dbenv->open(db->dbenv, path, 0, 0666)) {
-               syslog(LOG_ERR, "cnid_open: db_env_open failed");
-               goto fail_lock;
-      }
-    }
-    db->flags |= CNIDFLAG_DB_RO;
-    open_flag = DB_RDONLY;
-    syslog(LOG_INFO, "cnid_open: read-only CNID database");
-  }
-  /*}*/
-
-
-  /* did/name reverse mapping. we use a btree for this one. */
-  if (db_create(&db->db_didname, db->dbenv, 0))
-       goto fail_appinit;
-
-  db->db_didname->set_bt_compare(db->db_didname, &compare_unix);
-  if (db->db_didname->open(db->db_didname, DBDIDNAME, NULL, DB_BTREE, open_flag, 0666)) {
-    goto fail_appinit;
-  }
-
-  /* check for version. this way we can update the database if we need
-     to change the format in any way. */
-  memset(&key, 0, sizeof(key));
-  memset(&data, 0, sizeof(data));
-  key.data = DBVERSION_KEY;
-  key.size = DBVERSION_KEYLEN;
-  while ((rc = db->db_didname->get(db->db_didname, NULL, &key, &data, 0))) {
-    switch (rc) {
-       case DB_LOCK_DEADLOCK:
-      continue;
-
-    case DB_NOTFOUND:
-       {
-      u_int32_t version = htonl(DBVERSION);
-
-      data.data = &version;
-      data.size = sizeof(version);
+       db->db_didname->set_bt_compare(db->db_didname, &compare_unix);
+       if ((rc = db->db_didname->open(db->db_didname, DBDIDNAME, NULL,
+                DB_BTREE, open_flag, 0666))) {
+               syslog(LOG_ERR, "cnid_open: Failed to open did/name database: %s",
+                      db_strerror(rc));
+               goto fail_appinit;
        }
+
+       /* Check for version.  This way we can update the database if we need
+        * to change the format in any way. */
+       memset(&key, 0, sizeof(key));
+       memset(&data, 0, sizeof(data));
+       key.data = DBVERSION_KEY;
+       key.size = DBVERSION_KEYLEN;
+
 dbversion_retry:
-      if ((rc = db->db_didname->put(db->db_didname, NULL, &key, &data,
-                             DB_NOOVERWRITE)))
-               if (rc == DB_LOCK_DEADLOCK)
-                       goto dbversion_retry;
-      break;
-    default:
-      /* uh oh. something bad happened. bail. */
-      db->db_didname->close(db->db_didname, 0);
-      goto fail_appinit;
-    }
-  }
-
-  /* XXX: in the future, we might check for version number here. */
+       if ((rc = txn_begin(db->dbenv, NULL, &tid, 0)) != 0) {
+               syslog(LOG_ERR, "cnid_open: txn_begin: failed to check db version: %s",
+                      db_strerror(rc));
+               db->db_didname->close(db->db_didname, 0);
+               goto fail_appinit;
+       }
+
+       while ((rc = db->db_didname->get(db->db_didname, tid, &key, &data, DB_RMW))) {
+               int ret;
+               switch (rc) {
+                       case DB_LOCK_DEADLOCK:
+                               if ((ret = txn_abort(tid)) != 0) {
+                                       syslog(LOG_ERR, "cnid_open: txn_abort: %s", db_strerror(ret));
+                                       db->db_didname->close(db->db_didname, 0);
+                                       goto fail_appinit;
+                               }
+                               goto dbversion_retry;
+                       case DB_NOTFOUND:
+                       {
+                               u_int32_t version = htonl(DBVERSION);
+
+                               data.data = &version;
+                               data.size = sizeof(version);
+                       }
+
+                       if ((ret = db->db_didname->put(db->db_didname, tid, &key, &data,
+                                     DB_NOOVERWRITE))) {
+                               if (ret == DB_LOCK_DEADLOCK) {
+                                       if ((ret = txn_abort(tid)) != 0) {
+                                               syslog(LOG_ERR, "cnid_open: txn_abort: %s",
+                                                      db_strerror(ret));
+                                               db->db_didname->close(db->db_didname, 0);
+                                               goto fail_appinit;
+                                       }
+                                       goto dbversion_retry;
+                               }
+                               else if (ret == DB_RUNRECOVERY) {
+                                       /* At this point, we don't care if the transaction aborts
+                                        * successfully or not. */
+                                       txn_abort(tid);
+                                       syslog(LOG_ERR, "cnid_open: Error putting new version: %s",
+                                              db_strerror(ret));
+                                       db->db_didname->close(db->db_didname, 0);
+                                       goto fail_appinit;
+                               }
+                       }
+                               break; /* while loop */
+                       default:
+                               txn_abort(tid);
+                               syslog(LOG_ERR, "cnid_open: Failed to check db version: %s",
+                                      db_strerror(rc));
+                               db->db_didname->close(db->db_didname, 0);
+                               goto fail_appinit;
+               }
+       }
+
+       if ((rc = txn_commit(tid, 0)) != 0) {
+               syslog(LOG_ERR, "cnid_open: Failed to commit db version: %s",
+                      db_strerror(rc));
+               db->db_didname->close(db->db_didname, 0);
+               goto fail_appinit;
+       }
+
+       /* TODO In the future we might check for version number here. */
 #if 0
-  memcpy(&version, data.data, sizeof(version));
-  if (version != htonl(DBVERSION)) {
-    /* fix up stuff */
-  }
+       memcpy(&version, data.data, sizeof(version));
+       if (version != ntohl(DBVERSION)) {
+               /* Do stuff here. */
+       }
 #endif /* 0 */
 
 #ifdef EXTENDED_DB
-  /* did/macname mapping. btree this one. */
-  if (db_create(&db->db_macname, db->dbenv, 0))
-    goto fail_appinit;
-
-  db->db_macname->set_bt_compare(db->db_macname, &compare_mac);
-  if (db->db_macname->open(db->db_macname, DBMACNAME, NULL, DB_BTREE, open_flag, 0666)) {
-    db->db_didname->close(db->db_didname, 0);
-    goto fail_appinit;
-  }
-
-  /* did/shortname mapping */
-  if (db_create(&db->db_shortname, db->dbenv, 0))
-    goto fail_appinit;
-
-  db->db_shortname->set_bt_compare(db->db_shortname, &compare_mac);
-  if (db->db_shortname->open(db->db_shortname, DBSHORTNAME, NULL, DB_BTREE, open_flag, 0666)) {
-    db->db_didname->close(db->db_didname, 0);
-    db->db_macname->close(db->db_macname, 0);
-    goto fail_appinit;
-  }
-
-  /* did/longname mapping */
-  if (db_create(&db->db_longname, db->dbenv, 0))
-    goto fail_appinit;
-
-  db->db_longname->set_bt_compare(db->db_longname, &compare_unicode);
-  if (db->db_longname->open(db->db_longname, DBLONGNAME, NULL, DB_BTREE, open_flag, 0666)) {
-    db->db_didname->close(db->db_didname, 0);
-    db->db_macname->close(db->db_macname, 0);
-    db->db_shortname->close(db->db_shortname, 0);
-    goto fail_appinit;
-  }
+       /* did/macname (31 character) mapping.  Use a BTree for this one. */
+       if ((rc = db_create(&db->db_macname, db->dbenv, 0)) != 0) {
+               syslog(LOG_ERR, "cnid_open: Failed to create did/macname database: %s",
+                      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) {
+               syslog(LOG_ERR, "cnid_open: Failed to open did/macname database: %s",
+                      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) {
+               syslog(LOG_ERR, "cnid_open: Failed to create did/shortname database: %s",
+                      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) {
+               syslog(LOG_ERR, "cnid_open: Failed to open did/shortname database: %s",
+                      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) {
+               syslog(LOG_ERR, "cnid_open: Failed to create did/longname database: %s",
+                      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);
+               goto fail_appinit;
+       }
+
+       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) {
+               syslog(LOG_ERR, "cnid_open: Failed to open did/longname database: %s",
+                      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);
+               goto fail_appinit;
+       }
 #endif /* EXTENDED_DB */
 
-  /* dev/ino reverse mapping. we hash this one. */
-  if (db_create(&db->db_devino, db->dbenv, 0))
-    goto fail_appinit;
+       /* dev/ino reverse mapping.  Use a hash for this one. */
+       if ((rc = db_create(&db->db_devino, db->dbenv, 0)) != 0) {
+               syslog(LOG_ERR, "cnid_open: Failed to create dev/ino database: %s",
+                      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 */
+               goto fail_appinit;
+       }
 
-  if (db->db_devino->open(db->db_devino, DBDEVINO, NULL, DB_HASH, open_flag, 0666)) {
-    db->db_didname->close(db->db_didname, 0);
+       if ((rc = db->db_devino->open(db->db_devino, DBDEVINO, NULL, DB_HASH, open_flag, 0666)) != 0) {
+               syslog(LOG_ERR, "cnid_open: Failed to open devino database: %s",
+                      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);
+               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;
-  }
+               goto fail_appinit;
+       }
 
-  /* main cnid database. we hash this one as well. */
-  if (db_create(&db->db_cnid, db->dbenv, 0))
-    goto fail_appinit;
+       /* Main CNID database.  Use a hash for this one. */
+       if ((rc = db_create(&db->db_cnid, db->dbenv, 0)) != 0) {
+               syslog(LOG_ERR, "cnid_open: Failed to create cnid database: %s",
+                      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;
+       }
 
-  if (db->db_cnid->open(db->db_cnid, DBCNID, NULL, DB_HASH, open_flag, 0666)) {
-    db->db_didname->close(db->db_didname, 0);
+
+       if ((rc = db->db_cnid->open(db->db_cnid, DBCNID, NULL, DB_HASH, open_flag, 0666)) != 0) {
+               syslog(LOG_ERR, "cnid_open: Failed to open dev/ino database: %s",
+                      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);
+               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;
-  }
+               goto fail_appinit;
+       }
 
-  return db;
+       return db;
 
 fail_appinit:
-  syslog(LOG_ERR, "cnid_open: db_open failed");
-  db->dbenv->close(db->dbenv, 0);
+       syslog(LOG_ERR, "cnid_open: Failed to setup CNID DB environment");
+       db->dbenv->close(db->dbenv, 0);
 
 fail_lock:
-  if (db->lockfd > -1)
-    close(db->lockfd);
+       if (db->lockfd > -1) {
+               close(db->lockfd);
+       }
 
 fail_adouble:
 
 fail_db:
-  free(db);
-  return NULL;
+       free(db);
+       return NULL;
 }
 #endif /* CNID_DB */
+
+