security descriptor application fix

[wimlib] / src / ntfs-apply.c

diff --git a/src/ntfs-apply.c b/src/ntfs-apply.c
index cfeee3f6dee4901c987cb39457bb4a37aa97adcb..d9f6d37a5da9445789bd5d7a1453b472a0d19b9b 100644 (file)
--- a/src/ntfs-apply.c
+++ b/src/ntfs-apply.c
@@ -48,7 +48,7 @@ struct ntfs_apply_args {
 };
 
 
-#ifndef WITH_NEW_NTFS_3G
+#if 0
 extern int ntfs_set_inode_security(ntfs_inode *ni, u32 selection,
                                   const char *attr);
 extern int ntfs_set_inode_attributes(ntfs_inode *ni, u32 attrib);
@@ -280,9 +280,9 @@ apply_file_attributes_and_security_data(ntfs_inode *ni,
                                SACL_SECURITY_INFORMATION;
                ret = ntfs_set_inode_security(ni, selection, descriptor);
        #else
-               ntfs_xattr_system_setxattr(&ctx, XATTR_NTFS_ACL,
-                                          ni, dir_ni, descriptor,
-                                          sd->sizes[dentry->security_id], 0);
+               ret = ntfs_xattr_system_setxattr(&ctx, XATTR_NTFS_ACL,
+                                                ni, dir_ni, descriptor,
+                                                sd->sizes[dentry->security_id], 0);
        #endif
                                
                if (ret != 0) {