]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
vfs_fruit: pass handle to ad_read()
authorRalph Boehme <slow@samba.org>
Fri, 17 May 2019 09:19:53 +0000 (11:19 +0200)
committerKarolin Seeger <kseeger@samba.org>
Fri, 21 Jun 2019 07:56:18 +0000 (07:56 +0000)
On the course of removing ad_handle from struct adouble, step 3.

Bug: https://bugzilla.samba.org/show_bug.cgi?id=13968

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit d0abf945e683766029d28915541a4baf9f3879ab)

source3/modules/vfs_fruit.c

index e2b3ee534937e845120356897478a0fe72ff45e7..dd17c9938030cb8d2a88d1808da69cda5906fa3a 100644 (file)
@@ -1785,7 +1785,9 @@ static ssize_t ad_read_rsrc(struct adouble *ad,
 /**
  * Read and unpack an AppleDouble metadata xattr or resource
  **/
-static ssize_t ad_read(struct adouble *ad, const struct smb_filename *smb_fname)
+static ssize_t ad_read(vfs_handle_struct *handle,
+                      struct adouble *ad,
+                      const struct smb_filename *smb_fname)
 {
        switch (ad->ad_type) {
        case ADOUBLE_META:
@@ -1970,7 +1972,7 @@ static struct adouble *ad_get_internal(TALLOC_CTX *ctx,
 
        }
 
-       len = ad_read(ad, smb_fname);
+       len = ad_read(handle, ad, smb_fname);
        if (len == -1) {
                DEBUG(10, ("error reading AppleDouble for %s\n",
                        smb_fname->base_name));