Merge master

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

diff --git a/etc/afpd/catsearch.c b/etc/afpd/catsearch.c
index 1c913a0aab9de1fc008ea21b52cc789c724673e4..ad28c6f668d4f36f539d1884c2bd61d3f83f2351 100644 (file)
--- a/etc/afpd/catsearch.c
+++ b/etc/afpd/catsearch.c
@@ -210,7 +210,7 @@ static struct adouble *adl_lkup(struct vol *vol, struct path *path, struct adoub
        if (!isdir && (of = of_findname(path))) {
                adp = of->of_ad;
        } else {
-               ad_init(&ad, vol->v_adouble, vol->v_ad_options);
+               ad_init(&ad, vol);
                adp = &ad;
        } 
 
@@ -418,7 +418,7 @@ static int crit_check(struct vol *vol, struct path *path) {
        result |= 1;
 crit_check_ret:
        if (adp != NULL)
-               ad_close_metadata(adp);
+               ad_close(adp, ADFLAGS_HF);
        return result;
 }