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

[netatalk.git] / include / atalk / cnid_bdb_private.h

diff --git a/include/atalk/cnid_bdb_private.h b/include/atalk/cnid_bdb_private.h
index 8aab3e059e8545698dd0bd345fce59fdfa9f1aa3..f87eddd0f2a850d9b77f8783f109da06c528e40c 100644 (file)
--- a/include/atalk/cnid_bdb_private.h
+++ b/include/atalk/cnid_bdb_private.h
@@ -36,6 +36,7 @@
 #define CNID_DBD_RES_SRCH_DONE     0x06
 
 #define DBD_MAX_SRCH_RSLTS 100
+#define DBD_NUM_OPEN_ARGS 3
 
 struct cnid_dbd_rqst {
     int     op;
@@ -57,10 +58,7 @@ struct cnid_dbd_rply {
 };
 
 typedef struct CNID_bdb_private {
-    uint32_t magic;
-    char      db_dir[MAXPATHLEN + 1]; /* Database directory without /.AppleDB appended */
-    char      *cnidserver;
-    char      *cnidport;
+    struct vol *vol;
     int       fd;              /* File descriptor to cnid_dbd */
     char      stamp[ADEDLEN_PRIVSYN]; /* db timestamp */
     char      *client_stamp;