Convert ad file suite and CNID daemons to use new config code

[netatalk.git] / bin / ad / ad.h

diff --git a/bin/ad/ad.h b/bin/ad/ad.h
index 9f8fd4b5ae0dcb3692751d6d480cf71ca0fc17a0..d97f4b0643df9543e9b333179caf533c72af3a53 100644 (file)
--- a/bin/ad/ad.h
+++ b/bin/ad/ad.h
@@ -1,5 +1,5 @@
 /* 
-   Copyright (c) 2009 Frank Lahm <franklahm@gmail.com>
+   Copyright (c) 2009,2011 Frank Lahm <franklahm@gmail.com>
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,15 +15,17 @@
 #ifndef AD_H
 #define AD_H
 
-#define _XOPEN_SOURCE 600
+#include <atalk/standards.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <signal.h>
+#include <arpa/inet.h>
 
 #include <atalk/ftw.h>
-#include <atalk/volinfo.h>
 #include <atalk/cnid.h>
+#include <atalk/compat.h>
+#include <atalk/volume.h>
 
 #define DIR_DOT_OR_DOTDOT(a) \
         ((strcmp(a, ".") == 0) || (strcmp(a, "..") == 0))
@@ -47,8 +49,7 @@ enum logtype {STD, DBG};
     } while (0)
 
 typedef struct {
-    struct volinfo volinfo;
-    struct vol     volume;
+    struct vol     *vol;
     char           db_stamp[ADEDLEN_PRIVSYN];
 } afpvol_t;
 
@@ -66,7 +67,7 @@ extern int openvol(const char *path, afpvol_t *vol);
 extern void closevol(afpvol_t *vol);
 extern cnid_t cnid_for_path(const afpvol_t *vol, const char *path, cnid_t *did);
 extern cnid_t cnid_for_paths_parent(const afpvol_t *vol, const char *path, cnid_t *did);
-extern char *utompath(const struct volinfo *volinfo, const char *upath);
+extern char *utompath(const struct vol *, const char *);
 extern int convert_dots_encoding(const afpvol_t *svol, const afpvol_t *dvol, char *path, size_t buflen);
 
 typedef struct {