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

Timestamp:

May 27, 2009, 12:08:58 PM (17 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.11

File:

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

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

@@ -621 +621 @@
                 return NT_STATUS_INVALID_HANDLE;
 
-        status = access_check_samr_function(info->acc_granted,
-                                            SA_RIGHT_SAM_OPEN_DOMAIN,
-                                            "_samr_OpenDomain" );
-
-        if ( !NT_STATUS_IS_OK(status) )
-                return status;
-
         /*check if access can be granted as requested by client. */
         map_max_allowed_access(p->pipe_user.nt_user_token, &des_access);
@@ -2958 +2951 @@
 
         status = access_check_samr_function(info->acc_granted,
-                                            SA_RIGHT_SAM_OPEN_DOMAIN,
+                                            SA_RIGHT_SAM__DOMAIN,
                                             "_samr_QueryDomainInfo" );
 
@@ -3358 +3351 @@
 
         se_map_generic( &des_access, &sam_generic_mapping );
-        info->acc_granted = des_access & (SA_RIGHT_SAM_ENUM_DOMAINS|SA_RIGHT_SAM_OPEN_DOMAIN);
+        info->acc_granted = des_access & (SA_RIGHT_SAM_ENUM_DOMAINS|SA_RIGHT_SAM__DOMAIN);
 
         /* get a (unique) handle.  open a policy on it. */
@@ -3545 +3538 @@
 
         status = access_check_samr_function(info->acc_granted,
-                                            SA_RIGHT_SAM_OPEN_DOMAIN,
+                                            SA_RIGHT_SAM__DOMAIN,
                                             "_samr_LookupDomain");
         if (!NT_STATUS_IS_OK(status)) {