Support for using $u username variable in AFP volume definitions

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

diff --git a/libatalk/cnid/cdb/cnid_cdb_update.c b/libatalk/cnid/cdb/cnid_cdb_update.c
index 9f4e9c2fa9ffe1a1f00bcffc4a6f34f64988d869..90c7d93ff54655b82812b1699732fab60b5c3250 100644 (file)
--- a/libatalk/cnid/cdb/cnid_cdb_update.c
+++ b/libatalk/cnid/cdb/cnid_cdb_update.c
@@ -1,7 +1,3 @@
-/*
- * $Id: cnid_cdb_update.c,v 1.3 2005-05-03 14:55:13 didg Exp $
- */
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif /* HAVE_CONFIG_H */
@@ -14,9 +10,8 @@
 /* cnid_update: takes the given cnid and updates the metadata.  To
  * handle the did/name data, there are a bunch of functions to get
  * and set the various fields. */
-int cnid_cdb_update(struct _cnid_db *cdb, const cnid_t id, const struct stat *st,
-                const cnid_t did, char *name, const size_t len
-                /*, const char *info, const int infolen*/)
+int cnid_cdb_update(struct _cnid_db *cdb, cnid_t id, const struct stat *st,
+                    cnid_t did, const char *name, size_t len)
 {
     unsigned char *buf;
     CNID_private *db;
@@ -25,7 +20,7 @@ int cnid_cdb_update(struct _cnid_db *cdb, const cnid_t id, const struct stat *st
     int notfound = 0;
     char getbuf[CNID_HEADER_LEN + MAXPATHLEN +1];
 
-    if (!cdb || !(db = cdb->_private) || !id || !st || !name || (db->flags & CNIDFLAG_DB_RO)) {
+    if (!cdb || !(db = cdb->cnid_db_private) || !id || !st || !name || (db->flags & CNIDFLAG_DB_RO)) {
         return -1;
     }
 
@@ -33,7 +28,7 @@ int cnid_cdb_update(struct _cnid_db *cdb, const cnid_t id, const struct stat *st
     memset(&pkey, 0, sizeof(pkey));
     memset(&data, 0, sizeof(data));
 
-    buf = make_cnid_data(st, did, name, len);
+    buf = make_cnid_data(cdb->cnid_db_flags, st, did, name, len);
 
     key.data = buf +CNID_DEVINO_OFS;
     key.size = CNID_DEVINO_LEN;
@@ -59,7 +54,7 @@ int cnid_cdb_update(struct _cnid_db *cdb, const cnid_t id, const struct stat *st
     }
 
     memset(&pkey, 0, sizeof(pkey));
-    buf = make_cnid_data(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;
 
@@ -88,7 +83,7 @@ int cnid_cdb_update(struct _cnid_db *cdb, const cnid_t id, const struct stat *st
 
     memset(&data, 0, sizeof(data));
     /* Make a new entry. */
-    buf = make_cnid_data(st, did, name, len);
+    buf = make_cnid_data(cdb->cnid_db_flags, st, did, name, len);
     data.data = buf;
     memcpy(data.data, &id, sizeof(id));
     data.size = CNID_HEADER_LEN + len + 1;