From 02355fc6fd176312b61198e626cfe1fbb1ed5ac5 Mon Sep 17 00:00:00 2001 From: Matthias Dieter Wallnöfer Date: Sat, 30 Oct 2010 18:32:43 +0200 Subject: s4:samr RPC server - the LDB error codes for adding or deleting a group member have changed --- source4/rpc_server/samr/dcesrv_samr.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'source4/rpc_server') diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c index 3c08851e09..dbc9c1e245 100644 --- a/source4/rpc_server/samr/dcesrv_samr.c +++ b/source4/rpc_server/samr/dcesrv_samr.c @@ -1994,7 +1994,6 @@ static NTSTATUS dcesrv_samr_AddGroupMember(struct dcesrv_call_state *dce_call, T switch (ret) { case LDB_SUCCESS: return NT_STATUS_OK; - case LDB_ERR_ATTRIBUTE_OR_VALUE_EXISTS: case LDB_ERR_ENTRY_ALREADY_EXISTS: return NT_STATUS_MEMBER_IN_GROUP; case LDB_ERR_INSUFFICIENT_ACCESS_RIGHTS: @@ -2099,7 +2098,7 @@ static NTSTATUS dcesrv_samr_DeleteGroupMember(struct dcesrv_call_state *dce_call switch (ret) { case LDB_SUCCESS: return NT_STATUS_OK; - case LDB_ERR_NO_SUCH_ATTRIBUTE: + case LDB_ERR_UNWILLING_TO_PERFORM: return NT_STATUS_MEMBER_NOT_IN_GROUP; case LDB_ERR_INSUFFICIENT_ACCESS_RIGHTS: return NT_STATUS_ACCESS_DENIED; @@ -2468,7 +2467,6 @@ static NTSTATUS dcesrv_samr_AddAliasMember(struct dcesrv_call_state *dce_call, T switch (ret) { case LDB_SUCCESS: return NT_STATUS_OK; - case LDB_ERR_ATTRIBUTE_OR_VALUE_EXISTS: case LDB_ERR_ENTRY_ALREADY_EXISTS: return NT_STATUS_MEMBER_IN_GROUP; case LDB_ERR_INSUFFICIENT_ACCESS_RIGHTS: @@ -2521,7 +2519,7 @@ static NTSTATUS dcesrv_samr_DeleteAliasMember(struct dcesrv_call_state *dce_call switch (ret) { case LDB_SUCCESS: return NT_STATUS_OK; - case LDB_ERR_NO_SUCH_ATTRIBUTE: + case LDB_ERR_UNWILLING_TO_PERFORM: return NT_STATUS_MEMBER_NOT_IN_GROUP; case LDB_ERR_INSUFFICIENT_ACCESS_RIGHTS: return NT_STATUS_ACCESS_DENIED; -- cgit