Revert "s3:smbd: add SEC_FLAG_MAXIMUM_ALLOWED handling to smbd_check_open_rights()"
authorStefan Metzmacher <metze@samba.org>
Wed, 6 Jul 2011 13:41:55 +0000 (15:41 +0200)
committerStefan Metzmacher <metze@samba.org>
Thu, 7 Jul 2011 12:49:55 +0000 (14:49 +0200)
This reverts commit 8fc072e3b6915cdda1246c1622b130b1d55c03fd.

source3/smbd/open.c

index a974a6d7a2358f17c976386943a1b9f9dddec02c..2c2c64e51b2f35c0dabad0f04bab2a5e9456f07a 100644 (file)
@@ -76,16 +76,9 @@ NTSTATUS smbd_check_open_rights(struct connection_struct *conn,
        /* Check if we have rights to open. */
        NTSTATUS status;
        struct security_descriptor *sd = NULL;
-       uint32_t desired_share_access;
        uint32_t rejected_share_access;
 
-       desired_share_access = access_mask;
-       if (desired_share_access & SEC_FLAG_MAXIMUM_ALLOWED) {
-               desired_share_access |= conn->share_access;
-               desired_share_access &= ~SEC_FLAG_MAXIMUM_ALLOWED;
-       }
-
-       rejected_share_access = desired_share_access & ~(conn->share_access);
+       rejected_share_access = access_mask & ~(conn->share_access);
 
        if (rejected_share_access) {
                *access_granted = rejected_share_access;