Merge master

[netatalk.git] / etc / afpd / extattrs.c

diff --git a/etc/afpd/extattrs.c b/etc/afpd/extattrs.c
index 060011f1681badeeb52fab32e32ebfd472b418a8..4cbeb6423ddd316cb28dc32cec5488ce98ed0f81 100644 (file)
--- a/etc/afpd/extattrs.c
+++ b/etc/afpd/extattrs.c
@@ -27,8 +27,9 @@
 #include <atalk/afp.h>
 #include <atalk/logger.h>
 #include <atalk/ea.h>
+#include <atalk/globals.h>
+#include <atalk/netatalk_conf.h>
 
-#include "globals.h"
 #include "volume.h"
 #include "desktop.h"
 #include "directory.h"
@@ -150,7 +151,7 @@ int afp_listextattr(AFPObj *obj _U_, char *ibuf, size_t ibuflen _U_, char *rbuf,
             adflags = ADFLAGS_DIR;
 
         adp = &ad;
-        ad_init(adp, vol->v_adouble, vol->v_ad_options);
+        ad_init(adp, vol);
         if (ad_metadata(uname, adflags, adp) != 0 ) {
             switch (errno) {
             case ENOENT:
@@ -234,7 +235,7 @@ exit:
         buf_valid = 0;
 
     if (adp)
-        ad_close_metadata(adp);
+        ad_close(adp, ADFLAGS_HF);
 
     return ret;
 }