Misc. fixes

[wimlib] / src / security.c

diff --git a/src/security.c b/src/security.c
index ae71c5dd938c58104af62189454d1708a1c7a701..9b1ea21811485f64183a65a996ab7da6e3c3c894 100644 (file)
--- a/src/security.c
+++ b/src/security.c
@@ -258,6 +258,9 @@ typedef struct {
 static void
 empty_sacl_fixup(u8 *descr, u64 *size_p)
 {
 static void
 empty_sacl_fixup(u8 *descr, u64 *size_p)
 {

+       /* No-op if no NTFS-3g support, or if NTFS-3g is version 2013 or later
+        * */
+#if defined(WITH_NTFS_3G) && !defined(HAVE_NTFS_MNT_RDONLY)

        if (*size_p >= sizeof(SecurityDescriptor)) {
                SecurityDescriptor *sd = (SecurityDescriptor*)descr;
                u32 sacl_offset = le32_to_cpu(sd->sacl_offset);
        if (*size_p >= sizeof(SecurityDescriptor)) {
                SecurityDescriptor *sd = (SecurityDescriptor*)descr;
                u32 sacl_offset = le32_to_cpu(sd->sacl_offset);


@@ -266,6 +269,7 @@ empty_sacl_fixup(u8 *descr, u64 *size_p)
                        *size_p -= sizeof(ACL);
                }
        }
                        *size_p -= sizeof(ACL);
                }
        }

+#endif

 }
 
 /*
 }
 
 /*