From: Jeremy Allison <jra@samba.org>
Date: Wed, 27 Oct 2004 18:11:41 +0000 (+0000)
Subject: r3296: Fix to ensure entries are stored in correct order. Bug #1498. Patch from
X-Git-Tag: build_3.2.7_ctdb.53~9997
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=7e35900bc6894d69f83c99ac6eb260d7cc35683a;p=obnox%2Fsamba%2Fsamba-obnox.git

r3296: Fix to ensure entries are stored in correct order. Bug #1498. Patch from
SATOH Fumiyasu <fumiya@samba.gr.jp>.
Jeremy.
---

diff --git a/source/smbd/posix_acls.c b/source/smbd/posix_acls.c
index ab32d0591e9..66103fda5cd 100644
--- a/source/smbd/posix_acls.c
+++ b/source/smbd/posix_acls.c
@@ -180,7 +180,7 @@ static char *create_pai_buf(canon_ace *file_ace_list, canon_ace *dir_ace_list, B
 
 	entry_offset = pai_buf + PAI_ENTRIES_BASE;
 
-	for (ace_list = dir_ace_list; ace_list; ace_list = ace_list->next) {
+	for (ace_list = file_ace_list; ace_list; ace_list = ace_list->next) {
 		if (ace_list->inherited) {
 			uint8 type_val = (unsigned char)ace_list->owner_type;
 			uint32 entry_val = get_entry_val(ace_list);
@@ -191,7 +191,7 @@ static char *create_pai_buf(canon_ace *file_ace_list, canon_ace *dir_ace_list, B
 		}
 	}
 
-	for (ace_list = file_ace_list; ace_list; ace_list = ace_list->next) {
+	for (ace_list = dir_ace_list; ace_list; ace_list = ace_list->next) {
 		if (ace_list->inherited) {
 			uint8 type_val = (unsigned char)ace_list->owner_type;
 			uint32 entry_val = get_entry_val(ace_list);