Add 'net rpc group [add|del]mem' for domain groups and aliases.
authorVolker Lendecke <vlendec@samba.org>
Sat, 28 Feb 2004 18:42:20 +0000 (18:42 +0000)
committerVolker Lendecke <vlendec@samba.org>
Sat, 28 Feb 2004 18:42:20 +0000 (18:42 +0000)
Volker

source/rpc_client/cli_pipe.c
source/rpc_client/cli_samr.c
source/rpc_parse/parse_samr.c
source/utils/net_rpc.c

index 3213e955b682bfbca1ac3525c022628339aba7bc..b9511ae00fcf9cbafd267f56a24c28dbfadcaebf 100644 (file)
@@ -1466,6 +1466,8 @@ BOOL cli_nt_session_open(struct cli_state *cli, const int pipe_idx)
                return False;
        }
 
+       cli->pipe_idx = pipe_idx;
+
        /* 
         * Setup the remote server name prefixed by \ and the machine account name.
         */
index c924e33f8aab5978b6b27b7723ba5ca44a428456..d534745d25a504d61d25280c421315f8eb418f8d 100644 (file)
@@ -371,6 +371,94 @@ NTSTATUS cli_samr_create_dom_group(struct cli_state *cli, TALLOC_CTX *mem_ctx,
        return result;
 }
 
