From: jmarcus <jmarcus>
Date: Sat, 22 Sep 2001 07:12:10 +0000 (+0000)
Subject: Replaced EAGAIN with DB_LOCK_DEADLOCK.
X-Git-Tag: netatalk-1-5-rc1~200
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=commitdiff_plain;h=99ef3462b2cb74f1fb22adeae823b42291ae9d01

Replaced EAGAIN with DB_LOCK_DEADLOCK.
---

diff --git a/ChangeLog b/ChangeLog
index 0f462882..5d4a217a 100644
--- 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 bd775c08..56b6e971 100644
--- 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)