diff options
| author | Volker Lendecke <vlendec@samba.org> | 2004-02-29 16:34:33 +0000 |
|---|---|---|
| committer | Volker Lendecke <vlendec@samba.org> | 2004-02-29 16:34:33 +0000 |
| commit | c4877403a04b60619523dfe3fc892564ff41a079 (patch) | |
| tree | 9d46368a664444e7bcae10b5faeee774c4f08171 | |
| parent | efd357b732238a95ed38fe75544044f5339f3344 (diff) | |
| download | samba-c4877403a04b60619523dfe3fc892564ff41a079.tar.gz samba-c4877403a04b60619523dfe3fc892564ff41a079.tar.xz samba-c4877403a04b60619523dfe3fc892564ff41a079.zip | |
net_rpc.c: Don't complain if [add|del]mem was successful.
srv_samr_nt.c: Correctly report that a user is not member of an alias.
Volker
(This used to be commit 540f625036871e7facd094fce49d7317f65f4ffd)
| -rw-r--r-- | source3/rpc_server/srv_samr_nt.c | 2 | ||||
| -rw-r--r-- | source3/utils/net_rpc.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c index 58dcd48d8d..a817627127 100644 --- a/source3/rpc_server/srv_samr_nt.c +++ b/source3/rpc_server/srv_samr_nt.c @@ -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)); diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c index a565effeff..19825ff51b 100644 --- a/source3/utils/net_rpc.c +++ b/source3/utils/net_rpc.c @@ -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 " |