+/* Add a domain group member */
+
+NTSTATUS cli_samr_add_groupmem(struct cli_state *cli, TALLOC_CTX *mem_ctx,
+                              POLICY_HND *group_pol, uint32 rid)
+{
+       prs_struct qbuf, rbuf;
+       SAMR_Q_ADD_GROUPMEM q;
+       SAMR_R_ADD_GROUPMEM r;
+       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+
+       DEBUG(10,("cli_samr_add_groupmem\n"));
+
+       ZERO_STRUCT(q);
+       ZERO_STRUCT(r);
+
+       /* Initialise parse structures */
+
+       prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
+       prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
+
+       /* Marshall data and send request */
+
+       init_samr_q_add_groupmem(&q, group_pol, rid);
+
+       if (!samr_io_q_add_groupmem("", &q, &qbuf, 0) ||
+           !rpc_api_pipe_req(cli, SAMR_ADD_GROUPMEM, &qbuf, &rbuf))
+               goto done;
+
+       /* Unmarshall response */
+
+       if (!samr_io_r_add_groupmem("", &r, &rbuf, 0))
+               goto done;
+
+       /* Return output parameters */
+
+       result = r.status;
+
+ done:
+       prs_mem_free(&qbuf);
+       prs_mem_free(&rbuf);
+
+       return result;
+}
+
+/* Delete a domain group member */
+
+NTSTATUS cli_samr_del_groupmem(struct cli_state *cli, TALLOC_CTX *mem_ctx,
+                              POLICY_HND *group_pol, uint32 rid)
+{
+       prs_struct qbuf, rbuf;
+       SAMR_Q_DEL_GROUPMEM q;
+       SAMR_R_DEL_GROUPMEM r;
+       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+
+       DEBUG(10,("cli_samr_del_groupmem\n"));
+
+       ZERO_STRUCT(q);
+       ZERO_STRUCT(r);
+
+       /* Initialise parse structures */
+
+       prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
+       prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
+
+       /* Marshall data and send request */
+
+       init_samr_q_del_groupmem(&q, group_pol, rid);
+
+       if (!samr_io_q_del_groupmem("", &q, &qbuf, 0) ||
+           !rpc_api_pipe_req(cli, SAMR_DEL_GROUPMEM, &qbuf, &rbuf))
+               goto done;
+
+       /* Unmarshall response */
+
+       if (!samr_io_r_del_groupmem("", &r, &rbuf, 0))
+               goto done;
+
+       /* Return output parameters */
+
+       result = r.status;
+
+ done:
+       prs_mem_free(&qbuf);
+       prs_mem_free(&rbuf);
+
+       return result;
+}
+
 /* Query user info */
 
 NTSTATUS cli_samr_query_userinfo(struct cli_state *cli, TALLOC_CTX *mem_ctx,
@@ -556,6 +644,50 @@ NTSTATUS cli_samr_query_usergroups(struct cli_state *cli, TALLOC_CTX *mem_ctx,
        return result;
 }
 
+/* Set alias info */
+
+NTSTATUS cli_samr_set_aliasinfo(struct cli_state *cli, TALLOC_CTX *mem_ctx,
+                               POLICY_HND *alias_pol, ALIAS_INFO_CTR *ctr)
+{
+       prs_struct qbuf, rbuf;
+       SAMR_Q_SET_ALIASINFO q;
+       SAMR_R_SET_ALIASINFO r;
+       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+
+       DEBUG(10,("cli_samr_set_aliasinfo\n"));
+
+       ZERO_STRUCT(q);
+       ZERO_STRUCT(r);
+
+       /* Initialise parse structures */
+
+       prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
+       prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
+
+       /* Marshall data and send request */
+
+       init_samr_q_set_aliasinfo(&q, alias_pol, ctr);
+
+       if (!samr_io_q_set_aliasinfo("", &q, &qbuf, 0) ||
+           !rpc_api_pipe_req(cli, SAMR_SET_ALIASINFO, &qbuf, &rbuf))
+               goto done;
+
+       /* Unmarshall response */
+
+       if (!samr_io_r_set_aliasinfo("", &r, &rbuf, 0))
+               goto done;
+
+       /* Return output parameters */
+
+       result = r.status;
+
+ done:
+       prs_mem_free(&qbuf);
+       prs_mem_free(&rbuf);
+
+       return result;
+}
+
 /* Query user aliases */
 
 NTSTATUS cli_samr_query_useraliases(struct cli_state *cli, TALLOC_CTX *mem_ctx, 
@@ -1034,6 +1166,149 @@ NTSTATUS cli_samr_open_alias(struct cli_state *cli, TALLOC_CTX *mem_ctx,
        return result;
 }
 
+/* Create an alias */
+
+NTSTATUS cli_samr_create_dom_alias(struct cli_state *cli, TALLOC_CTX *mem_ctx, 
+                                  POLICY_HND *domain_pol, const char *name,
+                                  POLICY_HND *alias_pol)
+{
+       prs_struct qbuf, rbuf;
+       SAMR_Q_CREATE_DOM_ALIAS q;
+       SAMR_R_CREATE_DOM_ALIAS r;
+       NTSTATUS result;
+
+       DEBUG(10,("cli_samr_create_dom_alias named %s\n", name));
+
+       ZERO_STRUCT(q);
+       ZERO_STRUCT(r);
+
+       /* Initialise parse structures */
+
+       prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
+       prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
+
+       /* Marshall data and send request */
+
+       init_samr_q_create_dom_alias(&q, domain_pol, name);
+
+       if (!samr_io_q_create_dom_alias("", &q, &qbuf, 0) ||
+           !rpc_api_pipe_req(cli, SAMR_CREATE_DOM_ALIAS, &qbuf, &rbuf)) {
+               result = NT_STATUS_UNSUCCESSFUL;
+               goto done;
+       }
+
+       /* Unmarshall response */
+
+       if (!samr_io_r_create_dom_alias("", &r, &rbuf, 0)) {
+               result = NT_STATUS_UNSUCCESSFUL;
+               goto done;
+       }
+
+       /* Return output parameters */
+
+       if (NT_STATUS_IS_OK(result = r.status)) {
+               *alias_pol = r.alias_pol;
+       }
+
+ done:
+       prs_mem_free(&qbuf);
+       prs_mem_free(&rbuf);
+
+       return result;
+}
+
+/* Add an alias member */
+
+NTSTATUS cli_samr_add_aliasmem(struct cli_state *cli, TALLOC_CTX *mem_ctx, 
+                              POLICY_HND *alias_pol, DOM_SID *member)
+{
+       prs_struct qbuf, rbuf;
+       SAMR_Q_ADD_ALIASMEM q;
+       SAMR_R_ADD_ALIASMEM r;
+       NTSTATUS result;
+
+       DEBUG(10,("cli_samr_add_aliasmem"));
+
+       ZERO_STRUCT(q);
+       ZERO_STRUCT(r);
+
+       /* Initialise parse structures */
+
+       prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
+       prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
+
+       /* Marshall data and send request */
+
+       init_samr_q_add_aliasmem(&q, alias_pol, member);
+
+       if (!samr_io_q_add_aliasmem("", &q, &qbuf, 0) ||
+           !rpc_api_pipe_req(cli, SAMR_ADD_ALIASMEM, &qbuf, &rbuf)) {
+               result = NT_STATUS_UNSUCCESSFUL;
+               goto done;
+       }
+
+       /* Unmarshall response */
+
+       if (!samr_io_r_add_aliasmem("", &r, &rbuf, 0)) {
+               result = NT_STATUS_UNSUCCESSFUL;
+               goto done;
+       }
+
+       result = r.status;
+
+ done:
+       prs_mem_free(&qbuf);
+       prs_mem_free(&rbuf);
+
+       return result;
+}
+
+/* Delete an alias member */
+
+NTSTATUS cli_samr_del_aliasmem(struct cli_state *cli, TALLOC_CTX *mem_ctx, 
+                              POLICY_HND *alias_pol, DOM_SID *member)
+{
+       prs_struct qbuf, rbuf;
+       SAMR_Q_DEL_ALIASMEM q;
+       SAMR_R_DEL_ALIASMEM r;
+       NTSTATUS result;
+
+       DEBUG(10,("cli_samr_del_aliasmem"));
+
+       ZERO_STRUCT(q);
+       ZERO_STRUCT(r);
+
+       /* Initialise parse structures */
+
+       prs_init(&qbuf, MAX_PDU_FRAG_LEN, mem_ctx, MARSHALL);
+       prs_init(&rbuf, 0, mem_ctx, UNMARSHALL);
+
+       /* Marshall data and send request */
+
+       init_samr_q_del_aliasmem(&q, alias_pol, member);
+
+       if (!samr_io_q_del_aliasmem("", &q, &qbuf, 0) ||
+           !rpc_api_pipe_req(cli, SAMR_DEL_ALIASMEM, &qbuf, &rbuf)) {
+               result = NT_STATUS_UNSUCCESSFUL;
+               goto done;
+       }
+
+       /* Unmarshall response */
+
+       if (!samr_io_r_del_aliasmem("", &r, &rbuf, 0)) {
+               result = NT_STATUS_UNSUCCESSFUL;
+               goto done;
+       }
+
+       result = r.status;
+
+ done:
+       prs_mem_free(&qbuf);
+       prs_mem_free(&rbuf);
+
+       return result;
+}
+
 /* Query alias info */
 
 NTSTATUS cli_samr_query_alias_info(struct cli_state *cli, TALLOC_CTX *mem_ctx,
index 402f23bde8fe51e16a7e6065f430fe0ff145e0d7..287dc3bd7f2b8240b3f21785dd95fd70f54b899f 100644 (file)
@@ -3521,7 +3521,7 @@ BOOL samr_io_alias_info1(const char *desc, ALIAS_INFO1 * al1,
 inits a ALIAS_INFO3 structure.
 ********************************************************************/
 
-void init_samr_alias_info3(ALIAS_INFO3 * al3, char *acct_desc)
+void init_samr_alias_info3(ALIAS_INFO3 * al3, const char *acct_desc)
 {
        DEBUG(5, ("init_samr_alias_info3\n"));
 
@@ -4232,7 +4232,7 @@ inits a SAMR_Q_CREATE_DOM_ALIAS structure.
 ********************************************************************/
 
 void init_samr_q_create_dom_alias(SAMR_Q_CREATE_DOM_ALIAS * q_u,
-                                 POLICY_HND *hnd, char *acct_desc)
+                                 POLICY_HND *hnd, const char *acct_desc)
 {
        DEBUG(5, ("init_samr_q_create_dom_alias\n"));
 
@@ -4241,7 +4241,7 @@ void init_samr_q_create_dom_alias(SAMR_Q_CREATE_DOM_ALIAS * q_u,
        init_unistr2(&q_u->uni_acct_desc, acct_desc, UNI_FLAGS_NONE);
        init_uni_hdr(&q_u->hdr_acct_desc, &q_u->uni_acct_desc);
 
-       q_u->access_mask = 0x001f000f;
+       q_u->access_mask = MAXIMUM_ALLOWED_ACCESS;
 }
 
 /*******************************************************************
index a3c4e7a13550732aea4f874a5cb573ede8ac3c3b..2e30a47afaab346d8fd372c98f546e4194cd3022 100644 (file)
@@ -1098,13 +1098,463 @@ rpc_group_add_internals(const DOM_SID *domain_sid, const char *domain_name,
        return result;
 }
 
+static NTSTATUS 
+rpc_alias_add_internals(const DOM_SID *domain_sid, const char *domain_name, 
+                       struct cli_state *cli,
+                       TALLOC_CTX *mem_ctx, int argc, const char **argv)
+{
+       POLICY_HND connect_pol, domain_pol, alias_pol;
+       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+       ALIAS_INFO_CTR alias_info;
+
+       if (argc != 1) {
+               d_printf("Group name must be specified\n");
+               rpc_group_usage(argc, argv);
+               return NT_STATUS_OK;
+       }
+
+       /* Get sam policy handle */
+       
+       result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
+                                 &connect_pol);
+       if (!NT_STATUS_IS_OK(result)) goto done;
+       
+       /* Get domain policy handle */
+       
+       result = cli_samr_open_domain(cli, mem_ctx, &connect_pol,
+                                     MAXIMUM_ALLOWED_ACCESS,
+                                     domain_sid, &domain_pol);
+       if (!NT_STATUS_IS_OK(result)) goto done;
+
+       /* Create the group */
+
+       result = cli_samr_create_dom_alias(cli, mem_ctx, &domain_pol,
+                                          argv[0], &alias_pol);
+       if (!NT_STATUS_IS_OK(result)) goto done;
+
+       if (strlen(opt_comment) == 0) goto done;
+
+       /* We've got a comment to set */
+
+       alias_info.switch_value1 = 3;
+       alias_info.switch_value2 = 3;
+       init_samr_alias_info3(&alias_info.alias.info3, opt_comment);
+
+       result = cli_samr_set_aliasinfo(cli, mem_ctx, &alias_pol, &alias_info);
+       if (!NT_STATUS_IS_OK(result)) goto done;
+       
+ done:
+       if (NT_STATUS_IS_OK(result))
+               DEBUG(5, ("add group succeeded\n"));
+       else
+               d_printf("add group failed: %s\n", nt_errstr(result));
+
+       return result;
+}
+
 static int rpc_group_add(int argc, const char **argv)
 {
+       if (opt_localgroup)
+               return run_rpc_command(NULL, PI_SAMR, 0,
+                                      rpc_alias_add_internals,
+                                      argc, argv);
+
        return run_rpc_command(NULL, PI_SAMR, 0,
                               rpc_group_add_internals,
                               argc, argv);
 }
 
+static NTSTATUS
+get_sid_from_name(struct cli_state *cli, TALLOC_CTX *mem_ctx, const char *name,
+                 DOM_SID *sid, enum SID_NAME_USE *type)
+{
+       int current_pipe = cli->pipe_idx;
+
+       DOM_SID *sids = NULL;
+       uint32 *types = NULL;
+       POLICY_HND lsa_pol;
+       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+
+       if (current_pipe != PI_LSARPC) {
+
+               if (current_pipe != -1)
+                       cli_nt_session_close(cli);
+
+               if (!cli_nt_session_open(cli, PI_LSARPC))
+                       goto done;
+       }
+
+       result = cli_lsa_open_policy(cli, mem_ctx, False,
+                                    SEC_RIGHTS_MAXIMUM_ALLOWED, &lsa_pol);
+
+       if (!NT_STATUS_IS_OK(result))
+               goto done;
+
+       result = cli_lsa_lookup_names(cli, mem_ctx, &lsa_pol, 1,
+                                     &name, &sids, &types);
+
+       if (NT_STATUS_IS_OK(result)) {
+               sid_copy(sid, &sids[0]);
+               *type = types[0];
+       }
+
+       cli_lsa_close(cli, mem_ctx, &lsa_pol);
+
+ done:
+       if (current_pipe != PI_LSARPC) {
+               cli_nt_session_close(cli);
+               if (current_pipe != -1)
+                       cli_nt_session_open(cli, current_pipe);
+       }
+
+       if (!NT_STATUS_IS_OK(result) && (StrnCaseCmp(name, "S-", 2) == 0)) {
+
+               /* Try as S-1-5-whatever */
+
+               DOM_SID tmp_sid;
+
+               if (string_to_sid(&tmp_sid, name)) {
+                       sid_copy(sid, &tmp_sid);
+                       *type = SID_NAME_UNKNOWN;
+                       result = NT_STATUS_OK;
+               }
+       }
+
+       return result;
+}
+
+static NTSTATUS
+rpc_add_groupmem(struct cli_state *cli, TALLOC_CTX *mem_ctx,
+                const DOM_SID *group_sid, const char *member)
+{
+       POLICY_HND connect_pol, domain_pol;
+       NTSTATUS result;
+       uint32 group_rid;
+       POLICY_HND group_pol;
+
+       uint32 num_rids;
+       uint32 *rids = NULL;
+       uint32 *rid_types = NULL;
+
+       DOM_SID sid;
+
+       sid_copy(&sid, group_sid);
+
+       if (!sid_split_rid(&sid, &group_rid))
+               return NT_STATUS_UNSUCCESSFUL;
+
+       /* Get sam policy handle */     
+       result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
+                                 &connect_pol);
+       if (!NT_STATUS_IS_OK(result))
+               return result;
+       
+       /* Get domain policy handle */
+       result = cli_samr_open_domain(cli, mem_ctx, &connect_pol,
+                                     MAXIMUM_ALLOWED_ACCESS,
+                                     &sid, &domain_pol);
+       if (!NT_STATUS_IS_OK(result))
+               return result;
+
+       result = cli_samr_lookup_names(cli, mem_ctx, &domain_pol, 1000,
+                                      1, &member,
+                                      &num_rids, &rids, &rid_types);
+
+       if (!NT_STATUS_IS_OK(result)) {
+               d_printf("Could not lookup up group member %s\n", member);
+               goto done;
+       }
+
+       result = cli_samr_open_group(cli, mem_ctx, &domain_pol,
+                                    MAXIMUM_ALLOWED_ACCESS,
+                                    group_rid, &group_pol);
+
+       if (!NT_STATUS_IS_OK(result))
+               goto done;
+
+       result = cli_samr_add_groupmem(cli, mem_ctx, &group_pol, rids[0]);
+
+ done:
+       cli_samr_close(cli, mem_ctx, &connect_pol);
+       return result;
+}
+
+static NTSTATUS
+rpc_add_aliasmem(struct cli_state *cli, TALLOC_CTX *mem_ctx,
+                const DOM_SID *alias_sid, const char *member)
+{
+       POLICY_HND connect_pol, domain_pol;
+       NTSTATUS result;
+       uint32 alias_rid;
+       POLICY_HND alias_pol;
+
+       DOM_SID member_sid;
+       enum SID_NAME_USE member_type;
+
+       DOM_SID sid;
+
+       sid_copy(&sid, alias_sid);
+
+       if (!sid_split_rid(&sid, &alias_rid))
+               return NT_STATUS_UNSUCCESSFUL;
+
+       result = get_sid_from_name(cli, mem_ctx, member,
+                                  &member_sid, &member_type);
+
+       if (!NT_STATUS_IS_OK(result)) {
+               d_printf("Could not lookup up group member %s\n", member);
+               return result;
+       }
+
+       /* Get sam policy handle */     
+       result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
+                                 &connect_pol);
+       if (!NT_STATUS_IS_OK(result)) {
+               goto done;
+       }
+       
+       /* Get domain policy handle */
+       result = cli_samr_open_domain(cli, mem_ctx, &connect_pol,
+                                     MAXIMUM_ALLOWED_ACCESS,
+                                     &sid, &domain_pol);
+       if (!NT_STATUS_IS_OK(result)) {
+               goto done;
+       }
+
+       result = cli_samr_open_alias(cli, mem_ctx, &domain_pol,
+                                    MAXIMUM_ALLOWED_ACCESS,
+                                    alias_rid, &alias_pol);
+
+       if (!NT_STATUS_IS_OK(result))
+               return result;
+
+       result = cli_samr_add_aliasmem(cli, mem_ctx, &alias_pol, &member_sid);
+
+       if (!NT_STATUS_IS_OK(result))
+               return result;
+
+ done:
+       cli_samr_close(cli, mem_ctx, &connect_pol);
+       return result;
+}
+
+static NTSTATUS 
+rpc_group_addmem_internals(const DOM_SID *domain_sid, const char *domain_name, 
+                          struct cli_state *cli,
+                          TALLOC_CTX *mem_ctx, int argc, const char **argv)
+{
+       DOM_SID group_sid;
+       enum SID_NAME_USE group_type;
+
+       if (argc != 2) {
+               d_printf("Usage: 'net rpc group addmem <group> <member>\n");
+               return NT_STATUS_UNSUCCESSFUL;
+       }
+
+       if (!NT_STATUS_IS_OK(get_sid_from_name(cli, mem_ctx, argv[0],
+                                              &group_sid, &group_type))) {
+               d_printf("Could not lookup group name %s\n", argv[0]);
+               return NT_STATUS_UNSUCCESSFUL;
+       }
+
+       if (group_type == SID_NAME_DOM_GRP) {
+               NTSTATUS result = rpc_add_groupmem(cli, mem_ctx,
+                                                  &group_sid, argv[1]);
+
+               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;
+               }
+       }
+
+       if (group_type == SID_NAME_ALIAS) {
+               NTSTATUS result = rpc_add_aliasmem(cli, mem_ctx,
+                                                  &group_sid, argv[1]);
+
+               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 NT_STATUS_UNSUCCESSFUL;
+}
+
+static int rpc_group_addmem(int argc, const char **argv)
+{
+       return run_rpc_command(NULL, PI_SAMR, 0,
+                              rpc_group_addmem_internals,
+                              argc, argv);
+}
+
+static NTSTATUS
+rpc_del_groupmem(struct cli_state *cli, TALLOC_CTX *mem_ctx,
+                const DOM_SID *group_sid, const char *member)
+{
+       POLICY_HND connect_pol, domain_pol;
+       NTSTATUS result;
+       uint32 group_rid;
+       POLICY_HND group_pol;
+
+       uint32 num_rids;
+       uint32 *rids = NULL;
+       uint32 *rid_types = NULL;
+
+       DOM_SID sid;
+
+       sid_copy(&sid, group_sid);
+
+       if (!sid_split_rid(&sid, &group_rid))
+               return NT_STATUS_UNSUCCESSFUL;
+
+       /* Get sam policy handle */     
+       result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
+                                 &connect_pol);
+       if (!NT_STATUS_IS_OK(result))
+               return result;
+       
+       /* Get domain policy handle */
+       result = cli_samr_open_domain(cli, mem_ctx, &connect_pol,
+                                     MAXIMUM_ALLOWED_ACCESS,
+                                     &sid, &domain_pol);
+       if (!NT_STATUS_IS_OK(result))
+               return result;
+
+       result = cli_samr_lookup_names(cli, mem_ctx, &domain_pol, 1000,
+                                      1, &member,
+                                      &num_rids, &rids, &rid_types);
+
+       if (!NT_STATUS_IS_OK(result)) {
+               d_printf("Could not lookup up group member %s\n", member);
+               goto done;
+       }
+
+       result = cli_samr_open_group(cli, mem_ctx, &domain_pol,
+                                    MAXIMUM_ALLOWED_ACCESS,
+                                    group_rid, &group_pol);
+
+       if (!NT_STATUS_IS_OK(result))
+               goto done;
+
+       result = cli_samr_del_groupmem(cli, mem_ctx, &group_pol, rids[0]);
+
+ done:
+       cli_samr_close(cli, mem_ctx, &connect_pol);
+       return result;
+}
+
+static NTSTATUS
+rpc_del_aliasmem(struct cli_state *cli, TALLOC_CTX *mem_ctx,
+                const DOM_SID *alias_sid, const char *member)
+{
+       POLICY_HND connect_pol, domain_pol;
+       NTSTATUS result;
+       uint32 alias_rid;
+       POLICY_HND alias_pol;
+
+       DOM_SID member_sid;
+       enum SID_NAME_USE member_type;
+
+       DOM_SID sid;
+
+       sid_copy(&sid, alias_sid);
+
+       if (!sid_split_rid(&sid, &alias_rid))
+               return NT_STATUS_UNSUCCESSFUL;
+
+       result = get_sid_from_name(cli, mem_ctx, member,
+                                  &member_sid, &member_type);
+
+       if (!NT_STATUS_IS_OK(result)) {
+               d_printf("Could not lookup up group member %s\n", member);
+               return result;
+       }
+
+       /* Get sam policy handle */     
+       result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
+                                 &connect_pol);
+       if (!NT_STATUS_IS_OK(result)) {
+               goto done;
+       }
+       
+       /* Get domain policy handle */
+       result = cli_samr_open_domain(cli, mem_ctx, &connect_pol,
+                                     MAXIMUM_ALLOWED_ACCESS,
+                                     &sid, &domain_pol);
+       if (!NT_STATUS_IS_OK(result)) {
+               goto done;
+       }
+
+       result = cli_samr_open_alias(cli, mem_ctx, &domain_pol,
+                                    MAXIMUM_ALLOWED_ACCESS,
+                                    alias_rid, &alias_pol);
+
+       if (!NT_STATUS_IS_OK(result))
+               return result;
+
+       result = cli_samr_del_aliasmem(cli, mem_ctx, &alias_pol, &member_sid);
+
+       if (!NT_STATUS_IS_OK(result))
+               return result;
+
+ done:
+       cli_samr_close(cli, mem_ctx, &connect_pol);
+       return result;
+}
+
+static NTSTATUS 
+rpc_group_delmem_internals(const DOM_SID *domain_sid, const char *domain_name, 
+                          struct cli_state *cli,
+                          TALLOC_CTX *mem_ctx, int argc, const char **argv)
+{
+       DOM_SID group_sid;
+       enum SID_NAME_USE group_type;
+
+       if (argc != 2) {
+               d_printf("Usage: 'net rpc group delmem <group> <member>\n");
+               return NT_STATUS_UNSUCCESSFUL;
+       }
+
+       if (!NT_STATUS_IS_OK(get_sid_from_name(cli, mem_ctx, argv[0],
+                                              &group_sid, &group_type))) {
+               d_printf("Could not lookup group name %s\n", argv[0]);
+               return NT_STATUS_UNSUCCESSFUL;
+       }
+
+       if (group_type == SID_NAME_DOM_GRP) {
+               NTSTATUS result = rpc_del_groupmem(cli, mem_ctx,
+                                                  &group_sid, argv[1]);
+
+               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;
+               }
+       }
+
+       if (group_type == SID_NAME_ALIAS) {
+               NTSTATUS result = rpc_del_aliasmem(cli, mem_ctx, 
+                                                  &group_sid, argv[1]);
+
+               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 NT_STATUS_UNSUCCESSFUL;
+}
+
+static int rpc_group_delmem(int argc, const char **argv)
+{
+       return run_rpc_command(NULL, PI_SAMR, 0,
+                              rpc_group_delmem_internals,
+                              argc, argv);
+}
+
 /** 
  * List groups on a remote RPC server
  *
@@ -1563,6 +2013,8 @@ int net_rpc_group(int argc, const char **argv)
 {
        struct functable func[] = {
                {"add", rpc_group_add},
+               {"addmem", rpc_group_addmem},
+               {"delmem", rpc_group_delmem},
 #if 0
                {"delete", rpc_group_delete},
 #endif