Replaced EAGAIN with DB_LOCK_DEADLOCK.

diff --git a/ChangeLog b/ChangeLog
index 0f462882c2671c3e14ca32f30704fe352d5ebf8f..5d4a217a4d6cfaf123607895f115861a064af0c6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
 
        * configure.in: Fix db3 compilation on Linux
 
+       * libatalk/cnid/cnid_get.c: Fix another potential deadlock problem by
+       replacing EAGAIN with DB_LOCK_DEADLOCK
+
 2001-09-21  joe c   <marcus@marcuscom.com>
 
        * etc/afpd/desktop.c: Re-enable codepage translations (thanks to

diff --git a/libatalk/cnid/cnid_get.c b/libatalk/cnid/cnid_get.c
index bd775c08fc1823720f6bff113cddeca7dde5cf68..56b6e9710661cd9054d6d7f5169eeb6ef622f461 100644 (file)
--- a/libatalk/cnid/cnid_get.c
+++ b/libatalk/cnid/cnid_get.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_get.c,v 1.6 2001-09-21 15:09:54 jmarcus Exp $
+ * $Id: cnid_get.c,v 1.7 2001-09-22 07:12:10 jmarcus Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -47,7 +47,7 @@ cnid_t cnid_get(void *CNID, const cnid_t did, const char *name,
 
   while ((rc = db->db_didname->get(db->db_didname, NULL,
                                      &key, &data, 0))) {
-    if (rc == EAGAIN) 
+    if (rc == DB_LOCK_DEADLOCK) 
       continue;
 
     if (rc != DB_NOTFOUND)