library versioning: update to 16:0:0

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

diff --git a/etc/cnid_dbd/dbd_search.c b/etc/cnid_dbd/dbd_search.c
index 5190c24b12949b66fc83ae66ad221c6ea7a6e1c6..685eef67d594cbb2ef191f85c1fc2af9c454d404 100644 (file)
--- a/etc/cnid_dbd/dbd_search.c
+++ b/etc/cnid_dbd/dbd_search.c
@@ -9,9 +9,10 @@
 
 #include <string.h>
 #include <errno.h>
-#include <netatalk/endian.h>
+#include <arpa/inet.h>
+
 #include <atalk/logger.h>
-#include <atalk/cnid_dbd_private.h>
+#include <atalk/cnid_bdb_private.h>
 
 #include "dbif.h"
 #include "dbd.h"
@@ -20,27 +21,29 @@
 int dbd_search(DBD *dbd, struct cnid_dbd_rqst *rqst, struct cnid_dbd_rply *rply)
 {
     DBT key;
-    int rc;
-    static char resbuf[DBD_MAX_SRCH_RPLY_PAYLOAD];
+    int results;
+    static char resbuf[DBD_MAX_SRCH_RSLTS * sizeof(cnid_t)];
+
+    LOG(log_debug, logtype_cnid, "dbd_search(\"%s\"):", rqst->name);
+
     memset(&key, 0, sizeof(key));
+    rply->name = resbuf;
     rply->namelen = 0;
 
-    key.data = rqst->name;
+    key.data = (char *)rqst->name;
     key.size = rqst->namelen;
 
-    if ((rc = dbif_del(dbd, DBIF_IDX_DEVINO, &key, 0)) < 0) {
-        LOG(log_error, logtype_cnid, "dbd_delete: Unable to delete entry for dev/ino: 0x%llx/0x%llx",
-            (unsigned long long)rqst->dev, (unsigned long long)rqst->ino);
+    if ((results = dbif_search(dbd, &key, resbuf)) < 0) {
+        LOG(log_error, logtype_cnid, "dbd_search(\"%s\"): db error", rqst->name);
         rply->result = CNID_DBD_RES_ERR_DB;
         return -1;
     }
-    if (rc) {
-        LOG(log_debug, logtype_cnid, "cnid_delete: deleted dev/ino: 0x%llx/0x%llx",
-            (unsigned long long)rqst->dev, (unsigned long long)rqst->ino);
+    if (results) {
+        LOG(log_debug, logtype_cnid, "dbd_search(\"%s\"): %d matches", rqst->name, results);
+        rply->namelen = results * sizeof(cnid_t);
         rply->result = CNID_DBD_RES_OK;
     } else {
-        LOG(log_debug, logtype_cnid, "cnid_delete: dev/ino: 0x%llx/0x%llx not in database", 
-            (unsigned long long)rqst->dev, (unsigned long long)rqst->ino);
+        LOG(log_debug, logtype_cnid, "dbd_search(\"%s\"): no matches", rqst->name);
         rply->result = CNID_DBD_RES_NOTFOUND;
     }