X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fntfs-capture.c;h=9739d9e1a55fd3a0d674b5e2a6968301f4dfae22;hb=e9ea88602558419972b935f1c68ea80119c924ef;hp=7c92c9e240005782d674c14e0602e04a56f7aef4;hpb=31f38a9a7a9ed5dc2c32bbb5fecd4050809a561c;p=wimlib

diff --git a/src/ntfs-capture.c b/src/ntfs-capture.c
index 7c92c9e2..9739d9e1 100644
--- a/src/ntfs-capture.c
+++ b/src/ntfs-capture.c
@@ -51,13 +51,6 @@
 #include <unistd.h>
 #include <errno.h>
 
-#if 0
-extern int ntfs_get_inode_security(ntfs_inode *ni, u32 selection, char *buf,
-				   u32 buflen, u32 *psize);
-
-extern u32 ntfs_get_inode_attributes(ntfs_inode *ni);
-#endif
-
 /* Structure that allows searching the security descriptors by SHA1 message
  * digest. */
 struct sd_set {
@@ -335,7 +328,7 @@ static int capture_ntfs_streams(struct dentry *dentry, ntfs_inode *ni,
 				lte->ntfs_loc = ntfs_loc;
 				lte->resource_location = RESOURCE_IN_NTFS_VOLUME;
 				if (type == AT_REPARSE_POINT) {
-					dentry->inode->reparse_tag = reparse_tag;
+					dentry->d_inode->reparse_tag = reparse_tag;
 					ntfs_loc->is_reparse_point = true;
 					lte->resource_entry.original_size = data_size - 8;
 					lte->resource_entry.size = data_size - 8;
@@ -355,13 +348,13 @@ static int capture_ntfs_streams(struct dentry *dentry, ntfs_inode *ni,
 		if (name_length == 0) {
 			/* Unnamed data stream.  Put the reference to it in the
 			 * dentry's inode. */
-			if (dentry->inode->lte) {
+			if (dentry->d_inode->lte) {
 				ERROR("Found two un-named data streams for "
 				      "`%s'", path);
 				ret = WIMLIB_ERR_NTFS_3G;
 				goto out_free_lte;
 			}
-			dentry->inode->lte = lte;
+			dentry->d_inode->lte = lte;
 		} else {
 			/* Named data stream.  Put the reference to it in the
 			 * alternate data stream entries */
@@ -372,7 +365,7 @@ static int capture_ntfs_streams(struct dentry *dentry, ntfs_inode *ni,
 							 &stream_name_utf8_len);
 			if (!stream_name_utf8)
 				goto out_free_lte;
-			new_ads_entry = inode_add_ads(dentry->inode, stream_name_utf8);
+			new_ads_entry = inode_add_ads(dentry->d_inode, stream_name_utf8);
 			FREE(stream_name_utf8);
 			if (!new_ads_entry)
 				goto out_free_lte;
@@ -521,9 +514,6 @@ static int build_dentry_tree_ntfs_recursive(struct dentry **root_p,
 	struct dentry *root;
 
 	mrec_flags = ni->mrec->flags;
-#ifdef HAVE_NTFS_INODE_FUNCTIONS
- 	attributes = ntfs_get_inode_attributes(ni);
-#else
 	struct SECURITY_CONTEXT ctx;
 	memset(&ctx, 0, sizeof(ctx));
 	ctx.vol = ni->vol;
@@ -535,7 +525,6 @@ static int build_dentry_tree_ntfs_recursive(struct dentry **root_p,
 				 path);
 		return WIMLIB_ERR_NTFS_3G;
 	}
-#endif
 
 	if (exclude_path(path, config, false)) {
 		if (flags & WIMLIB_ADD_IMAGE_FLAG_VERBOSE) {
@@ -581,12 +570,12 @@ static int build_dentry_tree_ntfs_recursive(struct dentry **root_p,
 		}
 	}
 
-	root->inode->creation_time    = le64_to_cpu(ni->creation_time);
-	root->inode->last_write_time  = le64_to_cpu(ni->last_data_change_time);
-	root->inode->last_access_time = le64_to_cpu(ni->last_access_time);
-	root->inode->attributes       = le32_to_cpu(attributes);
-	root->inode->ino              = ni->mft_no;
-	root->inode->resolved         = true;
+	root->d_inode->creation_time    = le64_to_cpu(ni->creation_time);
+	root->d_inode->last_write_time  = le64_to_cpu(ni->last_data_change_time);
+	root->d_inode->last_access_time = le64_to_cpu(ni->last_access_time);
+	root->d_inode->attributes       = le32_to_cpu(attributes);
+	root->d_inode->ino              = ni->mft_no;
+	root->d_inode->resolved         = true;
 
 	if (attributes & FILE_ATTR_REPARSE_POINT) {
 		/* Junction point, symbolic link, or other reparse point */
@@ -622,41 +611,6 @@ static int build_dentry_tree_ntfs_recursive(struct dentry **root_p,
 	if (ret != 0)
 		return ret;
 
-#ifdef HAVE_NTFS_INODE_FUNCTIONS
-	ret = ntfs_get_inode_security(ni,
-				      OWNER_SECURITY_INFORMATION |
-				      GROUP_SECURITY_INFORMATION |
-				      DACL_SECURITY_INFORMATION  |
-				      SACL_SECURITY_INFORMATION,
-				      NULL, 0, &sd_size);
-	char sd[sd_size];
-	ret = ntfs_get_inode_security(ni,
-				      OWNER_SECURITY_INFORMATION |
-				      GROUP_SECURITY_INFORMATION |
-				      DACL_SECURITY_INFORMATION  |
-				      SACL_SECURITY_INFORMATION,
-				      sd, sd_size, &sd_size);
-	if (ret == 0) {
-		ERROR_WITH_ERRNO("Failed to get security information from "
-				 "`%s'", path);
-		ret = WIMLIB_ERR_NTFS_3G;
-	} else {
-		if (ret > 0) {
-			/*print_security_descriptor(sd, sd_size);*/
-			root->security_id = sd_set_add_sd(sd_set, sd, ret);
-			if (root->security_id == -1) {
-				ERROR("Out of memory");
-				return WIMLIB_ERR_NOMEM;
-			}
-			DEBUG("Added security ID = %u for `%s'",
-			      root->security_id, path);
-		} else { 
-			root->security_id = -1;
-			DEBUG("No security ID for `%s'", path);
-		}
-		ret = 0;
-	}
-#else
 	char _sd[1];
 	char *sd = _sd;
 	errno = 0;
@@ -669,23 +623,22 @@ static int build_dentry_tree_ntfs_recursive(struct dentry **root_p,
 						 ni, dir_ni, sd, ret);
 	}
 	if (ret > 0) {
-		root->inode->security_id = sd_set_add_sd(sd_set, sd, ret);
-		if (root->inode->security_id == -1) {
+		root->d_inode->security_id = sd_set_add_sd(sd_set, sd, ret);
+		if (root->d_inode->security_id == -1) {
 			ERROR("Out of memory");
 			return WIMLIB_ERR_NOMEM;
 		}
 		DEBUG("Added security ID = %u for `%s'",
-		      root->inode->security_id, path);
+		      root->d_inode->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->inode->security_id = -1;
+		root->d_inode->security_id = -1;
 		DEBUG("No security ID for `%s'", path);
 	}
-#endif
 	return ret;
 }