From: Jeremy Allison <jra@samba.org>
Date: Tue, 30 Nov 2004 06:41:38 +0000 (+0000)
Subject: r4016: Fix for bug found by Steve French client code (cifsfs) on
X-Git-Tag: samba-misc-tags/initial-v3-0-unstable~5530
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7e78059948612fa9f5d179a1e3f5f59e7ad5e456;p=thirdparty%2Fsamba.git

r4016: Fix for bug found by Steve French client code (cifsfs) on
POSIX ACL set. You need to *get* a permset_t pointer from the entry before
any of the permset code will accept it as a valid value
Jeremy.
---

diff --git a/source/smbd/posix_acls.c b/source/smbd/posix_acls.c
index ab46bae3462..d30cf62e7c6 100644
--- a/source/smbd/posix_acls.c
+++ b/source/smbd/posix_acls.c
@@ -3489,12 +3489,21 @@ static SMB_ACL_T create_posix_acl_from_wire(connection_struct *conn, uint16 num_
 			goto fail;
 		}
 
+		/* Get the permset pointer from the new ACL entry. */
+		if (SMB_VFS_SYS_ACL_GET_PERMSET(conn, the_entry, &the_permset) == -1) {
+			DEBUG(0,("create_posix_acl_from_wire: Failed to get permset on entry %u. (%s)\n",
+                                i, strerror(errno) ));
+                        goto fail;
+                }
+
+		/* Map from wire to permissions. */
 		if (!unix_ex_wire_to_permset(conn, CVAL(pdata,(i*SMB_POSIX_ACL_ENTRY_SIZE)+1), &the_permset)) {
 			DEBUG(0,("create_posix_acl_from_wire: invalid permset %u on entry %u.\n",
 				CVAL(pdata,(i*SMB_POSIX_ACL_ENTRY_SIZE) + 1), i ));
 			goto fail;
 		}
 
+		/* Now apply to the new ACL entry. */
 		if (SMB_VFS_SYS_ACL_SET_PERMSET(conn, the_entry, the_permset) == -1) {
 			DEBUG(0,("create_posix_acl_from_wire: Failed to add permset on entry %u. (%s)\n",
 				i, strerror(errno) ));