Add --noacls options and set dwDesiredAccess more appropriately

[wimlib] / src / ntfs-capture.c

diff --git a/src/ntfs-capture.c b/src/ntfs-capture.c
index 7c04e9b85b2410797212fb2aad119acce296eea1..3f036d07fd8377381a49c2147aaf903fc553d21c 100644 (file)
--- a/src/ntfs-capture.c
+++ b/src/ntfs-capture.c
@@ -382,7 +382,7 @@ free_dos_name_tree(struct rb_node *node) {
        }
 }
 
-static void 
+static void
 destroy_dos_name_map(struct dos_name_map *map)
 {
        free_dos_name_tree(map->rb_root.rb_node);
@@ -403,8 +403,11 @@ struct readdir_ctx {
 };
 
 static int
-build_dentry_tree_ntfs_recursive(struct wim_dentry **root_p, ntfs_inode *dir_ni,
-                                ntfs_inode *ni, char path[], size_t path_len,
+build_dentry_tree_ntfs_recursive(struct wim_dentry **root_p,
+                                ntfs_inode *dir_ni,
+                                ntfs_inode *ni,
+                                mbchar *path,
+                                size_t path_len,
                                 int name_type,
                                 struct wim_lookup_table *lookup_table,
                                 struct sd_set *sd_set,
@@ -421,7 +424,7 @@ wim_ntfs_capture_filldir(void *dirent, const ntfschar *name,
 {
        struct readdir_ctx *ctx;
        size_t mbs_name_nbytes;
-       char *mbs_name;
+       mbchar *mbs_name;
        struct wim_dentry *child;
        int ret;
        size_t path_len;
@@ -436,12 +439,12 @@ wim_ntfs_capture_filldir(void *dirent, const ntfschar *name,
                /* Return now if an error occurred or if this is just a DOS name
                 * and not a Win32+DOS name. */
                if (ret != 0 || name_type == FILE_NAME_DOS)
-                       return ret;
+                       goto out;
        }
        ret = utf16le_to_mbs(name, name_nbytes,
                             &mbs_name, &mbs_name_nbytes);
-       if (ret != 0)
-               return -1;
+       if (ret)
+               goto out;
 
        if (mbs_name[0] == '.' &&
             (mbs_name[1] == '\0' ||
@@ -459,6 +462,7 @@ wim_ntfs_capture_filldir(void *dirent, const ntfschar *name,
        ntfs_inode *ni = ntfs_inode_open(ctx->dir_ni->vol, mref);
        if (!ni) {
                ERROR_WITH_ERRNO("Failed to open NTFS inode");
+               ret = -1;
                goto out_free_mbs_name;
        }
        path_len = ctx->path_len;
@@ -478,6 +482,7 @@ wim_ntfs_capture_filldir(void *dirent, const ntfschar *name,
        ntfs_inode_close(ni);
 out_free_mbs_name:
        FREE(mbs_name);
+out:
        return ret;
 }
 
@@ -597,34 +602,36 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_p,
        if (ret != 0)
                return ret;
 
-       /* Get security descriptor */
-       char _sd[1];
-       char *sd = _sd;
-       errno = 0;
-       ret = ntfs_xattr_system_getxattr(&ctx, XATTR_NTFS_ACL,
-                                        ni, dir_ni, sd,
-                                        sizeof(sd));
-       if (ret > sizeof(sd)) {
-               sd = alloca(ret);
+       if (!(add_image_flags & WIMLIB_ADD_IMAGE_FLAG_NO_ACLS)) {
+               /* Get security descriptor */
+               char _sd[1];
+               char *sd = _sd;
+               errno = 0;
                ret = ntfs_xattr_system_getxattr(&ctx, XATTR_NTFS_ACL,
-                                                ni, dir_ni, sd, ret);
-       }
-       if (ret > 0) {
-               root->d_inode->i_security_id = sd_set_add_sd(sd_set, sd, ret);
-               if (root->d_inode->i_security_id == -1) {
-                       ERROR("Out of memory");
-                       return WIMLIB_ERR_NOMEM;
+                                                ni, dir_ni, sd,
+                                                sizeof(sd));
+               if (ret > sizeof(sd)) {
+                       sd = alloca(ret);
+                       ret = ntfs_xattr_system_getxattr(&ctx, XATTR_NTFS_ACL,
+                                                        ni, dir_ni, sd, ret);
+               }
+               if (ret > 0) {
+                       root->d_inode->i_security_id = sd_set_add_sd(sd_set, sd, ret);
+                       if (root->d_inode->i_security_id == -1) {
+                               ERROR("Out of memory");
+                               return WIMLIB_ERR_NOMEM;
+                       }
+                       DEBUG("Added security ID = %u for `%s'",
+                             root->d_inode->i_security_id, path);
+                       ret = 0;
+               } else if (ret < 0) {
+                       ERROR_WITH_ERRNO("Failed to get security information from "
+                                        "`%s'", path);
+                       ret = WIMLIB_ERR_NTFS_3G;
+               } else {
+                       root->d_inode->i_security_id = -1;
+                       DEBUG("No security ID for `%s'", path);
                }
-               DEBUG("Added security ID = %u for `%s'",
-                     root->d_inode->i_security_id, path);
-               ret = 0;
-       } else if (ret < 0) {
-               ERROR_WITH_ERRNO("Failed to get security information from "
-                                "`%s'", path);
-               ret = WIMLIB_ERR_NTFS_3G;
-       } else {
-               root->d_inode->i_security_id = -1;
-               DEBUG("No security ID for `%s'", path);
        }
        return ret;
 }