diff options
| -rw-r--r-- | selftest/knownfail.d/samba3.vfs.fruit | 3 | ||||
| -rw-r--r-- | source3/lib/adouble.c | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/selftest/knownfail.d/samba3.vfs.fruit b/selftest/knownfail.d/samba3.vfs.fruit index 6982e100861..6307e2b3404 100644 --- a/selftest/knownfail.d/samba3.vfs.fruit +++ b/selftest/knownfail.d/samba3.vfs.fruit @@ -1,5 +1,2 @@ ^samba3.vfs.fruit streams_depot.OS X AppleDouble file conversion\(nt4_dc\) ^samba3.vfs.fruit streams_depot.OS X AppleDouble file conversion without embedded xattr\(nt4_dc\) -^samba3.vfs.fruit fruit_delete_empty_adfiles.resource fork IO\(nt4_dc\) -^samba3.vfs.fruit metadata_stream.resource fork IO\(nt4_dc\) -^samba3.vfs.fruit metadata_netatalk.resource fork IO\(nt4_dc\) diff --git a/source3/lib/adouble.c b/source3/lib/adouble.c index 49ab8865d6a..84198ab2000 100644 --- a/source3/lib/adouble.c +++ b/source3/lib/adouble.c @@ -2180,7 +2180,9 @@ static ssize_t ad_read_rsrc_adouble(vfs_handle_struct *handle, } /* Now parse entries */ - ok = ad_unpack(ad, ADEID_NUM_DOT_UND, size); + ok = ad_unpack(ad, + ADEID_NUM_DOT_UND, + ad->ad_fsp->fsp_name->st.st_ex_size); if (!ok) { DBG_ERR("invalid AppleDouble resource %s\n", smb_fname->base_name); |