Merge remote-tracking branch 'origin/branch-netatalk-3-1'

[netatalk.git] / libatalk / cnid / cdb / cnid_cdb_lookup.c

diff --git a/libatalk/cnid/cdb/cnid_cdb_lookup.c b/libatalk/cnid/cdb/cnid_cdb_lookup.c
index 7b2f933c5182b4e1c4d4974f5a46c3bd7aa695ac..950709d5d201a6d3081b8c301201f2e324a20cd6 100644 (file)
--- a/libatalk/cnid/cdb/cnid_cdb_lookup.c
+++ b/libatalk/cnid/cdb/cnid_cdb_lookup.c
@@ -26,11 +26,11 @@ cnid_t cnid_cdb_lookup(struct _cnid_db *cdb, const struct stat *st, cnid_t did,
     cnid_t id_devino, id_didname,id = 0;
     int rc;
 
-    if (!cdb || !(db = cdb->_private) || !st || !name) {
+    if (!cdb || !(db = cdb->cnid_db_private) || !st || !name) {
         return 0;
     }
     
-    if ((buf = make_cnid_data(cdb->flags, st, did, name, len)) == NULL) {
+    if ((buf = make_cnid_data(cdb->cnid_db_flags, st, did, name, len)) == NULL) {
         LOG(log_error, logtype_default, "cnid_lookup: Pathname is too long");
         return 0;
     }
@@ -63,7 +63,7 @@ cnid_t cnid_cdb_lookup(struct _cnid_db *cdb, const struct stat *st, cnid_t did,
         type_devino = ntohl(type_devino);
     }
 
-    buf = make_cnid_data(cdb->flags, st, did, name, len);
+    buf = make_cnid_data(cdb->cnid_db_flags, st, did, name, len);
     key.data = buf +CNID_DID_OFS;
     key.size = CNID_DID_LEN + len + 1;