use the cnid in adouble header as a hint for dbd add/update

[netatalk.git] / etc / cnid_dbd / dbd_lookup.c

diff --git a/etc/cnid_dbd/dbd_lookup.c b/etc/cnid_dbd/dbd_lookup.c
index bacaed63465e00de8f534efd883837f79e13d8d5..df24cc4c5c5270bddc40688e623e72a88ea8fc79 100644 (file)
--- a/etc/cnid_dbd/dbd_lookup.c
+++ b/etc/cnid_dbd/dbd_lookup.c
@@ -1,5 +1,5 @@
 /*
- * $Id: dbd_lookup.c,v 1.12 2009-11-27 15:45:41 franklahm Exp $
+ * $Id: dbd_lookup.c,v 1.14 2009-11-30 15:27:48 didg Exp $
  *
  * Copyright (C) Joerg Lenneis 2003
  * Copyright (C) Frank Lahm 2009
@@ -241,8 +241,8 @@ int dbd_lookup(DBD *dbd, struct cnid_dbd_rqst *rqst, struct cnid_dbd_rply *rply,
         LOG(log_debug, logtype_cnid, "dbd_lookup(DID:%u/'%s',0x%llx/0x%llx): CNID resolve problem: server side rename oder reused inode",
             ntohl(rqst->did), rqst->name, (unsigned long long)rqst->dev, (unsigned long long)rqst->ino);
         /* Case 2) ? */
-        if (strcmp(rqst->name, (char *)devdata.data + CNID_NAME_OFS) == 0) {
-            LOG(log_debug, logtype_cnid, "dbd_lookup: server side mv from one dir to another");
+        if (rqst->cnid == id_devino) {
+            LOG(log_debug, logtype_cnid, "dbd_lookup: server side mv (with resource fork)");
             update = 1;
         } else {
             if ( ! roflag) {