New MySQL CNID backend

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

diff --git a/etc/cnid_dbd/dbd_get.c b/etc/cnid_dbd/dbd_get.c
index c71ab71594190d67b1bfcf469ef2c55212d2ae82..07d82da2b12698930aad8fc942ecb99189e68d02 100644 (file)
--- a/etc/cnid_dbd/dbd_get.c
+++ b/etc/cnid_dbd/dbd_get.c
@@ -1,5 +1,4 @@
 /*
- * $Id: dbd_get.c,v 1.2 2005-04-28 20:49:48 bfernhomberg Exp $
  *
  * Copyright (C) Joerg Lenneis 2003
  * All Rights Reserved.  See COPYING.
@@ -13,8 +12,9 @@
 #include <sys/param.h>
 #include <atalk/logger.h>
 #include <errno.h>
-#include <netatalk/endian.h>
-#include <atalk/cnid_dbd_private.h>
+#include <arpa/inet.h>
+
+#include <atalk/cnid_bdb_private.h>
 
 
 #include "dbif.h"
@@ -24,7 +24,7 @@
 
 /* Return CNID for a given did/name. */
 
-int dbd_get(struct cnid_dbd_rqst *rqst, struct cnid_dbd_rply *rply)
+int dbd_get(DBD *dbd, struct cnid_dbd_rqst *rqst, struct cnid_dbd_rply *rply)
 {
     char start[CNID_DID_LEN + MAXPATHLEN + 1], *buf;
     DBT key, data;
@@ -43,26 +43,24 @@ int dbd_get(struct cnid_dbd_rqst *rqst, struct cnid_dbd_rply *rply)
     key.data = start;
     key.size = CNID_DID_LEN + rqst->namelen + 1;
 
-    if ((rc = dbif_get(DBIF_IDX_DIDNAME, &key, &data, 0)) < 0) {
+    if ((rc = dbif_get(dbd, DBIF_IDX_DIDNAME, &key, &data, 0)) < 0) {
         LOG(log_error, logtype_cnid, "dbd_get: Unable to get CNID %u, name %s", ntohl(rqst->did), rqst->name);
         rply->result = CNID_DBD_RES_ERR_DB;
         return -1;
     }
 
     if (rc == 0) {
-#ifdef DEBUG
-       LOG(log_info, logtype_cnid, "cnid_get: CNID not found for did %u name %s",
+       LOG(log_debug, logtype_cnid, "cnid_get: CNID not found for did %u name %s",
            ntohl(rqst->did), rqst->name);
-#endif
-        rply->result = CNID_DBD_RES_NOTFOUND;
-        return 1;
+    rply->result = CNID_DBD_RES_NOTFOUND;
+    return 1;
     }
 
     memcpy(&rply->cnid, data.data, sizeof(rply->cnid));
-#ifdef DEBUG
-    LOG(log_info, logtype_cnid, "cnid_get: Returning CNID did %u name %s as %u",
+
+    LOG(log_debug, logtype_cnid, "cnid_get: Returning CNID did %u name %s as %u",
         ntohl(rqst->did), rqst->name, ntohl(rply->cnid));
-#endif
+
     rply->result = CNID_DBD_RES_OK;
     return 1;
 }