svn commit: samba r5206 - in
branches/SAMBA_3_0_RELEASE/source/rpc_server: .
jerry at samba.org
jerry at samba.org
Thu Feb 3 16:25:36 GMT 2005
Author: jerry
Date: 2005-02-03 16:25:36 +0000 (Thu, 03 Feb 2005)
New Revision: 5206
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5206
Log:
svn merge -r5203:5205 $SVNURL/branches/SAMBA_3_0
Modified:
branches/SAMBA_3_0_RELEASE/source/rpc_server/srv_samr_nt.c
Changeset:
Modified: branches/SAMBA_3_0_RELEASE/source/rpc_server/srv_samr_nt.c
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/rpc_server/srv_samr_nt.c 2005-02-03 16:23:49 UTC (rev 5205)
+++ branches/SAMBA_3_0_RELEASE/source/rpc_server/srv_samr_nt.c 2005-02-03 16:25:36 UTC (rev 5206)
@@ -2334,24 +2334,26 @@
/* determine which user right we need to check based on the acb_info */
- if ( (acb_info & ACB_WSTRUST) == ACB_WSTRUST )
+ if ( acb_info & ACB_WSTRUST )
{
pstrcpy(add_script, lp_addmachine_script());
se_priv_copy( &se_rights, &se_machine_account );
can_add_account = user_has_privileges( p->pipe_user.nt_user_token, &se_rights );
}
- else if ( (acb_info & ACB_WSTRUST) == ACB_NORMAL )
+ else if ( acb_info & ACB_NORMAL )
{
pstrcpy(add_script, lp_adduser_script());
se_priv_copy( &se_rights, &se_add_users );
can_add_account = user_has_privileges( p->pipe_user.nt_user_token, &se_rights );
}
- else if ( ((acb_info & ACB_SVRTRUST) == ACB_SVRTRUST) || ((acb_info & ACB_DOMTRUST) == ACB_DOMTRUST) )
+ else if ( acb_info & (ACB_SVRTRUST|ACB_DOMTRUST) )
{
pstrcpy(add_script, lp_addmachine_script());
- /* only Domain Admins can add a BDC or domain trust */
- se_priv_copy( &se_rights, &se_priv_none );
- can_add_account = nt_token_check_domain_rid( p->pipe_user.nt_user_token, DOMAIN_GROUP_RID_ADMINS );
+ if ( lp_enable_privileges() ) {
+ /* only Domain Admins can add a BDC or domain trust */
+ se_priv_copy( &se_rights, &se_priv_none );
+ can_add_account = nt_token_check_domain_rid( p->pipe_user.nt_user_token, DOMAIN_GROUP_RID_ADMINS );
+ }
}
DEBUG(5, ("_samr_create_user: %s can add this account : %s\n",
@@ -3070,7 +3072,7 @@
uint32 acc_required;
BOOL ret;
BOOL has_enough_rights;
- SE_PRIV se_rights;
+ uint32 acb_info;
DEBUG(5, ("_samr_set_userinfo: %d\n", __LINE__));
@@ -3107,16 +3109,18 @@
}
/* deal with machine password changes differently from userinfo changes */
-
- if ( pdb_get_acct_ctrl(pwd) & ACB_WSTRUST )
- se_priv_copy( &se_rights, &se_machine_account );
- else
- se_priv_copy( &se_rights, &se_add_users );
-
/* check to see if we have the sufficient rights */
- has_enough_rights = user_has_privileges( p->pipe_user.nt_user_token, &se_rights );
-
+ acb_info = pdb_get_acct_ctrl(pwd);
+ if ( acb_info & ACB_WSTRUST )
+ has_enough_rights = user_has_privileges( p->pipe_user.nt_user_token, &se_machine_account);
+ else if ( acb_info & ACB_NORMAL )
+ has_enough_rights = user_has_privileges( p->pipe_user.nt_user_token, &se_add_users );
+ else if ( acb_info & (ACB_SVRTRUST|ACB_DOMTRUST) ) {
+ if ( lp_enable_privileges() )
+ has_enough_rights = nt_token_check_domain_rid( p->pipe_user.nt_user_token, DOMAIN_GROUP_RID_ADMINS );
+ }
+
DEBUG(5, ("_samr_set_userinfo: %s does%s possess sufficient rights\n",
p->pipe_user_name, has_enough_rights ? "" : " not"));
@@ -3209,7 +3213,7 @@
uint32 acc_required;
BOOL ret;
BOOL has_enough_rights;
- SE_PRIV se_rights;
+ uint32 acb_info;
DEBUG(5, ("samr_reply_set_userinfo2: %d\n", __LINE__));
@@ -3247,17 +3251,16 @@
return NT_STATUS_NO_SUCH_USER;
}
- /* deal with machine password changes differently from userinfo changes */
-
- if ( pdb_get_acct_ctrl(pwd) & ACB_WSTRUST )
- se_priv_copy( &se_rights, &se_machine_account );
- else
- se_priv_copy( &se_rights, &se_add_users );
-
- /* check to see if we have the sufficient rights */
-
- has_enough_rights = user_has_privileges( p->pipe_user.nt_user_token, &se_rights );
-
+ acb_info = pdb_get_acct_ctrl(pwd);
+ if ( acb_info & ACB_WSTRUST )
+ has_enough_rights = user_has_privileges( p->pipe_user.nt_user_token, &se_machine_account);
+ else if ( acb_info & ACB_NORMAL )
+ has_enough_rights = user_has_privileges( p->pipe_user.nt_user_token, &se_add_users );
+ else if ( acb_info & (ACB_SVRTRUST|ACB_DOMTRUST) ) {
+ if ( lp_enable_privileges() )
+ has_enough_rights = nt_token_check_domain_rid( p->pipe_user.nt_user_token, DOMAIN_GROUP_RID_ADMINS );
+ }
+
DEBUG(5, ("_samr_set_userinfo: %s does%s possess sufficient rights\n",
p->pipe_user_name, has_enough_rights ? "" : " not"));
More information about the samba-cvs
mailing list