]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
vfs_fruit: pass path to ad_convert
authorRalph Boehme <slow@samba.org>
Tue, 10 Oct 2017 14:15:49 +0000 (16:15 +0200)
committerKarolin Seeger <kseeger@samba.org>
Wed, 25 Oct 2017 06:43:02 +0000 (08:43 +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>
(cherry picked from commit 386249eea3a13303744dbab88480e80790138329)

source3/modules/vfs_fruit.c

index a1f2c10daf7e9041364175b87dd3fddce6e51256..8064176b171b099868afeb800f0d1e4b7b7cab6f 100644 (file)
@@ -924,7 +924,9 @@ static bool ad_unpack(struct adouble *ad, const size_t nentries,
  * @return -1 in case an error occured, 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 char *path,
+                     int fd)
 {
        int rc = 0;
        char *map = MAP_FAILED;
@@ -1219,7 +1221,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, path, ad->ad_fd);
        if (ret != 0) {
                DBG_WARNING("Failed to convert [%s]\n", path);
                return len;