Avoid having to check for NTFS-3g 2013.1.13 or later at configure time

[wimlib] / src / ntfs-3g_apply.c

diff --git a/src/ntfs-3g_apply.c b/src/ntfs-3g_apply.c
index ba90fae8f51e257c20c20718d85ccce6a1fe46a4..0a3dcaca50f77d5b97b9b1cb743fd70e0cd3c3e6 100644 (file)
--- a/src/ntfs-3g_apply.c
+++ b/src/ntfs-3g_apply.c
@@ -123,10 +123,7 @@ sid_size(const wimlib_SID *sid)
 static void *
 sd_fixup(const void *_desc, size_t *size_p)
 {
-       u32 owner_offset, group_offset, dacl_offset;
-#if !defined(HAVE_NTFS_MNT_RDONLY)
-       u32 sacl_offset;
-#endif
+       u32 owner_offset, group_offset, dacl_offset, sacl_offset;
        bool owner_valid, group_valid;
        size_t size = *size_p;
        const wimlib_SECURITY_DESCRIPTOR_RELATIVE *desc = _desc;
@@ -142,23 +139,15 @@ sd_fixup(const void *_desc, size_t *size_p)
        else
                dacl_offset = 0;
 
-#if !defined(HAVE_NTFS_MNT_RDONLY)
        if (le16_to_cpu(desc->control) & wimlib_SE_SACL_PRESENT)
                sacl_offset = le32_to_cpu(desc->sacl_offset);
        else
                sacl_offset = 0;
-#endif
 
        /* Check if the security descriptor will be affected by one of the bugs.
-        * If not, do nothing and return.
-        *
-        * Note: HAVE_NTFS_MNT_RDONLY is defined if libntfs-3g is
-        * version 2013.1.13 or later.  */
-       if (!(
-       #if !defined(HAVE_NTFS_MNT_RDONLY)
-           (sacl_offset != 0 && sacl_offset == size - sizeof(wimlib_ACL)) ||
-       #endif
-           (dacl_offset != 0 && dacl_offset == size - sizeof(wimlib_ACL))))
+        * If not, do nothing and return.  */
+       if (!((sacl_offset != 0 && sacl_offset == size - sizeof(wimlib_ACL)) ||
+             (dacl_offset != 0 && dacl_offset == size - sizeof(wimlib_ACL))))
                return NULL;
 
        owner_offset = le32_to_cpu(desc->owner_offset);