X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libatalk%2Fcnid%2Fcnid_resolve.c;h=86bc4789792bc7ae60e5645a1d753907847c58bb;hb=2726bc50a91ff4fc06813edaab91e3596df37e8f;hp=c542a4ed31e4a00b2b0cc64d61d4c6d5b96d3b74;hpb=ae1170c11a624cd35a8acde26917814ff6184853;p=netatalk.git diff --git a/libatalk/cnid/cnid_resolve.c b/libatalk/cnid/cnid_resolve.c index c542a4ed..86bc4789 100644 --- a/libatalk/cnid/cnid_resolve.c +++ b/libatalk/cnid/cnid_resolve.c @@ -1,5 +1,5 @@ /* - * $Id: cnid_resolve.c,v 1.12 2002-03-24 17:43:42 jmarcus Exp $ + * $Id: cnid_resolve.c,v 1.13 2002-08-30 03:12:52 jmarcus Exp $ */ #ifdef HAVE_CONFIG_H @@ -41,9 +41,11 @@ char *cnid_resolve(void *CNID, cnid_t *id, void *buffer, u_int32_t len) { key.data = id; key.size = sizeof(cnid_t); while ((rc = db->db_cnid->get(db->db_cnid, NULL, &key, &data, 0))) { +#ifndef CNID_DB_CDB if (rc == DB_LOCK_DEADLOCK) { continue; } +#endif /* CNID_DB_CDB */ if (rc != DB_NOTFOUND) { LOG(log_error, logtype_default, "cnid_resolve: Unable to get did/name: %s",