vfs_fruit: use ADEDOFF_RFORK_DOT_UND offset macro in ad_convert_move_reso()

We really want the fixed size offset here, not a calculated one. Note
that "ad_getentryoff(ad, ADEID_FINDERI) + ADEDLEN_FINDERI" is equal to
ADEDOFF_RFORK_DOT_UND.

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

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

diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
index 2ea5d53b1fd41959339d4152e532818a17830016..94da6eb7e8420002d93a34b221a1dd3c46d71331 100644 (file)
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -1178,12 +1178,11 @@ static bool ad_convert_move_reso(struct adouble *ad,
                return true;
        }
 
-       memmove(map + ad_getentryoff(ad, ADEID_FINDERI) + ADEDLEN_FINDERI,
+       memmove(map + ADEDOFF_RFORK_DOT_UND,
                map + ad_getentryoff(ad, ADEID_RFORK),
                ad_getentrylen(ad, ADEID_RFORK));
 
-       ad_setentryoff(ad, ADEID_RFORK,
-                      ad_getentryoff(ad, ADEID_FINDERI) + ADEDLEN_FINDERI);
+       ad_setentryoff(ad, ADEID_RFORK, ADEDOFF_RFORK_DOT_UND);
 
        return true;
 }