sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

net_rpc.c: Don't complain if [add|del]mem was successful.

Browse Source 
srv_samr_nt.c: Correctly report that a user is not member of an alias.

Volker
This commit is contained in:
Volker Lendecke 0001-01-01 00:00:00 +00:00
parent 73f26de5c0
commit 540f625036
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/rpc_server/srv_samr_nt.c
View File

@ -3477,7 +3477,7 @@ NTSTATUS _samr_del_aliasmem(pipes_struct *p, SAMR_Q_DEL_ALIASMEM *q_u, SAMR_R_DE
/* if the user is not in the group */
if(!user_in_unix_group_list(pdb_get_username(sam_pass), grp_name)) {
pdb_free_sam(&sam_pass);
return NT_STATUS_MEMBER_IN_ALIAS;
return NT_STATUS_MEMBER_NOT_IN_ALIAS;
}
smb_delete_user_group(grp_name, pdb_get_username(sam_pass));

8
source/utils/net_rpc.c
View File

@ -1364,8 +1364,8 @@ rpc_group_addmem_internals(const DOM_SID *domain_sid, const char *domain_name,
if (!NT_STATUS_IS_OK(result)) {
d_printf("Could not add %s to %s: %s\n",
argv[1], argv[0], nt_errstr(result));
return result;
}
return result;
}
if (group_type == SID_NAME_ALIAS) {
@ -1375,8 +1375,8 @@ rpc_group_addmem_internals(const DOM_SID *domain_sid, const char *domain_name,
if (!NT_STATUS_IS_OK(result)) {
d_printf("Could not add %s to %s: %s\n",
argv[1], argv[0], nt_errstr(result));
return result;
}
return result;
}
d_printf("Can only add members to global or local groups which "
@ -1533,8 +1533,8 @@ rpc_group_delmem_internals(const DOM_SID *domain_sid, const char *domain_name,
if (!NT_STATUS_IS_OK(result)) {
d_printf("Could not del %s to %s: %s\n",
argv[1], argv[0], nt_errstr(result));
return result;
}
return result;
}
if (group_type == SID_NAME_ALIAS) {
@ -1544,8 +1544,8 @@ rpc_group_delmem_internals(const DOM_SID *domain_sid, const char *domain_name,
if (!NT_STATUS_IS_OK(result)) {
d_printf("Could not add %s to %s: %s\n",
argv[1], argv[0], nt_errstr(result));
return result;
}
return result;
}
d_printf("Can only delete members from global or local groups which "