Changeset 272 for branches/samba-3.2.x/source/rpc_server/srv_samr_nt.c

Timestamp:

Jun 16, 2009, 5:52:30 PM (17 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 to 3.2.12

File:

• branches/samba-3.2.x/source/rpc_server/srv_samr_nt.c (modified) (11 diffs)

branches/samba-3.2.x/source/rpc_server/srv_samr_nt.c

@@ -863 +863 @@
                   sid_string_dbg(&pol_sid)));
 
-        status = access_check_samr_function(acc_granted,
-                                            STD_RIGHT_READ_CONTROL_ACCESS,
-                                            "_samr_QuerySecurity");
-        if (!NT_STATUS_IS_OK(status)) {
-                return status;
-        }
-
         /* Check what typ of SID is beeing queried (e.g Domain SID, User SID, Group SID) */
 
@@ -1166 +1159 @@
                                   num_groups, groups);
 
+
+
+
+
+
+
         samr_array->count = num_groups;
         samr_array->entries = samr_entries;
@@ -1234 +1233 @@
         DEBUG(5,("_samr_EnumDomainAliases: %d\n", __LINE__));
 
+
+
+
+
+
+
         samr_array->count = num_aliases;
         samr_array->entries = samr_entries;
@@ -1471 +1476 @@
         if (!find_policy_by_hnd(p, r->in.domain_handle, (void **)(void *)&info))
                 return NT_STATUS_INVALID_HANDLE;
-
-        status = access_check_samr_function(info->acc_granted,
-                                            SA_RIGHT_DOMAIN_ENUM_ACCOUNTS,
-                                            "_samr_QueryDisplayInfo");
-        if (!NT_STATUS_IS_OK(status)) {
-                return status;
-        }
 
         /*
@@ -2121 +2119 @@
                 return NT_STATUS_INVALID_HANDLE;
 
-        status = access_check_samr_function(acc_granted,
-                                            0, /* Don't know the acc_bits yet */
-                                            "_samr__LookupRids");
-        if (!NT_STATUS_IS_OK(status)) {
-                return status;
-        }
-
         if (num_rids > 1000) {
                 DEBUG(0, ("Got asked for %d rids (more than 1000) -- according "
@@ -2700 +2691 @@
                 return NT_STATUS_INVALID_HANDLE;
 
-        status = access_check_samr_function(info->acc_granted,
-                                            SAMR_USER_ACCESS_GET_ATTRIBUTES,
-                                            "_samr_QueryUserInfo");
-        if (!NT_STATUS_IS_OK(status)) {
-                return status;
-        }
-
         domain_sid = info->sid;
 
@@ -2949 +2933 @@
                 return NT_STATUS_INVALID_HANDLE;
         }
-
-        status = access_check_samr_function(info->acc_granted,
-                                            SA_RIGHT_SAM_LOOKUP_DOMAIN,
-                                            "_samr_QueryDomainInfo" );
-
-        if ( !NT_STATUS_IS_OK(status) )
-                return status;
 
         switch (r->in.level) {
@@ -5671 +5648 @@
         time_t u_logout;
         time_t u_lock_duration, u_reset_time;
-        NTSTATUS result;
 
         DEBUG(5,("_samr_SetDomainInfo: %d\n", __LINE__));
@@ -5678 +5654 @@
         if (!find_policy_by_hnd(p, r->in.domain_handle, (void **)(void *)&info))
                 return NT_STATUS_INVALID_HANDLE;
-
-        /* We do have different access bits for info
-         * levels here, but we're really just looking for
-         * GENERIC_RIGHTS_DOMAIN_WRITE access. Unfortunately
-         * this maps to different specific bits. So
-         * assume if we have SA_RIGHT_DOMAIN_SET_INFO_1
-         * set we are ok. */
-
-        result = access_check_samr_function(info->acc_granted,
-                                            SA_RIGHT_DOMAIN_SET_INFO_1,
-                                            "_samr_SetDomainInfo");
-
-        if (!NT_STATUS_IS_OK(result))
-                return result;
 
         DEBUG(5,("_samr_SetDomainInfo: level: %d\n", r->in.level));
@@ -5750 +5712 @@
         uint32_t num_account = 0;
         struct samr_displayentry *entries = NULL;
-        NTSTATUS status;
 
         DEBUG(5,("_samr_GetDisplayEnumerationIndex: %d\n", __LINE__));
@@ -5757 +5718 @@
         if (!find_policy_by_hnd(p, r->in.domain_handle, (void **)(void *)&info)) {
                 return NT_STATUS_INVALID_HANDLE;
-        }
-
-        status = access_check_samr_function(info->acc_granted,
-                                            SA_RIGHT_DOMAIN_ENUM_ACCOUNTS,
-                                            "_samr_GetDisplayEnumerationIndex");
-        if (!NT_STATUS_IS_OK(status)) {
-                return status;
         }