Fix some more CNID DB bugs:

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

diff --git a/libatalk/cnid/cnid_update.c b/libatalk/cnid/cnid_update.c
index 3f007f64772b1401b77e2ae89363298d709a70c5..de812f3a6c4b2d3a6397a79b7ac2dfb700c61f1b 100644 (file)
--- a/libatalk/cnid/cnid_update.c
+++ b/libatalk/cnid/cnid_update.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_update.c,v 1.6 2001-08-31 14:58:48 rufustfirefly Exp $
+ * $Id: cnid_update.c,v 1.9 2001-10-10 02:27:08 jmarcus Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -32,6 +32,7 @@ int cnid_update(void *CNID, const cnid_t id, const struct stat *st,
   CNID_private *db;
   DBT key, data, altdata;
   DB_TXN *tid;
+  int rc = 0;
   
   if (!(db = CNID) || !id || !st || !name || (db->flags & CNIDFLAG_DB_RO))
     return -1;
@@ -42,47 +43,52 @@ int cnid_update(void *CNID, const cnid_t id, const struct stat *st,
 
   /* begin a transaction */
 retry:
-  if ((errno = txn_begin(db->dbenv, NULL, &tid, 0))) {
-    return errno;
+  if ((rc = txn_begin(db->dbenv, NULL, &tid, 0))) {
+       syslog(LOG_ERR, "cnid_update: txn_begin failed with: %d", rc);
+    return rc;
   }
 
   /* get the old info */
   key.data = (cnid_t *) &id;
   key.size = sizeof(id);
-  if ((errno = db->db_cnid->get(db->db_cnid, tid, &key, &data, 0))) {
+  if ((rc = db->db_cnid->get(db->db_cnid, tid, &key, &data, 0))) {
     txn_abort(tid);
-    if (errno == DB_LOCK_DEADLOCK)
+    if (rc == DB_LOCK_DEADLOCK)
       goto retry;
     goto update_err;
   }
 
+
   /* delete the old dev/ino mapping */
+  memset(&key, 0, sizeof(key));
   key.data = data.data;
   key.size = CNID_DEVINO_LEN;
-  if ((errno = db->db_devino->del(db->db_devino, tid, &key, 0))) {
-    if (errno == DB_LOCK_DEADLOCK) {
+  if ((rc = db->db_devino->del(db->db_devino, tid, &key, 0))) {
+    if (rc == DB_LOCK_DEADLOCK) {
       txn_abort(tid);
       goto retry;
     }
 
     /* silently fail on a non-existent entry */
-    if (errno != DB_NOTFOUND) {
+    if (rc != DB_NOTFOUND) {
       txn_abort(tid);
       goto update_err;
     }
   }
 
+
   /* delete the old did/name mapping */
+  memset(&key, 0, sizeof(key));
   key.data = (char *) data.data + CNID_DEVINO_LEN;
   key.size = data.size - CNID_DEVINO_LEN;
-  if ((errno = db->db_didname->del(db->db_didname, tid, &key, 0))) {
-    if (errno == DB_LOCK_DEADLOCK) {
+  if ((rc = db->db_didname->del(db->db_didname, tid, &key, 0))) {
+    if (rc == DB_LOCK_DEADLOCK) {
       txn_abort(tid);
       goto retry;
     }
 
     /* silently fail on a non-existent entry */
-    if (errno != DB_NOTFOUND) {
+    if (rc != DB_NOTFOUND) {
       txn_abort(tid);
       goto update_err;
     }
@@ -92,39 +98,43 @@ retry:
 
 
   /* make a new entry */
+  memset(&data, 0, sizeof(data));
   data.data = make_cnid_data(st, did, name, len);
   data.size = CNID_HEADER_LEN + len + 1;
 
   /* put a new dev/ino mapping in */
+  memset(&key, 0, sizeof(key));
   key.data = data.data;
   key.size = CNID_DEVINO_LEN;
   altdata.data = (cnid_t *) &id;
   altdata.size = sizeof(id);
-  if ((errno = db->db_devino->put(db->db_devino, tid, &key, &altdata, 0))) {
+  if ((rc = db->db_devino->put(db->db_devino, tid, &key, &altdata, 0))) {
     txn_abort(tid);
-    if (errno == DB_LOCK_DEADLOCK) {
+    if (rc == DB_LOCK_DEADLOCK) {
       goto retry;
     }
     goto update_err;
   }
 
   /* put a new did/name mapping in */
+  memset(&key, 0, sizeof(key));
   key.data = (char *) data.data + CNID_DEVINO_LEN;
   key.size = data.size - CNID_DEVINO_LEN;
-  if ((errno = db->db_didname->put(db->db_didname, tid, &key, &altdata, 0))) {
+  if ((rc = db->db_didname->put(db->db_didname, tid, &key, &altdata, 0))) {
     txn_abort(tid);
-    if (errno == DB_LOCK_DEADLOCK) {
+    if (rc == DB_LOCK_DEADLOCK) {
       goto retry;
     }
     goto update_err;
   }
 
   /* update the old CNID with the new info */
+  memset(&key, 0, sizeof(key));
   key.data = (cnid_t *) &id;
   key.size = sizeof(id);
-  if ((errno = db->db_cnid->put(db->db_cnid, tid, &key, &data, 0))) {
+  if ((rc = db->db_cnid->put(db->db_cnid, tid, &key, &data, 0))) {
     txn_abort(tid);
-    if (errno == DB_LOCK_DEADLOCK) {
+    if (rc == DB_LOCK_DEADLOCK) {
       goto retry;
     }
     goto update_err;
@@ -134,7 +144,7 @@ retry:
   return txn_commit(tid, 0);
 
 update_err:
-  syslog(LOG_ERR, "cnid_update: can't update CNID(%x)", id);
+  syslog(LOG_ERR, "cnid_update: can't update CNID(%x) (%d)", id, errno);
   return -1;
 }
 #endif /* CNID_DB */