Merge branch-2-1

[netatalk.git] / etc / cnid_dbd / cmd_dbd.h

diff --git a/etc/cnid_dbd/cmd_dbd.h b/etc/cnid_dbd/cmd_dbd.h
index 2b4c55331939c35df74fcd171f057f887371e965..ac6cde42112a9202214c869def22433fec056c0b 100644 (file)
--- a/etc/cnid_dbd/cmd_dbd.h
+++ b/etc/cnid_dbd/cmd_dbd.h
@@ -11,7 +11,9 @@ enum logtype {LOGSTD, LOGDEBUG};
 typedef unsigned int dbd_flags_t;
 
 #define DBD_FLAGS_SCAN     (1 << 0)
-#define DBD_FLAGS_FORCE    (1 << 0)
+#define DBD_FLAGS_FORCE    (1 << 1)
+#define DBD_FLAGS_EXCL     (1 << 2)
+#define DBD_FLAGS_CLEANUP  (1 << 3) /* Dont create AD stuff, but cleanup orphaned */
 
 #define ADv2_DIRNAME ".AppleDouble"
 
@@ -21,9 +23,8 @@ typedef unsigned int dbd_flags_t;
 #define STRCMP(a,b,c) \
         (strcmp(a,c) b 0)
 
+extern int nocniddb; /* Dont open CNID database, only scan filesystem */
 extern volatile sig_atomic_t alarmed;
-extern struct volinfo *volinfo;
-extern char cwdbuf[MAXPATHLEN+1];
 
 extern void dbd_log(enum logtype lt, char *fmt, ...);
 extern int cmd_dbd_scanvol(DBD *dbd, struct volinfo *volinfo, dbd_flags_t flags);
@@ -32,6 +33,5 @@ extern int cmd_dbd_scanvol(DBD *dbd, struct volinfo *volinfo, dbd_flags_t flags)
   Functions for querying the database which couldn't be reused from the existing
   funcs pool of dbd_* for one reason or another
 */
-extern int cmd_dbd_lookup(DBD *dbd, struct cnid_dbd_rqst *rqst, struct cnid_dbd_rply *rply, int roflag);
 extern int cmd_dbd_add(DBD *dbd, struct cnid_dbd_rqst *rqst, struct cnid_dbd_rply *rply);
 #endif /* CMD_DBD_H */