]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
vfs_fruit: pass smb_fname to ad_convert
authorRalph Boehme <slow@samba.org>
Tue, 10 Oct 2017 14:15:49 +0000 (16:15 +0200)
committerRalph Boehme <slow@samba.org>
Fri, 13 Oct 2017 15:40:07 +0000 (17:40 +0200)
This will be needed in a later commit when converting xattrs in sidecar
AppleDouble files.

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

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
source3/modules/vfs_fruit.c

index 973bca85c803540cf0e416d61a3329a7083b0aa5..85c77f7164a7d09007d18bfe61b8429d32d4c9ea 100644 (file)
@@ -929,7 +929,9 @@ static bool ad_unpack(struct adouble *ad, const size_t nentries,
  * @return -1 in case an error occurred, 0 if no conversion was done, 1
  * otherwise
  **/
-static int ad_convert(struct adouble *ad, int fd)
+static int ad_convert(struct adouble *ad,
+                     const struct smb_filename *smb_fname,
+                     int fd)
 {
        int rc = 0;
        char *map = MAP_FAILED;
@@ -1233,7 +1235,7 @@ static ssize_t ad_read_rsrc_adouble(struct adouble *ad,
         * there is lost.
         */
 
-       ret = ad_convert(ad, ad->ad_fd);
+       ret = ad_convert(ad, smb_fname, ad->ad_fd);
        if (ret != 0) {
                DBG_WARNING("Failed to convert [%s]\n", smb_fname->base_name);
                return len;