Changeset 599 for trunk/server/source3/lib/util_seaccess.c

Timestamp:

Jul 6, 2011, 8:21:13 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update trunk to 3.5.9

File:

• trunk/server/source3/lib/util_seaccess.c (modified) (3 diffs)

trunk/server/source3/lib/util_seaccess.c

@@ -113 +113 @@
 
         if (is_sid_in_token(token, sd->owner_sid)) {
-                granted |= SEC_STD_WRITE_DAC | SEC_STD_READ_CONTROL | SEC_STD_DELETE;
-        } else if (user_has_privileges(token, &se_restore)) {
-                granted |= SEC_STD_DELETE;
+                granted |= SEC_STD_WRITE_DAC | SEC_STD_READ_CONTROL;
         }
 
@@ -172 +170 @@
                 access_desired &= ~SEC_FLAG_MAXIMUM_ALLOWED;
                 *access_granted = access_desired;
-                bits_remaining = access_desired & ~SEC_STD_DELETE;
+                bits_remaining = access_desired;
 
                 DEBUG(10,("se_access_check: MAX desired = 0x%x, granted = 0x%x, remaining = 0x%x\n",
@@ -188 +186 @@
         }
 
+
+
+
+
+
+
+
+
+
+
         /* a NULL dacl allows access */
         if ((sd->type & SEC_DESC_DACL_PRESENT) && sd->dacl == NULL) {
                 *access_granted = access_desired;
                 return NT_STATUS_OK;
-        }
-
-        /* the owner always gets SEC_STD_WRITE_DAC, SEC_STD_READ_CONTROL and SEC_STD_DELETE */
-        if ((bits_remaining & (SEC_STD_WRITE_DAC|SEC_STD_READ_CONTROL|SEC_STD_DELETE)) &&
-            is_sid_in_token(token, sd->owner_sid)) {
-                bits_remaining &= ~(SEC_STD_WRITE_DAC|SEC_STD_READ_CONTROL|SEC_STD_DELETE);
-        }
-        if ((bits_remaining & SEC_STD_DELETE) &&
-            user_has_privileges(token, &se_restore)) {
-                bits_remaining &= ~SEC_STD_DELETE;
         }