Changeset 587 for vendor/current/source3/smbd/open.c

Timestamp:

Jun 29, 2011, 7:36:41 AM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update vendor to version 3.5.6

File:

• vendor/current/source3/smbd/open.c (modified) (4 diffs)

vendor/current/source3/smbd/open.c

@@ -50 +50 @@
 ****************************************************************************/
 
-NTSTATUS smb1_file_se_access_check(const struct security_descriptor *sd,
+NTSTATUS smb1_file_se_access_check(connection_struct *conn,
+                          const struct security_descriptor *sd,
                           const NT_USER_TOKEN *token,
                           uint32_t access_desired,
                           uint32_t *access_granted)
 {
+        *access_granted = 0;
+
+        if (conn->server_info->utok.uid == 0 || conn->admin_user) {
+                /* I'm sorry sir, I didn't know you were root... */
+                *access_granted = access_desired;
+                if (access_desired & SEC_FLAG_MAXIMUM_ALLOWED) {
+                        *access_granted |= FILE_GENERIC_ALL;
+                }
+                return NT_STATUS_OK;
+        }
+
         return se_access_check(sd,
                                 token,
@@ -74 +86 @@
         struct security_descriptor *sd = NULL;
 
-        *access_granted = 0;
-
-        if (conn->server_info->utok.uid == 0 || conn->admin_user) {
-                /* I'm sorry sir, I didn't know you were root... */
-                *access_granted = access_mask;
-                if (access_mask & SEC_FLAG_MAXIMUM_ALLOWED) {
-                        *access_granted |= FILE_GENERIC_ALL;
-                }
-                return NT_STATUS_OK;
-        }
-
         status = SMB_VFS_GET_NT_ACL(conn, smb_fname->base_name,
                         (OWNER_SECURITY_INFORMATION |
@@ -98 +99 @@
         }
 
-        status = smb1_file_se_access_check(sd,
+        status = smb1_file_se_access_check(conn,
+                                sd,
                                 conn->server_info->ptok,
                                 access_mask,
@@ -1413 +1415 @@
                         }
 
-                        status = smb1_file_se_access_check(sd,
+                        status = smb1_file_se_access_check(conn,
+                                        sd,
                                         conn->server_info->ptok,
                                         access_mask,