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 26d99204b7cbfa8e259f2a8438eadc9ff6be0709)

diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index 58dcd48d8d96b409ce6d4f3c183206c8f398c979..a8176271278770eddedefd072f51ac01d064a488 100644 (file)
--- 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 a565effeff2e6410b4a5cdd2f391f67cb3457331..19825ff51b20d932946f9c7bd395ba5690f56fa9 100644 (file)
--- 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 "