From d78230bb7f3a87676553f117e16b65e3c5d28d90 Mon Sep 17 00:00:00 2001
From: jpandre <jpandre>
Date: Sat, 24 Nov 2007 09:25:22 +0000
Subject: [PATCH] Fixed audit functions

---
 include/ntfs-3g/security.h |  6 ++++++
 libntfs-3g/security.c      | 13 +++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/include/ntfs-3g/security.h b/include/ntfs-3g/security.h
index 6ee59e75..21afa765 100644
--- a/include/ntfs-3g/security.h
+++ b/include/ntfs-3g/security.h
@@ -210,6 +210,12 @@ int ntfs_set_file_security(struct SECURITY_API *scapi,
 		const char *path, u32 selection, const char *attr);
 BOOL ntfs_read_directory(struct SECURITY_API *scapi,
 		const char *path, ntfs_filldir_t callback, void *context);
+int ntfs_read_sds(struct SECURITY_API *scapi,
+		char *buf, u32 size, u32 offset);
+INDEX_ENTRY *ntfs_read_sii(struct SECURITY_API *scapi,
+		INDEX_ENTRY *entry);
+INDEX_ENTRY *ntfs_read_sdh(struct SECURITY_API *scapi,
+		INDEX_ENTRY *entry);
 struct SECURITY_API *ntfs_initialize_file_security(const char *device,
                                 int flags);
 BOOL ntfs_leave_file_security(struct SECURITY_API *scx);
diff --git a/libntfs-3g/security.c b/libntfs-3g/security.c
index 2f0502d4..35511ea4 100644
--- a/libntfs-3g/security.c
+++ b/libntfs-3g/security.c
@@ -4823,14 +4823,14 @@ int ntfs_read_sds(struct SECURITY_API *scapi,
 INDEX_ENTRY *ntfs_read_sii(struct SECURITY_API *scapi,
 		INDEX_ENTRY *entry)
 {
-	le32 keyid;
+	SII_INDEX_KEY key;
 	ntfs_index_context *xsii;
 
 	if (scapi && (scapi->magic == MAGIC_API)) {
 		xsii = scapi->security.vol->secure_xsii;
 		if (!entry) {
-			keyid = cpu_to_le32(0);
-			ntfs_index_lookup((char*)&keyid,
+			key.security_id = cpu_to_le32(0);
+			ntfs_index_lookup((char*)&key,
 				sizeof(SII_INDEX_KEY), xsii);
 			entry = xsii->entry;
 		} else
@@ -4851,14 +4851,15 @@ INDEX_ENTRY *ntfs_read_sii(struct SECURITY_API *scapi,
 INDEX_ENTRY *ntfs_read_sdh(struct SECURITY_API *scapi,
 		INDEX_ENTRY *entry)
 {
-	le32 keyid;
+	SDH_INDEX_KEY key;
 	ntfs_index_context *xsdh;
 
 	if (scapi && (scapi->magic == MAGIC_API)) {
 		xsdh = scapi->security.vol->secure_xsdh;
 		if (!entry) {
-			keyid = cpu_to_le32(0);
-			ntfs_index_lookup((char*)&keyid,
+			key.hash = cpu_to_le32(0);
+			key.security_id = cpu_to_le32(0);
+			ntfs_index_lookup((char*)&key,
 				sizeof(SDH_INDEX_KEY), xsdh);
 			entry = xsdh->entry;
 		} else