diff options
| author | Jeremy Allison <jra@samba.org> | 2004-10-27 18:11:41 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:53:04 -0500 |
| commit | e62d9c3b87d267782ce8e79c6e15613075408333 (patch) | |
| tree | 3a460a740fe9c5067c433503d0011f5f23799d71 /source3 | |
| parent | e798a6b9fee3874ea7bb2589e1ecc66b3c012353 (diff) | |
| download | samba-e62d9c3b87d267782ce8e79c6e15613075408333.tar.gz samba-e62d9c3b87d267782ce8e79c6e15613075408333.tar.bz2 samba-e62d9c3b87d267782ce8e79c6e15613075408333.zip | |
r3296: Fix to ensure entries are stored in correct order. Bug #1498. Patch from
SATOH Fumiyasu <fumiya@samba.gr.jp>.
Jeremy.
(This used to be commit 7e35900bc6894d69f83c99ac6eb260d7cc35683a)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/smbd/posix_acls.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c index ab32d0591e..66103fda5c 100644 --- a/source3/smbd/posix_acls.c +++ b/source3/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); |