r10656: BIG merge from trunk. Features not copied over
[tprouty/samba.git] / source3 / utils / net_rpc.c
index 80f02f2ae9363393d31aa85d29a27f6aaba49846..f1522ef158297b248923fa0e800a810f0d08979c 100644 (file)
@@ -3,6 +3,8 @@
    Distributed SMB/CIFS Server Management Utility 
    Copyright (C) 2001 Andrew Bartlett (abartlet@samba.org)
    Copyright (C) 2002 Jim McDonough (jmcd@us.ibm.com)
+   Copyright (C) 2004 Guenther Deschner (gd@samba.org)
+   Copyright (C) 2005 Jeremy Allison (jra@samba.org)
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,7 +21,9 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
  
 #include "includes.h"
-#include "../utils/net.h"
+#include "utils/net.h"
+
+static int net_mode_share;
 
 /**
  * @file net_rpc.c
  **/
 
 
-/* A function of this type is passed to the 'run_rpc_command' wrapper */
-typedef NTSTATUS (*rpc_command_fn)(const DOM_SID *, const char *, 
-                                  struct cli_state *, TALLOC_CTX *, int, const char **);
-
 /**
  * Many of the RPC functions need the domain sid.  This function gets
  *  it at the start of every run 
@@ -51,24 +51,26 @@ typedef NTSTATUS (*rpc_command_fn)(const DOM_SID *, const char *,
 
 static DOM_SID *net_get_remote_domain_sid(struct cli_state *cli, TALLOC_CTX *mem_ctx, char **domain_name)
 {
+       struct rpc_pipe_client *lsa_pipe;
        DOM_SID *domain_sid;
        POLICY_HND pol;
        NTSTATUS result = NT_STATUS_OK;
        uint32 info_class = 5;
        
-       if (!cli_nt_session_open (cli, PI_LSARPC)) {
+       lsa_pipe = cli_rpc_pipe_open_noauth(cli, PI_LSARPC, &result);
+       if (!lsa_pipe) {
                fprintf(stderr, "could not initialise lsa pipe\n");
                goto error;
        }
        
-       result = cli_lsa_open_policy(cli, mem_ctx, False, 
+       result = rpccli_lsa_open_policy(lsa_pipe, mem_ctx, False, 
                                     SEC_RIGHTS_MAXIMUM_ALLOWED,
                                     &pol);
        if (!NT_STATUS_IS_OK(result)) {
                goto error;
        }
 
-       result = cli_lsa_query_info_policy(cli, mem_ctx, &pol, info_class, 
+       result = rpccli_lsa_query_info_policy(lsa_pipe, mem_ctx, &pol, info_class, 
                                           domain_name, &domain_sid);
        if (!NT_STATUS_IS_OK(result)) {
  error:
@@ -81,8 +83,10 @@ static DOM_SID *net_get_remote_domain_sid(struct cli_state *cli, TALLOC_CTX *mem
                exit(1);
        }
 
-       cli_lsa_close(cli, mem_ctx, &pol);
-       cli_nt_session_close(cli);
+       if (lsa_pipe) {
+               rpccli_lsa_close(lsa_pipe, mem_ctx, &pol);
+               cli_rpc_pipe_close(lsa_pipe);
+       }
 
        return domain_sid;
 }
@@ -99,21 +103,26 @@ static DOM_SID *net_get_remote_domain_sid(struct cli_state *cli, TALLOC_CTX *mem
  * @return A shell status integer (0 for success)
  */
 
-static int run_rpc_command(struct cli_state *cli_arg, const int pipe_idx, int conn_flags,
-                           rpc_command_fn fn,
-                           int argc, const char **argv) 
+int run_rpc_command(struct cli_state *cli_arg,
+                       const int pipe_idx,
+                       int conn_flags,
+                       rpc_command_fn fn,
+                       int argc,
+                       const char **argv) 
 {
        struct cli_state *cli = NULL;
+       struct rpc_pipe_client *pipe_hnd = NULL;
        TALLOC_CTX *mem_ctx;
        NTSTATUS nt_status;
        DOM_SID *domain_sid;
        char *domain_name;
 
        /* make use of cli_state handed over as an argument, if possible */
-       if (!cli_arg)
+       if (!cli_arg) {
                cli = net_make_ipc_connection(conn_flags);
-       else
+       } else {
                cli = cli_arg;
+       }
 
        if (!cli) {
                return -1;
@@ -130,12 +139,31 @@ static int run_rpc_command(struct cli_state *cli_arg, const int pipe_idx, int co
        domain_sid = net_get_remote_domain_sid(cli, mem_ctx, &domain_name);
 
        if (!(conn_flags & NET_FLAGS_NO_PIPE)) {
-               if (!cli_nt_session_open(cli, pipe_idx)) {
-                       DEBUG(0, ("Could not initialise pipe\n"));
+               if (lp_client_schannel() && (pipe_idx == PI_NETLOGON)) {
+                       /* Always try and create an schannel netlogon pipe. */
+                       pipe_hnd = cli_rpc_pipe_open_schannel(cli, pipe_idx,
+                                                       PIPE_AUTH_LEVEL_PRIVACY,
+                                                       domain_name,
+                                                       &nt_status);
+                       if (!pipe_hnd) {
+                               DEBUG(0, ("Could not initialise schannel netlogon pipe. Error was %s\n",
+                                       nt_errstr(nt_status) ));
+                               cli_shutdown(cli);
+                               return -1;
+                       }
+               } else {
+                       pipe_hnd = cli_rpc_pipe_open_noauth(cli, pipe_idx, &nt_status);
+                       if (!pipe_hnd) {
+                               DEBUG(0, ("Could not initialise pipe %s. Error was %s\n",
+                                       cli_get_pipe_name(pipe_idx),
+                                       nt_errstr(nt_status) ));
+                               cli_shutdown(cli);
+                               return -1;
+                       }
                }
        }
        
-       nt_status = fn(domain_sid, domain_name, cli, mem_ctx, argc, argv);
+       nt_status = fn(domain_sid, domain_name, cli, pipe_hnd, mem_ctx, argc, argv);
        
        if (!NT_STATUS_IS_OK(nt_status)) {
                DEBUG(1, ("rpc command function failed! (%s)\n", nt_errstr(nt_status)));
@@ -144,23 +172,20 @@ static int run_rpc_command(struct cli_state *cli_arg, const int pipe_idx, int co
        }
                
        if (!(conn_flags & NET_FLAGS_NO_PIPE)) {
-               if (cli->nt_pipe_fnum)
-                       cli_nt_session_close(cli);
+               if (pipe_hnd) {
+                       cli_rpc_pipe_close(pipe_hnd);
+               }
        }
 
        /* close the connection only if it was opened here */
-       if (!cli_arg)
+       if (!cli_arg) {
                cli_shutdown(cli);
+       }
        
        talloc_destroy(mem_ctx);
-
        return (!NT_STATUS_IS_OK(nt_status));
 }
 
-
-/****************************************************************************/
-
-
 /** 
  * Force a change of the trust acccount password.
  *
@@ -177,11 +202,16 @@ static int run_rpc_command(struct cli_state *cli_arg, const int pipe_idx, int co
  * @return Normal NTSTATUS return.
  **/
 
-static NTSTATUS rpc_changetrustpw_internals(const DOM_SID *domain_sid, const char *domain_name, 
-                                           struct cli_state *cli, TALLOC_CTX *mem_ctx, 
-                                           int argc, const char **argv) {
+static NTSTATUS rpc_changetrustpw_internals(const DOM_SID *domain_sid,
+                                       const char *domain_name, 
+                                       struct cli_state *cli,
+                                       struct rpc_pipe_client *pipe_hnd,
+                                       TALLOC_CTX *mem_ctx, 
+                                       int argc,
+                                       const char **argv)
+{
        
-       return trust_pw_find_change_and_store_it(cli, mem_ctx, opt_target_workgroup);
+       return trust_pw_find_change_and_store_it(pipe_hnd, mem_ctx, opt_target_workgroup);
 }
 
 /** 
@@ -201,10 +231,6 @@ int net_rpc_changetrustpw(int argc, const char **argv)
                               argc, argv);
 }
 
-
-/****************************************************************************/
-
-
 /** 
  * Join a domain, the old way.
  *
@@ -225,16 +251,29 @@ int net_rpc_changetrustpw(int argc, const char **argv)
  * @return Normal NTSTATUS return.
  **/
 
-static NTSTATUS rpc_oldjoin_internals(const DOM_SID *domain_sid, const char *domain_name, 
-                                     struct cli_state *cli, 
-                                     TALLOC_CTX *mem_ctx, 
-                                     int argc, const char **argv) {
+static NTSTATUS rpc_oldjoin_internals(const DOM_SID *domain_sid,
+                                       const char *domain_name, 
+                                       struct cli_state *cli, 
+                                       struct rpc_pipe_client *pipe_hnd,
+                                       TALLOC_CTX *mem_ctx, 
+                                       int argc,
+                                       const char **argv)
+{
        
        fstring trust_passwd;
        unsigned char orig_trust_passwd_hash[16];
        NTSTATUS result;
        uint32 sec_channel_type;
 
+       pipe_hnd = cli_rpc_pipe_open_noauth(cli, PI_NETLOGON, &result);
+       if (!pipe_hnd) {
+               DEBUG(0,("rpc_oldjoin_internals: netlogon pipe open to machine %s failed. "
+                       "error was %s\n",
+                       cli->desthost,
+                       nt_errstr(result) ));
+               return result;
+       }
+
        /* 
           check what type of join - if the user want's to join as
           a BDC, the server must agree that we are a BDC.
@@ -257,7 +296,7 @@ static NTSTATUS rpc_oldjoin_internals(const DOM_SID *domain_sid, const char *dom
 
        E_md4hash(trust_passwd, orig_trust_passwd_hash);
 
-       result = trust_pw_change_and_store_it(cli, mem_ctx, opt_target_workgroup,
+       result = trust_pw_change_and_store_it(pipe_hnd, mem_ctx, opt_target_workgroup,
                                              orig_trust_passwd_hash,
                                              sec_channel_type);
 
@@ -286,7 +325,7 @@ static NTSTATUS rpc_oldjoin_internals(const DOM_SID *domain_sid, const char *dom
 static int net_rpc_perform_oldjoin(int argc, const char **argv)
 {
        return run_rpc_command(NULL, PI_NETLOGON, 
-                              NET_FLAGS_ANONYMOUS | NET_FLAGS_PDC, 
+                              NET_FLAGS_NO_PIPE | NET_FLAGS_ANONYMOUS | NET_FLAGS_PDC, 
                               rpc_oldjoin_internals,
                               argc, argv);
 }
@@ -355,8 +394,6 @@ int net_rpc_join(int argc, const char **argv)
        return net_rpc_join_newstyle(argc, argv);
 }
 
-
-
 /** 
  * display info about a rpc domain
  *
@@ -373,10 +410,13 @@ int net_rpc_join(int argc, const char **argv)
  * @return Normal NTSTATUS return.
  **/
 
-static NTSTATUS 
-rpc_info_internals(const DOM_SID *domain_sid, const char *domain_name, 
-                  struct cli_state *cli,
-                  TALLOC_CTX *mem_ctx, int argc, const char **argv)
+static NTSTATUS rpc_info_internals(const DOM_SID *domain_sid,
+                       const char *domain_name, 
+                       struct cli_state *cli,
+                       struct rpc_pipe_client *pipe_hnd,
+                       TALLOC_CTX *mem_ctx,
+                       int argc,
+                       const char **argv)
 {
        POLICY_HND connect_pol, domain_pol;
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
@@ -386,14 +426,14 @@ rpc_info_internals(const DOM_SID *domain_sid, const char *domain_name,
        sid_to_string(sid_str, domain_sid);
 
        /* Get sam policy handle */     
-       result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
+       result = rpccli_samr_connect(pipe_hnd, 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,
+       result = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &connect_pol,
                                      MAXIMUM_ALLOWED_ACCESS,
                                      domain_sid, &domain_pol);
        if (!NT_STATUS_IS_OK(result)) {
@@ -401,13 +441,13 @@ rpc_info_internals(const DOM_SID *domain_sid, const char *domain_name,
        }
 
        ZERO_STRUCT(ctr);
-       result = cli_samr_query_dom_info(cli, mem_ctx, &domain_pol,
+       result = rpccli_samr_query_dom_info(pipe_hnd, mem_ctx, &domain_pol,
                                         2, &ctr);
        if (NT_STATUS_IS_OK(result)) {
                TALLOC_CTX *ctx = talloc_init("rpc_info_internals");
                d_printf("Domain Name: %s\n", unistr2_tdup(ctx, &ctr.info.inf2.uni_domain));
                d_printf("Domain SID: %s\n", sid_str);
-               d_printf("Sequence number: %u\n", ctr.info.inf2.seq_num);
+               d_printf("Sequence number: %u\n", ctr.info.inf2.seq_num.low);
                d_printf("Num users: %u\n", ctr.info.inf2.num_domain_usrs);
                d_printf("Num domain groups: %u\n", ctr.info.inf2.num_domain_grps);
                d_printf("Num local groups: %u\n", ctr.info.inf2.num_local_grps);
@@ -418,13 +458,13 @@ rpc_info_internals(const DOM_SID *domain_sid, const char *domain_name,
        return result;
 }
 
-
 /** 
  * 'net rpc info' entrypoint.
  * @param argc  Standard main() style argc
  * @param argc  Standard main() style argv.  Initial components are already
  *              stripped
  **/
+
 int net_rpc_info(int argc, const char **argv) 
 {
        return run_rpc_command(NULL, PI_SAMR, NET_FLAGS_ANONYMOUS | NET_FLAGS_PDC, 
@@ -432,7 +472,6 @@ int net_rpc_info(int argc, const char **argv)
                               argc, argv);
 }
 
-
 /** 
  * Fetch domain SID into the local secrets.tdb
  *
@@ -449,10 +488,13 @@ int net_rpc_info(int argc, const char **argv)
  * @return Normal NTSTATUS return.
  **/
 
-static NTSTATUS 
-rpc_getsid_internals(const DOM_SID *domain_sid, const char *domain_name, 
-                    struct cli_state *cli,
-                    TALLOC_CTX *mem_ctx, int argc, const char **argv)
+static NTSTATUS rpc_getsid_internals(const DOM_SID *domain_sid,
+                       const char *domain_name, 
+                       struct cli_state *cli,
+                       struct rpc_pipe_client *pipe_hnd,
+                       TALLOC_CTX *mem_ctx,
+                       int argc,
+                       const char **argv)
 {
        fstring sid_str;
 
@@ -468,13 +510,13 @@ rpc_getsid_internals(const DOM_SID *domain_sid, const char *domain_name,
        return NT_STATUS_OK;
 }
 
-
 /** 
  * 'net rpc getsid' entrypoint.
  * @param argc  Standard main() style argc
  * @param argc  Standard main() style argv.  Initial components are already
  *              stripped
  **/
+
 int net_rpc_getsid(int argc, const char **argv) 
 {
        return run_rpc_command(NULL, PI_SAMR, NET_FLAGS_ANONYMOUS | NET_FLAGS_PDC, 
@@ -482,7 +524,6 @@ int net_rpc_getsid(int argc, const char **argv)
                               argc, argv);
 }
 
-
 /****************************************************************************/
 
 /**
@@ -513,9 +554,13 @@ static int rpc_user_usage(int argc, const char **argv)
  * @return Normal NTSTATUS return.
  **/
 
-static NTSTATUS rpc_user_add_internals(const DOM_SID *domain_sid, const char *domain_name, 
-                                      struct cli_state *cli, TALLOC_CTX *mem_ctx, 
-                                      int argc, const char **argv) {
+static NTSTATUS rpc_user_add_internals(const DOM_SID *domain_sid,
+                               const char *domain_name, 
+                               struct cli_state *cli,
+                               struct rpc_pipe_client *pipe_hnd,
+                               TALLOC_CTX *mem_ctx, 
+                               int argc, const char **argv)
+{
        
        POLICY_HND connect_pol, domain_pol, user_pol;
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
@@ -533,7 +578,7 @@ static NTSTATUS rpc_user_add_internals(const DOM_SID *domain_sid, const char *do
 
        /* Get sam policy handle */
        
-       result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
+       result = rpccli_samr_connect(pipe_hnd, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
                                  &connect_pol);
        if (!NT_STATUS_IS_OK(result)) {
                goto done;
@@ -541,7 +586,7 @@ static NTSTATUS rpc_user_add_internals(const DOM_SID *domain_sid, const char *do
        
        /* Get domain policy handle */
        
-       result = cli_samr_open_domain(cli, mem_ctx, &connect_pol,
+       result = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &connect_pol,
                                      MAXIMUM_ALLOWED_ACCESS,
                                      domain_sid, &domain_pol);
        if (!NT_STATUS_IS_OK(result)) {
@@ -553,7 +598,7 @@ static NTSTATUS rpc_user_add_internals(const DOM_SID *domain_sid, const char *do
        acb_info = ACB_NORMAL;
        unknown = 0xe005000b; /* No idea what this is - a permission mask? */
 
-       result = cli_samr_create_dom_user(cli, mem_ctx, &domain_pol,
+       result = rpccli_samr_create_dom_user(pipe_hnd, mem_ctx, &domain_pol,
                                          acct_name, acb_info, unknown,
                                          &user_pol, &user_rid);
        if (!NT_STATUS_IS_OK(result)) {
@@ -603,10 +648,12 @@ static int rpc_user_add(int argc, const char **argv)
  **/
 
 static NTSTATUS rpc_user_del_internals(const DOM_SID *domain_sid, 
-                                      const char *domain_name, 
-                                      struct cli_state *cli, 
-                                      TALLOC_CTX *mem_ctx, 
-                                      int argc, const char **argv)
+                                       const char *domain_name, 
+                                       struct cli_state *cli, 
+                                       struct rpc_pipe_client *pipe_hnd,
+                                       TALLOC_CTX *mem_ctx, 
+                                       int argc,
+                                       const char **argv)
 {
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
        POLICY_HND connect_pol, domain_pol, user_pol;
@@ -618,14 +665,14 @@ static NTSTATUS rpc_user_del_internals(const DOM_SID *domain_sid,
        }
        /* Get sam policy and domain handles */
 
-       result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
+       result = rpccli_samr_connect(pipe_hnd, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
                                  &connect_pol);
 
        if (!NT_STATUS_IS_OK(result)) {
                goto done;
        }
 
-       result = cli_samr_open_domain(cli, mem_ctx, &connect_pol,
+       result = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &connect_pol,
                                      MAXIMUM_ALLOWED_ACCESS,
                                      domain_sid, &domain_pol);
 
@@ -639,7 +686,7 @@ static NTSTATUS rpc_user_del_internals(const DOM_SID *domain_sid,
                uint32 *user_rids, num_rids, *name_types;
                uint32 flags = 0x000003e8; /* Unknown */
 
-               result = cli_samr_lookup_names(cli, mem_ctx, &domain_pol,
+               result = rpccli_samr_lookup_names(pipe_hnd, mem_ctx, &domain_pol,
                                               flags, 1, &argv[0],
                                               &num_rids, &user_rids,
                                               &name_types);
@@ -648,7 +695,7 @@ static NTSTATUS rpc_user_del_internals(const DOM_SID *domain_sid,
                        goto done;
                }
 
-               result = cli_samr_open_user(cli, mem_ctx, &domain_pol,
+               result = rpccli_samr_open_user(pipe_hnd, mem_ctx, &domain_pol,
                                            MAXIMUM_ALLOWED_ACCESS,
                                            user_rids[0], &user_pol);
 
@@ -659,18 +706,152 @@ static NTSTATUS rpc_user_del_internals(const DOM_SID *domain_sid,
 
        /* Delete user */
 
-       result = cli_samr_delete_dom_user(cli, mem_ctx, &user_pol);
+       result = rpccli_samr_delete_dom_user(pipe_hnd, mem_ctx, &user_pol);
 
        if (!NT_STATUS_IS_OK(result)) {
                goto done;
        }
 
        /* Display results */
+       if (!NT_STATUS_IS_OK(result)) {
+               d_printf("Failed to delete user account - %s\n", nt_errstr(result));
+       } else {
+               d_printf("Deleted user account\n");
+       }
 
  done:
        return result;
+}
 
-}      
+/** 
+ * Rename a user on a remote RPC server
+ *
+ * All parameters are provided by the run_rpc_command function, except for
+ * argc, argv which are passes through. 
+ *
+ * @param domain_sid The domain sid acquired from the remote server
+ * @param cli A cli_state connected to the server.
+ * @param mem_ctx Talloc context, destoyed on completion of the function.
+ * @param argc  Standard main() style argc
+ * @param argv  Standard main() style argv.  Initial components are already
+ *              stripped
+ *
+ * @return Normal NTSTATUS return.
+ **/
+
+static NTSTATUS rpc_user_rename_internals(const DOM_SID *domain_sid,
+                                       const char *domain_name, 
+                                       struct cli_state *cli,
+                                       struct rpc_pipe_client *pipe_hnd,
+                                       TALLOC_CTX *mem_ctx, 
+                                       int argc,
+                                       const char **argv)
+{
+       POLICY_HND connect_pol, domain_pol, user_pol;
+       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+       uint32 info_level = 7;
+       const char *old_name, *new_name;
+       uint32 *user_rid;
+       uint32 flags = 0x000003e8; /* Unknown */
+       uint32 num_rids, *name_types;
+       uint32 num_names = 1;
+       const char **names;
+       SAM_USERINFO_CTR *user_ctr;
+       SAM_USERINFO_CTR ctr;
+       SAM_USER_INFO_7 info7;
+
+       if (argc != 2) {
+               d_printf("Old and new username must be specified\n");
+               rpc_user_usage(argc, argv);
+               return NT_STATUS_OK;
+       }
+
+       old_name = argv[0];
+       new_name = argv[1];
+
+       ZERO_STRUCT(ctr);
+       ZERO_STRUCT(user_ctr);
+
+       /* Get sam policy handle */
+       
+       result = rpccli_samr_connect(pipe_hnd, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
+                                 &connect_pol);
+       if (!NT_STATUS_IS_OK(result)) {
+               goto done;
+       }
+       
+       /* Get domain policy handle */
+       
+       result = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &connect_pol,
+                                     MAXIMUM_ALLOWED_ACCESS,
+                                     domain_sid, &domain_pol);
+       if (!NT_STATUS_IS_OK(result)) {
+               goto done;
+       }
+
+       names = TALLOC_ARRAY(mem_ctx, const char *, num_names);
+       names[0] = old_name;
+       result = rpccli_samr_lookup_names(pipe_hnd, mem_ctx, &domain_pol,
+                                      flags, num_names, names,
+                                      &num_rids, &user_rid, &name_types);
+       if (!NT_STATUS_IS_OK(result)) {
+               goto done;
+       }
+
+       /* Open domain user */
+       result = rpccli_samr_open_user(pipe_hnd, mem_ctx, &domain_pol,
+                                   MAXIMUM_ALLOWED_ACCESS, user_rid[0], &user_pol);
+
+       if (!NT_STATUS_IS_OK(result)) {
+               goto done;
+       }
+
+       /* Query user info */
+       result = rpccli_samr_query_userinfo(pipe_hnd, mem_ctx, &user_pol,
+                                        info_level, &user_ctr);
+
+       if (!NT_STATUS_IS_OK(result)) {
+               goto done;
+       }
+
+       ctr.switch_value = info_level;
+       ctr.info.id7 = &info7;
+
+       init_sam_user_info7(&info7, new_name);
+
+       /* Set new name */
+       result = rpccli_samr_set_userinfo(pipe_hnd, mem_ctx, &user_pol,
+                                      info_level, &cli->user_session_key, &ctr);
+
+       if (!NT_STATUS_IS_OK(result)) {
+               goto done;
+       }
+
+ done:
+       if (!NT_STATUS_IS_OK(result)) {
+               d_printf("Failed to rename user from %s to %s - %s\n", old_name, new_name, 
+                        nt_errstr(result));
+       } else {
+               d_printf("Renamed user from %s to %s\n", old_name, new_name);
+       }
+       return result;
+}
+
+/** 
+ * Rename a user on a remote RPC server
+ *
+ * @param argc  Standard main() style argc
+ * @param argv  Standard main() style argv.  Initial components are already
+ *              stripped
+ *
+ * @return A shell status integer (0 for success)
+ **/
+
+static int rpc_user_rename(int argc, const char **argv) 
+{
+       return run_rpc_command(NULL, PI_SAMR, 0, rpc_user_rename_internals,
+                              argc, argv);
+}
 
 /** 
  * Delete a user from a remote RPC server
@@ -705,10 +886,12 @@ static int rpc_user_delete(int argc, const char **argv)
  **/
 
 static NTSTATUS rpc_user_password_internals(const DOM_SID *domain_sid, 
-                                           const char *domain_name, 
-                                           struct cli_state *cli, 
-                                           TALLOC_CTX *mem_ctx, 
-                                           int argc, const char **argv)
+                                       const char *domain_name, 
+                                       struct cli_state *cli, 
+                                       struct rpc_pipe_client *pipe_hnd,
+                                       TALLOC_CTX *mem_ctx, 
+                                       int argc,
+                                       const char **argv)
 {
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
        POLICY_HND connect_pol, domain_pol, user_pol;
@@ -737,14 +920,14 @@ static NTSTATUS rpc_user_password_internals(const DOM_SID *domain_sid,
 
        /* Get sam policy and domain handles */
 
-       result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
+       result = rpccli_samr_connect(pipe_hnd, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
                                  &connect_pol);
 
        if (!NT_STATUS_IS_OK(result)) {
                goto done;
        }
 
-       result = cli_samr_open_domain(cli, mem_ctx, &connect_pol,
+       result = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &connect_pol,
                                      MAXIMUM_ALLOWED_ACCESS,
                                      domain_sid, &domain_pol);
 
@@ -758,7 +941,7 @@ static NTSTATUS rpc_user_password_internals(const DOM_SID *domain_sid,
                uint32 *user_rids, num_rids, *name_types;
                uint32 flags = 0x000003e8; /* Unknown */
 
-               result = cli_samr_lookup_names(cli, mem_ctx, &domain_pol,
+               result = rpccli_samr_lookup_names(pipe_hnd, mem_ctx, &domain_pol,
                                               flags, 1, &user,
                                               &num_rids, &user_rids,
                                               &name_types);
@@ -767,7 +950,7 @@ static NTSTATUS rpc_user_password_internals(const DOM_SID *domain_sid,
                        goto done;
                }
 
-               result = cli_samr_open_user(cli, mem_ctx, &domain_pol,
+               result = rpccli_samr_open_user(pipe_hnd, mem_ctx, &domain_pol,
                                            MAXIMUM_ALLOWED_ACCESS,
                                            user_rids[0], &user_pol);
 
@@ -788,7 +971,7 @@ static NTSTATUS rpc_user_password_internals(const DOM_SID *domain_sid,
        ctr.switch_value = 24;
        ctr.info.id24 = &p24;
 
-       result = cli_samr_set_userinfo(cli, mem_ctx, &user_pol, 24, 
+       result = rpccli_samr_set_userinfo(pipe_hnd, mem_ctx, &user_pol, 24, 
                                       &cli->user_session_key, &ctr);
 
        if (!NT_STATUS_IS_OK(result)) {
@@ -834,10 +1017,13 @@ static int rpc_user_password(int argc, const char **argv)
  * @return Normal NTSTATUS return.
  **/
 
-static NTSTATUS 
-rpc_user_info_internals(const DOM_SID *domain_sid, const char *domain_name, 
+static NTSTATUS rpc_user_info_internals(const DOM_SID *domain_sid,
+                       const char *domain_name, 
                        struct cli_state *cli,
-                       TALLOC_CTX *mem_ctx, int argc, const char **argv)
+                       struct rpc_pipe_client *pipe_hnd,
+                       TALLOC_CTX *mem_ctx,
+                       int argc,
+                       const char **argv)
 {
        POLICY_HND connect_pol, domain_pol, user_pol;
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
@@ -854,53 +1040,56 @@ rpc_user_info_internals(const DOM_SID *domain_sid, const char *domain_name,
        }
        /* Get sam policy handle */
        
-       result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
+       result = rpccli_samr_connect(pipe_hnd, 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,
+       result = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &connect_pol,
                                      MAXIMUM_ALLOWED_ACCESS,
                                      domain_sid, &domain_pol);
        if (!NT_STATUS_IS_OK(result)) goto done;
 
        /* Get handle on user */
 
-       result = cli_samr_lookup_names(cli, mem_ctx, &domain_pol,
+       result = rpccli_samr_lookup_names(pipe_hnd, mem_ctx, &domain_pol,
                                       flags, 1, &argv[0],
                                       &num_rids, &rids, &name_types);
 
        if (!NT_STATUS_IS_OK(result)) goto done;
 
-       result = cli_samr_open_user(cli, mem_ctx, &domain_pol,
+       result = rpccli_samr_open_user(pipe_hnd, mem_ctx, &domain_pol,
                                    MAXIMUM_ALLOWED_ACCESS,
                                    rids[0], &user_pol);
        if (!NT_STATUS_IS_OK(result)) goto done;
 
-       result = cli_samr_query_usergroups(cli, mem_ctx, &user_pol,
+       result = rpccli_samr_query_usergroups(pipe_hnd, mem_ctx, &user_pol,
                                           &num_rids, &user_gids);
 
-       /* Look up rids */
+       if (!NT_STATUS_IS_OK(result)) goto done;
 
-       rids = (uint32 *)talloc(mem_ctx, sizeof(uint32) * num_rids);
+       /* Look up rids */
 
-       for (i = 0; i < num_rids; i++)
-                rids[i] = user_gids[i].g_rid;
+       if (num_rids) {
+               rids = TALLOC_ARRAY(mem_ctx, uint32, num_rids);
 
-       result = cli_samr_lookup_rids(cli, mem_ctx, &domain_pol,
-                                     flags, num_rids, rids,
-                                     &num_names, &names, &name_types);
+               for (i = 0; i < num_rids; i++)
+                       rids[i] = user_gids[i].g_rid;
 
-       if (!NT_STATUS_IS_OK(result)) {
-               goto done;
-       }
+               result = rpccli_samr_lookup_rids(pipe_hnd, mem_ctx, &domain_pol,
+                                             num_rids, rids,
+                                             &num_names, &names, &name_types);
 
-       /* Display results */
+               if (!NT_STATUS_IS_OK(result)) {
+                       goto done;
+               }
 
-       for (i = 0; i < num_names; i++)
-               printf("%s\n", names[i]);
+               /* Display results */
 
+               for (i = 0; i < num_names; i++)
+                       printf("%s\n", names[i]);
+       }
  done:
        return result;
 }
@@ -937,10 +1126,13 @@ static int rpc_user_info(int argc, const char **argv)
  * @return Normal NTSTATUS return.
  **/
 
-static NTSTATUS 
-rpc_user_list_internals(const DOM_SID *domain_sid, const char *domain_name, 
-                       struct cli_state *cli,
-                       TALLOC_CTX *mem_ctx, int argc, const char **argv)
+static NTSTATUS rpc_user_list_internals(const DOM_SID *domain_sid,
+                                       const char *domain_name, 
+                                       struct cli_state *cli,
+                                       struct rpc_pipe_client *pipe_hnd,
+                                       TALLOC_CTX *mem_ctx,
+                                       int argc,
+                                       const char **argv)
 {
        POLICY_HND connect_pol, domain_pol;
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
@@ -950,7 +1142,7 @@ rpc_user_list_internals(const DOM_SID *domain_sid, const char *domain_name,
 
        /* Get sam policy handle */
        
-       result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
+       result = rpccli_samr_connect(pipe_hnd, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
                                  &connect_pol);
        if (!NT_STATUS_IS_OK(result)) {
                goto done;
@@ -958,7 +1150,7 @@ rpc_user_list_internals(const DOM_SID *domain_sid, const char *domain_name,
        
        /* Get domain policy handle */
        
-       result = cli_samr_open_domain(cli, mem_ctx, &connect_pol,
+       result = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &connect_pol,
                                      MAXIMUM_ALLOWED_ACCESS,
                                      domain_sid, &domain_pol);
        if (!NT_STATUS_IS_OK(result)) {
@@ -979,7 +1171,7 @@ rpc_user_list_internals(const DOM_SID *domain_sid, const char *domain_name,
                get_query_dispinfo_params(
                        loop_count, &max_entries, &max_size);
 
-               result = cli_samr_query_dispinfo(cli, mem_ctx, &domain_pol,
+               result = rpccli_samr_query_dispinfo(pipe_hnd, mem_ctx, &domain_pol,
                                                 &start_idx, 1, &num_entries,
                                                 max_entries, max_size, &ctr);
                loop_count++;
@@ -1014,22 +1206,19 @@ int net_rpc_user(int argc, const char **argv)
                {"info", rpc_user_info},
                {"delete", rpc_user_delete},
                {"password", rpc_user_password},
+               {"rename", rpc_user_rename},
                {NULL, NULL}
        };
        
        if (argc == 0) {
-               if (opt_long_list_entries) {
-               } else {
-               }
-                       return run_rpc_command(NULL,PI_SAMR, 0, 
-                                              rpc_user_list_internals,
-                                              argc, argv);
+               return run_rpc_command(NULL,PI_SAMR, 0, 
+                                      rpc_user_list_internals,
+                                      argc, argv);
        }
 
        return net_run_function(argc, argv, func, rpc_user_usage);
 }
 
-
 /****************************************************************************/
 
 /**
@@ -1044,11 +1233,11 @@ static int rpc_group_usage(int argc, const char **argv)
        return net_help_group(argc, argv);
 }
 
-/** 
- * List groups on a remote RPC server
+/**
+ * Delete group on a remote RPC server
  *
  * All parameters are provided by the run_rpc_command function, except for
- * argc, argv which are passes through. 
+ * argc, argv which are passes through.
  *
  * @param domain_sid The domain sid acquired from the remote server
  * @param cli A cli_state connected to the server.
@@ -1059,515 +1248,725 @@ static int rpc_group_usage(int argc, const char **argv)
  *
  * @return Normal NTSTATUS return.
  **/
-
-static NTSTATUS 
-rpc_group_list_internals(const DOM_SID *domain_sid, const char *domain_name, 
-                        struct cli_state *cli,
-                        TALLOC_CTX *mem_ctx, int argc, const char **argv)
+                                                                                                             
+static NTSTATUS rpc_group_delete_internals(const DOM_SID *domain_sid,
+                                       const char *domain_name,
+                                       struct cli_state *cli,
+                                       struct rpc_pipe_client *pipe_hnd,
+                                       TALLOC_CTX *mem_ctx,
+                                       int argc,
+                                       const char **argv)
 {
-       POLICY_HND connect_pol, domain_pol;
+       POLICY_HND connect_pol, domain_pol, group_pol, user_pol;
+       BOOL group_is_primary = False;
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-       uint32 start_idx=0, max_entries=250, num_entries, i, loop_count = 0;
-       struct acct_info *groups;
-       DOM_SID global_sid_Builtin;
-       BOOL global = False;
-       BOOL local = False;
-       BOOL builtin = False;
 
-       if (argc == 0) {
-               global = True;
-               local = True;
-               builtin = True;
+       uint32 *group_rids, num_rids, *name_types, num_members, 
+               *group_attrs, group_rid;
+       uint32 flags = 0x000003e8; /* Unknown */
+       /* char **names; */
+       int i;
+       /* DOM_GID *user_gids; */
+       SAM_USERINFO_CTR *user_ctr;
+       fstring temp;
+
+       if (argc < 1) {
+               d_printf("specify group\n");
+               rpc_group_usage(argc,argv);
+               return NT_STATUS_OK; /* ok? */
        }
 
-       for (i=0; i<argc; i++) {
-               if (strequal(argv[i], "global"))
-                       global = True;
+        result = rpccli_samr_connect(pipe_hnd, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
+                                  &connect_pol);
+
+        if (!NT_STATUS_IS_OK(result)) {
+               d_printf("Request samr_connect failed\n");
+               goto done;
+        }
+        
+        result = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &connect_pol,
+                                      MAXIMUM_ALLOWED_ACCESS,
+                                      domain_sid, &domain_pol);
+        
+        if (!NT_STATUS_IS_OK(result)) {
+               d_printf("Request open_domain failed\n");
+               goto done;
+        }
+       
+       result = rpccli_samr_lookup_names(pipe_hnd, mem_ctx, &domain_pol,
+                                      flags, 1, &argv[0],
+                                      &num_rids, &group_rids,
+                                      &name_types);
 
-               if (strequal(argv[i], "local"))
-                       local = True;
+       if (!NT_STATUS_IS_OK(result)) {
+               d_printf("Lookup of '%s' failed\n",argv[0]);
+               goto done;
+       }
 
-               if (strequal(argv[i], "builtin"))
-                       builtin = True;
+       switch (name_types[0])
+       {
+       case SID_NAME_DOM_GRP:
+               result = rpccli_samr_open_group(pipe_hnd, mem_ctx, &domain_pol,
+                                            MAXIMUM_ALLOWED_ACCESS,
+                                            group_rids[0], &group_pol);
+               if (!NT_STATUS_IS_OK(result)) {
+                       d_printf("Request open_group failed");
+                       goto done;
+               }
+                
+               group_rid = group_rids[0];
+                
+               result = rpccli_samr_query_groupmem(pipe_hnd, mem_ctx, &group_pol,
+                                 &num_members, &group_rids,
+                                 &group_attrs);
+               
+               if (!NT_STATUS_IS_OK(result)) {
+                       d_printf("Unable to query group members of %s",argv[0]);
+                       goto done;
+               }
+               
+               if (opt_verbose) {
+                       d_printf("Domain Group %s (rid: %d) has %d members\n",
+                               argv[0],group_rid,num_members);
+               }
+
+               /* Check if group is anyone's primary group */
+                for (i = 0; i < num_members; i++)
+               {
+                       result = rpccli_samr_open_user(pipe_hnd, mem_ctx, &domain_pol,
+                                                   MAXIMUM_ALLOWED_ACCESS,
+                                                   group_rids[i], &user_pol);
+       
+                       if (!NT_STATUS_IS_OK(result)) {
+                               d_printf("Unable to open group member %d\n",group_rids[i]);
+                               goto done;
+                       }
+       
+                       ZERO_STRUCT(user_ctr);
+
+                       result = rpccli_samr_query_userinfo(pipe_hnd, mem_ctx, &user_pol,
+                                                        21, &user_ctr);
+       
+                       if (!NT_STATUS_IS_OK(result)) {
+                               d_printf("Unable to lookup userinfo for group member %d\n",group_rids[i]);
+                               goto done;
+                       }
+       
+                       if (user_ctr->info.id21->group_rid == group_rid) {
+                               unistr2_to_ascii(temp, &(user_ctr->info.id21)->uni_user_name, 
+                                               sizeof(temp)-1);
+                               if (opt_verbose) 
+                                       d_printf("Group is primary group of %s\n",temp);
+                               group_is_primary = True;
+                        }
+
+                       rpccli_samr_close(pipe_hnd, mem_ctx, &user_pol);
+               }
+                
+               if (group_is_primary) {
+                       d_printf("Unable to delete group because some of it's "
+                                "members have it as primary group\n");
+                       result = NT_STATUS_MEMBERS_PRIMARY_GROUP;
+                       goto done;
+               }
+     
+               /* remove all group members */
+               for (i = 0; i < num_members; i++)
+               {
+                       if (opt_verbose) 
+                               d_printf("Remove group member %d...",group_rids[i]);
+                       result = rpccli_samr_del_groupmem(pipe_hnd, mem_ctx, &group_pol, group_rids[i]);
+
+                       if (NT_STATUS_IS_OK(result)) {
+                               if (opt_verbose)
+                                       d_printf("ok\n");
+                       } else {
+                               if (opt_verbose)
+                                       d_printf("failed\n");
+                               goto done;
+                       }       
+               }
+
+               result = rpccli_samr_delete_dom_group(pipe_hnd, mem_ctx, &group_pol);
+
+               break;
+       /* removing a local group is easier... */
+       case SID_NAME_ALIAS:
+               result = rpccli_samr_open_alias(pipe_hnd, mem_ctx, &domain_pol,
+                                            MAXIMUM_ALLOWED_ACCESS,
+                                            group_rids[0], &group_pol);
+
+               if (!NT_STATUS_IS_OK(result)) {
+                       d_printf("Request open_alias failed\n");
+                       goto done;
+               }
+               
+               result = rpccli_samr_delete_dom_alias(pipe_hnd, mem_ctx, &group_pol);
+               break;
+       default:
+               d_printf("%s is of type %s. This command is only for deleting local or global groups\n",
+                       argv[0],sid_type_lookup(name_types[0]));
+               result = NT_STATUS_UNSUCCESSFUL;
+               goto done;
+       }
+         
+       
+       if (NT_STATUS_IS_OK(result)) {
+               if (opt_verbose)
+                       d_printf("Deleted %s '%s'\n",sid_type_lookup(name_types[0]),argv[0]);
+       } else {
+               d_printf("Deleting of %s failed: %s\n",argv[0],
+                       get_friendly_nt_error_msg(result));
        }
+       
+ done:
+       return result;  
+        
+}
 
-       string_to_sid(&global_sid_Builtin, "S-1-5-32");
+static int rpc_group_delete(int argc, const char **argv)
+{
+       return run_rpc_command(NULL, PI_SAMR, 0, rpc_group_delete_internals,
+                               argc,argv);
+}
+
+static NTSTATUS rpc_group_add_internals(const DOM_SID *domain_sid,
+                                       const char *domain_name, 
+                                       struct cli_state *cli,
+                                       struct rpc_pipe_client *pipe_hnd,
+                                       TALLOC_CTX *mem_ctx,
+                                       int argc,
+                                       const char **argv)
+{
+       POLICY_HND connect_pol, domain_pol, group_pol;
+       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+       GROUP_INFO_CTR group_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, 
+       result = rpccli_samr_connect(pipe_hnd, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
                                  &connect_pol);
-       if (!NT_STATUS_IS_OK(result)) {
-               goto done;
-       }
+       if (!NT_STATUS_IS_OK(result)) goto done;
        
        /* Get domain policy handle */
        
-       result = cli_samr_open_domain(cli, mem_ctx, &connect_pol,
+       result = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &connect_pol,
                                      MAXIMUM_ALLOWED_ACCESS,
                                      domain_sid, &domain_pol);
-       if (!NT_STATUS_IS_OK(result)) {
-               goto done;
-       }
+       if (!NT_STATUS_IS_OK(result)) goto done;
 
-       /* Query domain groups */
-       if (opt_long_list_entries)
-               d_printf("\nGroup name            Comment"\
-                        "\n-----------------------------\n");
-       do {
-               SAM_DISPINFO_CTR ctr;
-               SAM_DISPINFO_3 info3;
-               uint32 max_size;
+       /* Create the group */
 
-               ZERO_STRUCT(ctr);
-               ZERO_STRUCT(info3);
-               ctr.sam.info3 = &info3;
+       result = rpccli_samr_create_dom_group(pipe_hnd, mem_ctx, &domain_pol,
+                                          argv[0], MAXIMUM_ALLOWED_ACCESS,
+                                          &group_pol);
+       if (!NT_STATUS_IS_OK(result)) goto done;
 
-               if (!global) break;
+       if (strlen(opt_comment) == 0) goto done;
 
-               get_query_dispinfo_params(
-                       loop_count, &max_entries, &max_size);
+       /* We've got a comment to set */
 
-               result = cli_samr_query_dispinfo(cli, mem_ctx, &domain_pol,
-                                                &start_idx, 3, &num_entries,
-                                                max_entries, max_size, &ctr);
-                                                
-               for (i = 0; i < num_entries; i++) {
+       group_info.switch_value1 = 4;
+       init_samr_group_info4(&group_info.group.info4, opt_comment);
 
-                       fstring group, desc;
+       result = rpccli_samr_set_groupinfo(pipe_hnd, mem_ctx, &group_pol, &group_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));
 
-                       unistr2_to_ascii(group, &(&ctr.sam.info3->str[i])->uni_grp_name, sizeof(group)-1);
-                       unistr2_to_ascii(desc, &(&ctr.sam.info3->str[i])->uni_grp_desc, sizeof(desc)-1);
-                       
-                       if (opt_long_list_entries)
-                               printf("%-21.21s %-50.50s\n",
-                                      group, desc);
-                       else
-                               printf("%s\n", group);
-               }
-       } while (NT_STATUS_EQUAL(result, STATUS_MORE_ENTRIES));
-       /* query domain aliases */
-       start_idx = 0;
-       do {
-               if (!local) break;
-
-               result = cli_samr_enum_als_groups(cli, mem_ctx, &domain_pol,
-                                                 &start_idx, max_entries,
-                                                 &groups, &num_entries);
-
-               for (i = 0; i < num_entries; i++) {
-
-                       char *description = NULL;
+       return result;
+}
 
-                       if (opt_long_list_entries) {
+static NTSTATUS rpc_alias_add_internals(const DOM_SID *domain_sid,
+                                       const char *domain_name, 
+                                       struct cli_state *cli,
+                                       struct rpc_pipe_client *pipe_hnd,
+                                       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;
 
-                               POLICY_HND alias_pol;
-                               ALIAS_INFO_CTR ctr;
+       if (argc != 1) {
+               d_printf("Alias name must be specified\n");
+               rpc_group_usage(argc, argv);
+               return NT_STATUS_OK;
+       }
 
-                               if ((NT_STATUS_IS_OK(cli_samr_open_alias(cli, mem_ctx,
-                                                                        &domain_pol,
-                                                                        0x8,
-                                                                        groups[i].rid,
-                                                                        &alias_pol))) &&
-                                   (NT_STATUS_IS_OK(cli_samr_query_alias_info(cli, mem_ctx,
-                                                                              &alias_pol, 3,
-                                                                              &ctr))) &&
-                                   (NT_STATUS_IS_OK(cli_samr_close(cli, mem_ctx,
-                                                                   &alias_pol)))) {
-                                       description = unistr2_tdup(mem_ctx,
-                                                                  &ctr.alias.info3.uni_acct_desc);
-                               }
-                       }
-                       
-                       if (description != NULL) {
-                               printf("%-21.21s %-50.50s\n", 
-                                      groups[i].acct_name,
-                                      description);
-                       } else {
-                               printf("%s\n", groups[i].acct_name);
-                       }
-               }
-       } while (NT_STATUS_EQUAL(result, STATUS_MORE_ENTRIES));
-       cli_samr_close(cli, mem_ctx, &domain_pol);
-       /* Get builtin policy handle */
+       /* Get sam policy handle */
+       
+       result = rpccli_samr_connect(pipe_hnd, 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,
+       result = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &connect_pol,
                                      MAXIMUM_ALLOWED_ACCESS,
-                                     &global_sid_Builtin, &domain_pol);
-       if (!NT_STATUS_IS_OK(result)) {
-               goto done;
-       }
-       /* query builtin aliases */
-       start_idx = 0;
-       do {
-               if (!builtin) break;
+                                     domain_sid, &domain_pol);
+       if (!NT_STATUS_IS_OK(result)) goto done;
 
-               result = cli_samr_enum_als_groups(cli, mem_ctx, &domain_pol,
-                                                 &start_idx, max_entries,
-                                                 &groups, &num_entries);
-                                                
-               for (i = 0; i < num_entries; i++) {
+       /* Create the group */
 
-                       char *description = NULL;
+       result = rpccli_samr_create_dom_alias(pipe_hnd, mem_ctx, &domain_pol,
+                                          argv[0], &alias_pol);
+       if (!NT_STATUS_IS_OK(result)) goto done;
 
-                       if (opt_long_list_entries) {
+       if (strlen(opt_comment) == 0) goto done;
 
-                               POLICY_HND alias_pol;
-                               ALIAS_INFO_CTR ctr;
+       /* We've got a comment to set */
 
-                               if ((NT_STATUS_IS_OK(cli_samr_open_alias(cli, mem_ctx,
-                                                                        &domain_pol,
-                                                                        0x8,
-                                                                        groups[i].rid,
-                                                                        &alias_pol))) &&
-                                   (NT_STATUS_IS_OK(cli_samr_query_alias_info(cli, mem_ctx,
-                                                                              &alias_pol, 3,
-                                                                              &ctr))) &&
-                                   (NT_STATUS_IS_OK(cli_samr_close(cli, mem_ctx,
-                                                                   &alias_pol)))) {
-                                       description = unistr2_tdup(mem_ctx,
-                                                                  &ctr.alias.info3.uni_acct_desc);
-                               }
-                       }
-                       
-                       if (description != NULL) {
-                               printf("%-21.21s %-50.50s\n", 
-                                      groups[i].acct_name,
-                                      description);
-                       } else {
-                               printf("%s\n", groups[i].acct_name);
-                       }
-               }
-       } while (NT_STATUS_EQUAL(result, STATUS_MORE_ENTRIES));
+       alias_info.level = 3;
+       init_samr_alias_info3(&alias_info.alias.info3, opt_comment);
 
+       result = rpccli_samr_set_aliasinfo(pipe_hnd, mem_ctx, &alias_pol, &alias_info);
+       if (!NT_STATUS_IS_OK(result)) goto done;
+       
  done:
+       if (NT_STATUS_IS_OK(result))
+               DEBUG(5, ("add alias succeeded\n"));
+       else
+               d_printf("add alias failed: %s\n", nt_errstr(result));
+
        return result;
 }
 
-static int rpc_group_list(int argc, const char **argv)
+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_list_internals,
+                              rpc_group_add_internals,
                               argc, argv);
 }
 
-static NTSTATUS
-rpc_list_group_members(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-                      const char *domain_name, const DOM_SID *domain_sid,
-                      POLICY_HND *domain_pol, uint32 rid)
+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)
 {
-       NTSTATUS result;
-       POLICY_HND group_pol;
-       uint32 num_members, *group_rids, *group_attrs;
-       uint32 num_names;
-       char **names;
-       uint32 *name_types;
-       int i;
-
-       fstring sid_str;
-       sid_to_string(sid_str, domain_sid);
+       DOM_SID *sids = NULL;
+       uint32 *types = NULL;
+       struct rpc_pipe_client *pipe_hnd;
+       POLICY_HND lsa_pol;
+       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
 
-       result = cli_samr_open_group(cli, mem_ctx, domain_pol,
-                                    MAXIMUM_ALLOWED_ACCESS,
-                                    rid, &group_pol);
+       pipe_hnd = cli_rpc_pipe_open_noauth(cli, PI_LSARPC, &result);
+       if (!pipe_hnd) {
+               goto done;
+       }
 
-       if (!NT_STATUS_IS_OK(result))
-               return result;
+       result = rpccli_lsa_open_policy(pipe_hnd, mem_ctx, False,
+                                    SEC_RIGHTS_MAXIMUM_ALLOWED, &lsa_pol);
 
-       result = cli_samr_query_groupmem(cli, mem_ctx, &group_pol,
-                                        &num_members, &group_rids,
-                                        &group_attrs);
+       if (!NT_STATUS_IS_OK(result)) {
+               goto done;
+       }
 
-       if (!NT_STATUS_IS_OK(result))
-               return result;
+       result = rpccli_lsa_lookup_names(pipe_hnd, mem_ctx, &lsa_pol, 1,
+                                     &name, &sids, &types);
 
-       while (num_members > 0) {
-               int this_time = 512;
+       if (NT_STATUS_IS_OK(result)) {
+               sid_copy(sid, &sids[0]);
+               *type = types[0];
+       }
 
-               if (num_members < this_time)
-                       this_time = num_members;
+       rpccli_lsa_close(pipe_hnd, mem_ctx, &lsa_pol);
 
-               result = cli_samr_lookup_rids(cli, mem_ctx, domain_pol, 1000,
-                                             this_time, group_rids,
-                                             &num_names, &names, &name_types);
+ done:
+       if (pipe_hnd) {
+               cli_rpc_pipe_close(pipe_hnd);
+       }
 
-               if (!NT_STATUS_IS_OK(result))
-                       return result;
+       if (!NT_STATUS_IS_OK(result) && (StrnCaseCmp(name, "S-", 2) == 0)) {
 
-               /* We only have users as members, but make the output
-                  the same as the output of alias members */
+               /* Try as S-1-5-whatever */
 
-               for (i = 0; i < this_time; i++) {
+               DOM_SID tmp_sid;
 
-                       if (opt_long_list_entries) {
-                               printf("%s-%d %s\\%s %d\n", sid_str,
-                                      group_rids[i], domain_name, names[i],
-                                      SID_NAME_USER);
-                       } else {
-                               printf("%s\\%s\n", domain_name, names[i]);
-                       }
+               if (string_to_sid(&tmp_sid, name)) {
+                       sid_copy(sid, &tmp_sid);
+                       *type = SID_NAME_UNKNOWN;
+                       result = NT_STATUS_OK;
                }
-
-               num_members -= this_time;
-               group_rids += 512;
        }
 
-       return NT_STATUS_OK;
+       return result;
 }
 
-static NTSTATUS
-rpc_list_alias_members(struct cli_state *cli, TALLOC_CTX *mem_ctx,
-                      POLICY_HND *domain_pol, uint32 rid)
+static NTSTATUS rpc_add_groupmem(struct rpc_pipe_client *pipe_hnd,
+                               TALLOC_CTX *mem_ctx,
+                               const DOM_SID *group_sid,
+                               const char *member)
 {
+       POLICY_HND connect_pol, domain_pol;
        NTSTATUS result;
-       POLICY_HND alias_pol, lsa_pol;
-       uint32 num_members;
-       DOM_SID *alias_sids;
-       char **domains;
-       char **names;
-       uint32 *types;
-       int i;
-
-       result = cli_samr_open_alias(cli, mem_ctx, domain_pol,
-                                    MAXIMUM_ALLOWED_ACCESS, rid, &alias_pol);
+       uint32 group_rid;
+       POLICY_HND group_pol;
 
-       if (!NT_STATUS_IS_OK(result))
-               return result;
+       uint32 num_rids;
+       uint32 *rids = NULL;
+       uint32 *rid_types = NULL;
 
-       result = cli_samr_query_aliasmem(cli, mem_ctx, &alias_pol,
-                                        &num_members, &alias_sids);
+       DOM_SID sid;
 
-       if (!NT_STATUS_IS_OK(result)) {
-               d_printf("Couldn't list alias members\n");
-               return result;
-       }
+       sid_copy(&sid, group_sid);
 
-       if (num_members == 0) {
-               return NT_STATUS_OK;
+       if (!sid_split_rid(&sid, &group_rid)) {
+               return NT_STATUS_UNSUCCESSFUL;
        }
 
-       cli_nt_session_close(cli);
-
-       if (!cli_nt_session_open(cli, PI_LSARPC)) {
-               d_printf("Couldn't open LSA pipe\n");
+       /* Get sam policy handle */     
+       result = rpccli_samr_connect(pipe_hnd, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
+                                 &connect_pol);
+       if (!NT_STATUS_IS_OK(result)) {
                return result;
        }
-
-       result = cli_lsa_open_policy(cli, mem_ctx, True,
-                                    SEC_RIGHTS_MAXIMUM_ALLOWED, &lsa_pol);
-
+       
+       /* Get domain policy handle */
+       result = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &connect_pol,
+                                     MAXIMUM_ALLOWED_ACCESS,
+                                     &sid, &domain_pol);
        if (!NT_STATUS_IS_OK(result)) {
-               d_printf("Couldn't open LSA policy handle\n");
                return result;
        }
 
-       result = cli_lsa_lookup_sids(cli, mem_ctx, &lsa_pol, num_members,
-                                    alias_sids, 
-                                    &domains, &names, &types);
+       result = rpccli_samr_lookup_names(pipe_hnd, mem_ctx, &domain_pol, 1000,
+                                      1, &member,
+                                      &num_rids, &rids, &rid_types);
 
-       if (!NT_STATUS_IS_OK(result) &&
-           !NT_STATUS_EQUAL(result, STATUS_SOME_UNMAPPED)) {
-               d_printf("Couldn't lookup SIDs\n");
-               return result;
+       if (!NT_STATUS_IS_OK(result)) {
+               d_printf("Could not lookup up group member %s\n", member);
+               goto done;
        }
 
-       for (i = 0; i < num_members; i++) {
-               fstring sid_str;
-               sid_to_string(sid_str, &alias_sids[i]);
+       result = rpccli_samr_open_group(pipe_hnd, mem_ctx, &domain_pol,
+                                    MAXIMUM_ALLOWED_ACCESS,
+                                    group_rid, &group_pol);
 
-               if (opt_long_list_entries) {
-                       printf("%s %s\\%s %d\n", sid_str, 
-                              domains[i] ? domains[i] : "*unknown*", 
-                              names[i] ? names[i] : "*unknown*", types[i]);
-               } else {
-                       if (domains[i])
-                               printf("%s\\%s\n", domains[i], names[i]);
-                       else
-                               printf("%s\n", sid_str);
-               }
+       if (!NT_STATUS_IS_OK(result)) {
+               goto done;
        }
 
-       return NT_STATUS_OK;
+       result = rpccli_samr_add_groupmem(pipe_hnd, mem_ctx, &group_pol, rids[0]);
+
+ done:
+       rpccli_samr_close(pipe_hnd, mem_ctx, &connect_pol);
+       return result;
 }
-static NTSTATUS 
-rpc_group_members_internals(const DOM_SID *domain_sid,
-                           const char *domain_name, 
-                           struct cli_state *cli,
-                           TALLOC_CTX *mem_ctx, int argc, const char **argv)
+
+static NTSTATUS rpc_add_aliasmem(struct rpc_pipe_client *pipe_hnd,
+                               TALLOC_CTX *mem_ctx,
+                               const DOM_SID *alias_sid,
+                               const char *member)
 {
-       NTSTATUS result;
        POLICY_HND connect_pol, domain_pol;
-       uint32 num_rids, *rids, *rid_types;
+       NTSTATUS result;
+       uint32 alias_rid;
+       POLICY_HND alias_pol;
 
-       /* Get sam policy handle */
-       
-       result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
-                                 &connect_pol);
+       DOM_SID member_sid;
+       enum SID_NAME_USE member_type;
 
-       if (!NT_STATUS_IS_OK(result))
+       DOM_SID sid;
+
+       sid_copy(&sid, alias_sid);
+
+       if (!sid_split_rid(&sid, &alias_rid)) {
+               return NT_STATUS_UNSUCCESSFUL;
+       }
+
+       result = get_sid_from_name(pipe_hnd->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 = rpccli_samr_connect(pipe_hnd, 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,
+       result = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &connect_pol,
                                      MAXIMUM_ALLOWED_ACCESS,
-                                     domain_sid, &domain_pol);
+                                     &sid, &domain_pol);
+       if (!NT_STATUS_IS_OK(result)) {
+               goto done;
+       }
 
-       if (!NT_STATUS_IS_OK(result))
+       result = rpccli_samr_open_alias(pipe_hnd, mem_ctx, &domain_pol,
+                                    MAXIMUM_ALLOWED_ACCESS,
+                                    alias_rid, &alias_pol);
+
+       if (!NT_STATUS_IS_OK(result)) {
                return result;
+       }
 
-       result = cli_samr_lookup_names(cli, mem_ctx, &domain_pol, 1000,
-                                      1, argv, &num_rids, &rids, &rid_types);
+       result = rpccli_samr_add_aliasmem(pipe_hnd, mem_ctx, &alias_pol, &member_sid);
 
        if (!NT_STATUS_IS_OK(result)) {
+               return result;
+       }
 
-               /* Ok, did not find it in the global sam, try with builtin */
-
-               DOM_SID sid_Builtin;
+ done:
+       rpccli_samr_close(pipe_hnd, mem_ctx, &connect_pol);
+       return result;
+}
 
-               cli_samr_close(cli, mem_ctx, &domain_pol);
+static NTSTATUS rpc_group_addmem_internals(const DOM_SID *domain_sid,
+                                       const char *domain_name, 
+                                       struct cli_state *cli,
+                                       struct rpc_pipe_client *pipe_hnd,
+                                       TALLOC_CTX *mem_ctx,
+                                       int argc,
+                                       const char **argv)
+{
+       DOM_SID group_sid;
+       enum SID_NAME_USE group_type;
 
-               string_to_sid(&sid_Builtin, "S-1-5-32");                
+       if (argc != 2) {
+               d_printf("Usage: 'net rpc group addmem <group> <member>\n");
+               return NT_STATUS_UNSUCCESSFUL;
+       }
 
-               result = cli_samr_open_domain(cli, mem_ctx, &connect_pol,
-                                             MAXIMUM_ALLOWED_ACCESS,
-                                             &sid_Builtin, &domain_pol);
+       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(pipe_hnd, mem_ctx,
+                                                  &group_sid, argv[1]);
 
                if (!NT_STATUS_IS_OK(result)) {
-                       d_printf("Couldn't find group %s\n", argv[0]);
-                       return result;
+                       d_printf("Could not add %s to %s: %s\n",
+                                argv[1], argv[0], nt_errstr(result));
                }
+               return result;
+       }
 
-               result = cli_samr_lookup_names(cli, mem_ctx, &domain_pol, 1000,
-                                              1, argv, &num_rids,
-                                              &rids, &rid_types);
+       if (group_type == SID_NAME_ALIAS) {
+               NTSTATUS result = rpc_add_aliasmem(pipe_hnd, mem_ctx,
+                                                  &group_sid, argv[1]);
 
                if (!NT_STATUS_IS_OK(result)) {
-                       d_printf("Couldn't find group %s\n", argv[0]);
-                       return result;
+                       d_printf("Could not add %s to %s: %s\n",
+                                argv[1], argv[0], nt_errstr(result));
                }
-       }
-
-       if (num_rids != 1) {
-               d_printf("Couldn't find group %s\n", argv[0]);
                return result;
        }
 
-       if (rid_types[0] == SID_NAME_DOM_GRP) {
-               return rpc_list_group_members(cli, mem_ctx, domain_name,
-                                             domain_sid, &domain_pol,
-                                             rids[0]);
-       }
-
-       if (rid_types[0] == SID_NAME_ALIAS) {
-               return rpc_list_alias_members(cli, mem_ctx, &domain_pol,
-                                             rids[0]);
-       }
+       d_printf("Can only add members to global or local groups which "
+                "%s is not\n", argv[0]);
 
-       return NT_STATUS_NO_SUCH_GROUP;
+       return NT_STATUS_UNSUCCESSFUL;
 }
 
-static int rpc_group_members(int argc, const char **argv)
+static int rpc_group_addmem(int argc, const char **argv)
 {
-       if (argc != 1) {
-               return rpc_group_usage(argc, argv);
-       }
-
        return run_rpc_command(NULL, PI_SAMR, 0,
-                              rpc_group_members_internals,
+                              rpc_group_addmem_internals,
                               argc, argv);
 }
 
-/** 
- * 'net rpc group' entrypoint.
- * @param argc  Standard main() style argc
- * @param argc  Standard main() style argv.  Initial components are already
- *              stripped
- **/
-
-int net_rpc_group(int argc, const char **argv) 
+static NTSTATUS rpc_del_groupmem(struct rpc_pipe_client *pipe_hnd,
+                               TALLOC_CTX *mem_ctx,
+                               const DOM_SID *group_sid,
+                               const char *member)
 {
-       struct functable func[] = {
-#if 0
-               {"add", rpc_group_add},
-               {"delete", rpc_group_delete},
-#endif
-               {"list", rpc_group_list},
-               {"members", rpc_group_members},
-               {NULL, NULL}
-       };
+       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 = rpccli_samr_connect(pipe_hnd, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
+                                 &connect_pol);
+       if (!NT_STATUS_IS_OK(result))
+               return result;
        
-       if (argc == 0) {
-               if (opt_long_list_entries) {
-               } else {
-               }
-               return run_rpc_command(NULL, PI_SAMR, 0, 
-                                      rpc_group_list_internals,
-                                      argc, argv);
+       /* Get domain policy handle */
+       result = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &connect_pol,
+                                     MAXIMUM_ALLOWED_ACCESS,
+                                     &sid, &domain_pol);
+       if (!NT_STATUS_IS_OK(result))
+               return result;
+
+       result = rpccli_samr_lookup_names(pipe_hnd, 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;
        }
 
-       return net_run_function(argc, argv, func, rpc_group_usage);
-}
+       result = rpccli_samr_open_group(pipe_hnd, mem_ctx, &domain_pol,
+                                    MAXIMUM_ALLOWED_ACCESS,
+                                    group_rid, &group_pol);
 
-/****************************************************************************/
+       if (!NT_STATUS_IS_OK(result))
+               goto done;
 
-static int rpc_share_usage(int argc, const char **argv)
-{
-       return net_help_share(argc, argv);
+       result = rpccli_samr_del_groupmem(pipe_hnd, mem_ctx, &group_pol, rids[0]);
+
+ done:
+       rpccli_samr_close(pipe_hnd, mem_ctx, &connect_pol);
+       return result;
 }
 
-/** 
- * Add a share on a remote RPC server
- *
- * All parameters are provided by the run_rpc_command function, except for
- * argc, argv which are passes through. 
- *
- * @param domain_sid The domain sid acquired from the remote server
- * @param cli A cli_state connected to the server.
- * @param mem_ctx Talloc context, destoyed on completion of the function.
- * @param argc  Standard main() style argc
- * @param argv  Standard main() style argv.  Initial components are already
- *              stripped
- *
- * @return Normal NTSTATUS return.
- **/
-static NTSTATUS 
-rpc_share_add_internals(const DOM_SID *domain_sid, const char *domain_name, 
-                       struct cli_state *cli,
-                       TALLOC_CTX *mem_ctx,int argc, const char **argv)
+static NTSTATUS rpc_del_aliasmem(struct rpc_pipe_client *pipe_hnd,
+                               TALLOC_CTX *mem_ctx,
+                               const DOM_SID *alias_sid,
+                               const char *member)
 {
-       WERROR result;
-       char *sharename=talloc_strdup(mem_ctx, argv[0]);
-       char *path;
-       uint32 type=0; /* only allow disk shares to be added */
-       uint32 num_users=0, perms=0;
-       char *password=NULL; /* don't allow a share password */
+       POLICY_HND connect_pol, domain_pol;
+       NTSTATUS result;
+       uint32 alias_rid;
+       POLICY_HND alias_pol;
 
-       path = strchr(sharename, '=');
-       if (!path)
+       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;
-       *path++ = '\0';
 
-       result = cli_srvsvc_net_share_add(cli, mem_ctx, sharename, type,
-                                         opt_comment, perms, opt_maxusers,
-                                         num_users, path, password);
-       return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+       result = get_sid_from_name(pipe_hnd->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 = rpccli_samr_connect(pipe_hnd, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
+                                 &connect_pol);
+       if (!NT_STATUS_IS_OK(result)) {
+               goto done;
+       }
+       
+       /* Get domain policy handle */
+       result = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &connect_pol,
+                                     MAXIMUM_ALLOWED_ACCESS,
+                                     &sid, &domain_pol);
+       if (!NT_STATUS_IS_OK(result)) {
+               goto done;
+       }
+
+       result = rpccli_samr_open_alias(pipe_hnd, mem_ctx, &domain_pol,
+                                    MAXIMUM_ALLOWED_ACCESS,
+                                    alias_rid, &alias_pol);
+
+       if (!NT_STATUS_IS_OK(result))
+               return result;
+
+       result = rpccli_samr_del_aliasmem(pipe_hnd, mem_ctx, &alias_pol, &member_sid);
+
+       if (!NT_STATUS_IS_OK(result))
+               return result;
+
+ done:
+       rpccli_samr_close(pipe_hnd, mem_ctx, &connect_pol);
+       return result;
 }
 
-static int rpc_share_add(int argc, const char **argv)
+static NTSTATUS rpc_group_delmem_internals(const DOM_SID *domain_sid,
+                                       const char *domain_name, 
+                                       struct cli_state *cli,
+                                       struct rpc_pipe_client *pipe_hnd,
+                                       TALLOC_CTX *mem_ctx,
+                                       int argc,
+                                       const char **argv)
 {
-       if ((argc < 1) || !strchr(argv[0], '=')) {
-               DEBUG(1,("Sharename or path not specified on add\n"));
-               return rpc_share_usage(argc, 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;
        }
-       return run_rpc_command(NULL, PI_SRVSVC, 0, 
-                              rpc_share_add_internals,
+
+       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(pipe_hnd, mem_ctx,
+                                                  &group_sid, argv[1]);
+
+               if (!NT_STATUS_IS_OK(result)) {
+                       d_printf("Could not del %s from %s: %s\n",
+                                argv[1], argv[0], nt_errstr(result));
+               }
+               return result;
+       }
+
+       if (group_type == SID_NAME_ALIAS) {
+               NTSTATUS result = rpc_del_aliasmem(pipe_hnd, mem_ctx, 
+                                                  &group_sid, argv[1]);
+
+               if (!NT_STATUS_IS_OK(result)) {
+                       d_printf("Could not del %s from %s: %s\n",
+                                argv[1], argv[0], nt_errstr(result));
+               }
+               return result;
+       }
+
+       d_printf("Can only delete members from global or local groups which "
+                "%s is not\n", argv[0]);
+
+       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);
 }
 
 /** 
- * Delete a share on a remote RPC server
+ * List groups on a remote RPC server
  *
  * All parameters are provided by the run_rpc_command function, except for
  * argc, argv which are passes through. 
@@ -1581,62 +1980,2138 @@ static int rpc_share_add(int argc, const char **argv)
  *
  * @return Normal NTSTATUS return.
  **/
-static NTSTATUS 
-rpc_share_del_internals(const DOM_SID *domain_sid, const char *domain_name, 
-                       struct cli_state *cli,
-                       TALLOC_CTX *mem_ctx,int argc, const char **argv)
+
+static NTSTATUS rpc_group_list_internals(const DOM_SID *domain_sid,
+                                       const char *domain_name, 
+                                       struct cli_state *cli,
+                                       struct rpc_pipe_client *pipe_hnd,
+                                       TALLOC_CTX *mem_ctx,
+                                       int argc,
+                                       const char **argv)
 {
-       WERROR result;
+       POLICY_HND connect_pol, domain_pol;
+       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+       uint32 start_idx=0, max_entries=250, num_entries, i, loop_count = 0;
+       struct acct_info *groups;
+       BOOL global = False;
+       BOOL local = False;
+       BOOL builtin = False;
 
-       result = cli_srvsvc_net_share_del(cli, mem_ctx, argv[0]);
-       return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
-}
+       if (argc == 0) {
+               global = True;
+               local = True;
+               builtin = True;
+       }
 
-/** 
- * Delete a share on a remote RPC server
- *
- * @param domain_sid The domain sid acquired from the remote server
- * @param argc  Standard main() style argc
- * @param argv  Standard main() style argv.  Initial components are already
- *              stripped
- *
- * @return A shell status integer (0 for success)
- **/
-static int rpc_share_delete(int argc, const char **argv)
-{
-       if (argc < 1) {
-               DEBUG(1,("Sharename not specified on delete\n"));
-               return rpc_share_usage(argc, argv);
+       for (i=0; i<argc; i++) {
+               if (strequal(argv[i], "global"))
+                       global = True;
+
+               if (strequal(argv[i], "local"))
+                       local = True;
+
+               if (strequal(argv[i], "builtin"))
+                       builtin = True;
        }
-       return run_rpc_command(NULL, PI_SRVSVC, 0, 
-                              rpc_share_del_internals,
-                              argc, argv);
+
+       /* Get sam policy handle */
+       
+       result = rpccli_samr_connect(pipe_hnd, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
+                                 &connect_pol);
+       if (!NT_STATUS_IS_OK(result)) {
+               goto done;
+       }
+       
+       /* Get domain policy handle */
+       
+       result = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &connect_pol,
+                                     MAXIMUM_ALLOWED_ACCESS,
+                                     domain_sid, &domain_pol);
+       if (!NT_STATUS_IS_OK(result)) {
+               goto done;
+       }
+
+       /* Query domain groups */
+       if (opt_long_list_entries)
+               d_printf("\nGroup name            Comment"\
+                        "\n-----------------------------\n");
+       do {
+               SAM_DISPINFO_CTR ctr;
+               SAM_DISPINFO_3 info3;
+               uint32 max_size;
+
+               ZERO_STRUCT(ctr);
+               ZERO_STRUCT(info3);
+               ctr.sam.info3 = &info3;
+
+               if (!global) break;
+
+               get_query_dispinfo_params(
+                       loop_count, &max_entries, &max_size);
+
+               result = rpccli_samr_query_dispinfo(pipe_hnd, mem_ctx, &domain_pol,
+                                                &start_idx, 3, &num_entries,
+                                                max_entries, max_size, &ctr);
+
+               if (!NT_STATUS_IS_OK(result) &&
+                   !NT_STATUS_EQUAL(result, STATUS_MORE_ENTRIES))
+                       break;
+                                                
+               for (i = 0; i < num_entries; i++) {
+
+                       fstring group, desc;
+
+                       unistr2_to_ascii(group, &(&ctr.sam.info3->str[i])->uni_grp_name, sizeof(group)-1);
+                       unistr2_to_ascii(desc, &(&ctr.sam.info3->str[i])->uni_grp_desc, sizeof(desc)-1);
+                       
+                       if (opt_long_list_entries)
+                               printf("%-21.21s %-50.50s\n",
+                                      group, desc);
+                       else
+                               printf("%s\n", group);
+               }
+       } while (NT_STATUS_EQUAL(result, STATUS_MORE_ENTRIES));
+       /* query domain aliases */
+       start_idx = 0;
+       do {
+               if (!local) break;
+
+               /* The max_size field in cli_samr_enum_als_groups is more like
+                * an account_control field with indiviual bits what to
+                * retrieve. Set this to 0xffff as NT4 usrmgr.exe does to get
+                * everything. I'm too lazy (sorry) to get this through to
+                * rpc_parse/ etc.  Volker */
+
+               result = rpccli_samr_enum_als_groups(pipe_hnd, mem_ctx, &domain_pol,
+                                                 &start_idx, 0xffff,
+                                                 &groups, &num_entries);
+
+               if (!NT_STATUS_IS_OK(result) &&
+                   !NT_STATUS_EQUAL(result, STATUS_MORE_ENTRIES))
+                       break;
+                                                
+               for (i = 0; i < num_entries; i++) {
+
+                       char *description = NULL;
+
+                       if (opt_long_list_entries) {
+
+                               POLICY_HND alias_pol;
+                               ALIAS_INFO_CTR ctr;
+
+                               if ((NT_STATUS_IS_OK(rpccli_samr_open_alias(pipe_hnd, mem_ctx,
+                                                                        &domain_pol,
+                                                                        0x8,
+                                                                        groups[i].rid,
+                                                                        &alias_pol))) &&
+                                   (NT_STATUS_IS_OK(rpccli_samr_query_alias_info(pipe_hnd, mem_ctx,
+                                                                              &alias_pol, 3,
+                                                                              &ctr))) &&
+                                   (NT_STATUS_IS_OK(rpccli_samr_close(pipe_hnd, mem_ctx,
+                                                                   &alias_pol)))) {
+                                       description = unistr2_tdup(mem_ctx,
+                                                                  ctr.alias.info3.description.string);
+                               }
+                       }
+                       
+                       if (description != NULL) {
+                               printf("%-21.21s %-50.50s\n", 
+                                      groups[i].acct_name,
+                                      description);
+                       } else {
+                               printf("%s\n", groups[i].acct_name);
+                       }
+               }
+       } while (NT_STATUS_EQUAL(result, STATUS_MORE_ENTRIES));
+       rpccli_samr_close(pipe_hnd, mem_ctx, &domain_pol);
+       /* Get builtin policy handle */
+       
+       result = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &connect_pol,
+                                     MAXIMUM_ALLOWED_ACCESS,
+                                     &global_sid_Builtin, &domain_pol);
+       if (!NT_STATUS_IS_OK(result)) {
+               goto done;
+       }
+       /* query builtin aliases */
+       start_idx = 0;
+       do {
+               if (!builtin) break;
+
+               result = rpccli_samr_enum_als_groups(pipe_hnd, mem_ctx, &domain_pol,
+                                                 &start_idx, max_entries,
+                                                 &groups, &num_entries);
+                                                
+               if (!NT_STATUS_IS_OK(result) &&
+                   !NT_STATUS_EQUAL(result, STATUS_MORE_ENTRIES))
+                       break;
+                                                
+               for (i = 0; i < num_entries; i++) {
+
+                       char *description = NULL;
+
+                       if (opt_long_list_entries) {
+
+                               POLICY_HND alias_pol;
+                               ALIAS_INFO_CTR ctr;
+
+                               if ((NT_STATUS_IS_OK(rpccli_samr_open_alias(pipe_hnd, mem_ctx,
+                                                                        &domain_pol,
+                                                                        0x8,
+                                                                        groups[i].rid,
+                                                                        &alias_pol))) &&
+                                   (NT_STATUS_IS_OK(rpccli_samr_query_alias_info(pipe_hnd, mem_ctx,
+                                                                              &alias_pol, 3,
+                                                                              &ctr))) &&
+                                   (NT_STATUS_IS_OK(rpccli_samr_close(pipe_hnd, mem_ctx,
+                                                                   &alias_pol)))) {
+                                       description = unistr2_tdup(mem_ctx,
+                                                                  ctr.alias.info3.description.string);
+                               }
+                       }
+                       
+                       if (description != NULL) {
+                               printf("%-21.21s %-50.50s\n", 
+                                      groups[i].acct_name,
+                                      description);
+                       } else {
+                               printf("%s\n", groups[i].acct_name);
+                       }
+               }
+       } while (NT_STATUS_EQUAL(result, STATUS_MORE_ENTRIES));
+
+ done:
+       return result;
+}
+
+static int rpc_group_list(int argc, const char **argv)
+{
+       return run_rpc_command(NULL, PI_SAMR, 0,
+                              rpc_group_list_internals,
+                              argc, argv);
+}
+
+static NTSTATUS rpc_list_group_members(struct rpc_pipe_client *pipe_hnd,
+                                       TALLOC_CTX *mem_ctx,
+                                       const char *domain_name,
+                                       const DOM_SID *domain_sid,
+                                       POLICY_HND *domain_pol,
+                                       uint32 rid)
+{
+       NTSTATUS result;
+       POLICY_HND group_pol;
+       uint32 num_members, *group_rids, *group_attrs;
+       uint32 num_names;
+       char **names;
+       uint32 *name_types;
+       int i;
+
+       fstring sid_str;
+       sid_to_string(sid_str, domain_sid);
+
+       result = rpccli_samr_open_group(pipe_hnd, mem_ctx, domain_pol,
+                                    MAXIMUM_ALLOWED_ACCESS,
+                                    rid, &group_pol);
+
+       if (!NT_STATUS_IS_OK(result))
+               return result;
+
+       result = rpccli_samr_query_groupmem(pipe_hnd, mem_ctx, &group_pol,
+                                        &num_members, &group_rids,
+                                        &group_attrs);
+
+       if (!NT_STATUS_IS_OK(result))
+               return result;
+
+       while (num_members > 0) {
+               int this_time = 512;
+
+               if (num_members < this_time)
+                       this_time = num_members;
+
+               result = rpccli_samr_lookup_rids(pipe_hnd, mem_ctx, domain_pol,
+                                             this_time, group_rids,
+                                             &num_names, &names, &name_types);
+
+               if (!NT_STATUS_IS_OK(result))
+                       return result;
+
+               /* We only have users as members, but make the output
+                  the same as the output of alias members */
+
+               for (i = 0; i < this_time; i++) {
+
+                       if (opt_long_list_entries) {
+                               printf("%s-%d %s\\%s %d\n", sid_str,
+                                      group_rids[i], domain_name, names[i],
+                                      SID_NAME_USER);
+                       } else {
+                               printf("%s\\%s\n", domain_name, names[i]);
+                       }
+               }
+
+               num_members -= this_time;
+               group_rids += 512;
+       }
+
+       return NT_STATUS_OK;
+}
+
+static NTSTATUS rpc_list_alias_members(struct rpc_pipe_client *pipe_hnd,
+                                       TALLOC_CTX *mem_ctx,
+                                       POLICY_HND *domain_pol,
+                                       uint32 rid)
+{
+       NTSTATUS result;
+       struct rpc_pipe_client *lsa_pipe;
+       POLICY_HND alias_pol, lsa_pol;
+       uint32 num_members;
+       DOM_SID *alias_sids;
+       char **domains;
+       char **names;
+       uint32 *types;
+       int i;
+
+       result = rpccli_samr_open_alias(pipe_hnd, mem_ctx, domain_pol,
+                                    MAXIMUM_ALLOWED_ACCESS, rid, &alias_pol);
+
+       if (!NT_STATUS_IS_OK(result))
+               return result;
+
+       result = rpccli_samr_query_aliasmem(pipe_hnd, mem_ctx, &alias_pol,
+                                        &num_members, &alias_sids);
+
+       if (!NT_STATUS_IS_OK(result)) {
+               d_printf("Couldn't list alias members\n");
+               return result;
+       }
+
+       if (num_members == 0) {
+               return NT_STATUS_OK;
+       }
+
+       lsa_pipe = cli_rpc_pipe_open_noauth(pipe_hnd->cli, PI_LSARPC, &result);
+       if (!lsa_pipe) {
+               d_printf("Couldn't open LSA pipe. Error was %s\n",
+                       nt_errstr(result) );
+               return result;
+       }
+
+       result = rpccli_lsa_open_policy(lsa_pipe, mem_ctx, True,
+                                    SEC_RIGHTS_MAXIMUM_ALLOWED, &lsa_pol);
+
+       if (!NT_STATUS_IS_OK(result)) {
+               d_printf("Couldn't open LSA policy handle\n");
+               cli_rpc_pipe_close(lsa_pipe);
+               return result;
+       }
+
+       result = rpccli_lsa_lookup_sids(lsa_pipe, mem_ctx, &lsa_pol, num_members,
+                                    alias_sids, 
+                                    &domains, &names, &types);
+
+       if (!NT_STATUS_IS_OK(result) &&
+           !NT_STATUS_EQUAL(result, STATUS_SOME_UNMAPPED)) {
+               d_printf("Couldn't lookup SIDs\n");
+               cli_rpc_pipe_close(lsa_pipe);
+               return result;
+       }
+
+       for (i = 0; i < num_members; i++) {
+               fstring sid_str;
+               sid_to_string(sid_str, &alias_sids[i]);
+
+               if (opt_long_list_entries) {
+                       printf("%s %s\\%s %d\n", sid_str, 
+                              domains[i] ? domains[i] : "*unknown*", 
+                              names[i] ? names[i] : "*unknown*", types[i]);
+               } else {
+                       if (domains[i])
+                               printf("%s\\%s\n", domains[i], names[i]);
+                       else
+                               printf("%s\n", sid_str);
+               }
+       }
+
+       cli_rpc_pipe_close(lsa_pipe);
+       return NT_STATUS_OK;
+}
+static NTSTATUS rpc_group_members_internals(const DOM_SID *domain_sid,
+                                       const char *domain_name, 
+                                       struct cli_state *cli,
+                                       struct rpc_pipe_client *pipe_hnd,
+                                       TALLOC_CTX *mem_ctx,
+                                       int argc,
+                                       const char **argv)
+{
+       NTSTATUS result;
+       POLICY_HND connect_pol, domain_pol;
+       uint32 num_rids, *rids, *rid_types;
+
+       /* Get sam policy handle */
+       
+       result = rpccli_samr_connect(pipe_hnd, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
+                                 &connect_pol);
+
+       if (!NT_STATUS_IS_OK(result))
+               return result;
+       
+       /* Get domain policy handle */
+       
+       result = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &connect_pol,
+                                     MAXIMUM_ALLOWED_ACCESS,
+                                     domain_sid, &domain_pol);
+
+       if (!NT_STATUS_IS_OK(result))
+               return result;
+
+       result = rpccli_samr_lookup_names(pipe_hnd, mem_ctx, &domain_pol, 1000,
+                                      1, argv, &num_rids, &rids, &rid_types);
+
+       if (!NT_STATUS_IS_OK(result)) {
+
+               /* Ok, did not find it in the global sam, try with builtin */
+
+               DOM_SID sid_Builtin;
+
+               rpccli_samr_close(pipe_hnd, mem_ctx, &domain_pol);
+
+               string_to_sid(&sid_Builtin, "S-1-5-32");                
+
+               result = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &connect_pol,
+                                             MAXIMUM_ALLOWED_ACCESS,
+                                             &sid_Builtin, &domain_pol);
+
+               if (!NT_STATUS_IS_OK(result)) {
+                       d_printf("Couldn't find group %s\n", argv[0]);
+                       return result;
+               }
+
+               result = rpccli_samr_lookup_names(pipe_hnd, mem_ctx, &domain_pol, 1000,
+                                              1, argv, &num_rids,
+                                              &rids, &rid_types);
+
+               if (!NT_STATUS_IS_OK(result)) {
+                       d_printf("Couldn't find group %s\n", argv[0]);
+                       return result;
+               }
+       }
+
+       if (num_rids != 1) {
+               d_printf("Couldn't find group %s\n", argv[0]);
+               return result;
+       }
+
+       if (rid_types[0] == SID_NAME_DOM_GRP) {
+               return rpc_list_group_members(pipe_hnd, mem_ctx, domain_name,
+                                             domain_sid, &domain_pol,
+                                             rids[0]);
+       }
+
+       if (rid_types[0] == SID_NAME_ALIAS) {
+               return rpc_list_alias_members(pipe_hnd, mem_ctx, &domain_pol,
+                                             rids[0]);
+       }
+
+       return NT_STATUS_NO_SUCH_GROUP;
+}
+
+static int rpc_group_members(int argc, const char **argv)
+{
+       if (argc != 1) {
+               return rpc_group_usage(argc, argv);
+       }
+
+       return run_rpc_command(NULL, PI_SAMR, 0,
+                              rpc_group_members_internals,
+                              argc, argv);
+}
+
+static NTSTATUS rpc_group_rename_internals(const DOM_SID *domain_sid,
+                                       const char *domain_name, 
+                                       struct cli_state *cli,
+                                       struct rpc_pipe_client *pipe_hnd,
+                                       TALLOC_CTX *mem_ctx,
+                                       int argc,
+                                       const char **argv)
+{
+       NTSTATUS result;
+       POLICY_HND connect_pol, domain_pol, group_pol;
+       uint32 num_rids, *rids, *rid_types;
+       GROUP_INFO_CTR ctr;
+
+       if (argc != 2) {
+               d_printf("Usage: 'net rpc group rename group newname'\n");
+               return NT_STATUS_UNSUCCESSFUL;
+       }
+
+       /* Get sam policy handle */
+       
+       result = rpccli_samr_connect(pipe_hnd, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
+                                 &connect_pol);
+
+       if (!NT_STATUS_IS_OK(result))
+               return result;
+       
+       /* Get domain policy handle */
+       
+       result = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &connect_pol,
+                                     MAXIMUM_ALLOWED_ACCESS,
+                                     domain_sid, &domain_pol);
+
+       if (!NT_STATUS_IS_OK(result))
+               return result;
+
+       result = rpccli_samr_lookup_names(pipe_hnd, mem_ctx, &domain_pol, 1000,
+                                      1, argv, &num_rids, &rids, &rid_types);
+
+       if (num_rids != 1) {
+               d_printf("Couldn't find group %s\n", argv[0]);
+               return result;
+       }
+
+       if (rid_types[0] != SID_NAME_DOM_GRP) {
+               d_printf("Can only rename domain groups\n");
+               return NT_STATUS_UNSUCCESSFUL;
+       }
+
+       result = rpccli_samr_open_group(pipe_hnd, mem_ctx, &domain_pol,
+                                    MAXIMUM_ALLOWED_ACCESS,
+                                    rids[0], &group_pol);
+
+       if (!NT_STATUS_IS_OK(result))
+               return result;
+
+       ZERO_STRUCT(ctr);
+
+       ctr.switch_value1 = 2;
+       init_samr_group_info2(&ctr.group.info2, argv[1]);
+
+       result = rpccli_samr_set_groupinfo(pipe_hnd, mem_ctx, &group_pol, &ctr);
+
+       if (!NT_STATUS_IS_OK(result))
+               return result;
+
+       return NT_STATUS_NO_SUCH_GROUP;
+}
+
+static int rpc_group_rename(int argc, const char **argv)
+{
+       if (argc != 2) {
+               return rpc_group_usage(argc, argv);
+       }
+
+       return run_rpc_command(NULL, PI_SAMR, 0,
+                              rpc_group_rename_internals,
+                              argc, argv);
+}
+
+/** 
+ * 'net rpc group' entrypoint.
+ * @param argc  Standard main() style argc
+ * @param argc  Standard main() style argv.  Initial components are already
+ *              stripped
+ **/
+
+int net_rpc_group(int argc, const char **argv) 
+{
+       struct functable func[] = {
+               {"add", rpc_group_add},
+               {"delete", rpc_group_delete},
+               {"addmem", rpc_group_addmem},
+               {"delmem", rpc_group_delmem},
+               {"list", rpc_group_list},
+               {"members", rpc_group_members},
+               {"rename", rpc_group_rename},
+               {NULL, NULL}
+       };
+       
+       if (argc == 0) {
+               return run_rpc_command(NULL, PI_SAMR, 0, 
+                                      rpc_group_list_internals,
+                                      argc, argv);
+       }
+
+       return net_run_function(argc, argv, func, rpc_group_usage);
+}
+
+/****************************************************************************/
+
+static int rpc_share_usage(int argc, const char **argv)
+{
+       return net_help_share(argc, argv);
+}
+
+/** 
+ * Add a share on a remote RPC server
+ *
+ * All parameters are provided by the run_rpc_command function, except for
+ * argc, argv which are passes through. 
+ *
+ * @param domain_sid The domain sid acquired from the remote server
+ * @param cli A cli_state connected to the server.
+ * @param mem_ctx Talloc context, destoyed on completion of the function.
+ * @param argc  Standard main() style argc
+ * @param argv  Standard main() style argv.  Initial components are already
+ *              stripped
+ *
+ * @return Normal NTSTATUS return.
+ **/
+static NTSTATUS rpc_share_add_internals(const DOM_SID *domain_sid,
+                                       const char *domain_name, 
+                                       struct cli_state *cli,
+                                       struct rpc_pipe_client *pipe_hnd,
+                                       TALLOC_CTX *mem_ctx,int argc,
+                                       const char **argv)
+{
+       WERROR result;
+       char *sharename=talloc_strdup(mem_ctx, argv[0]);
+       char *path;
+       uint32 type = STYPE_DISKTREE; /* only allow disk shares to be added */
+       uint32 num_users=0, perms=0;
+       char *password=NULL; /* don't allow a share password */
+       uint32 level = 2;
+
+       path = strchr(sharename, '=');
+       if (!path)
+               return NT_STATUS_UNSUCCESSFUL;
+       *path++ = '\0';
+
+       result = rpccli_srvsvc_net_share_add(pipe_hnd, mem_ctx, sharename, type,
+                                         opt_comment, perms, opt_maxusers,
+                                         num_users, path, password, 
+                                         level, NULL);
+       return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+}
+
+static int rpc_share_add(int argc, const char **argv)
+{
+       if ((argc < 1) || !strchr(argv[0], '=')) {
+               DEBUG(1,("Sharename or path not specified on add\n"));
+               return rpc_share_usage(argc, argv);
+       }
+       return run_rpc_command(NULL, PI_SRVSVC, 0, 
+                              rpc_share_add_internals,
+                              argc, argv);
+}
+
+/** 
+ * Delete a share on a remote RPC server
+ *
+ * All parameters are provided by the run_rpc_command function, except for
+ * argc, argv which are passes through. 
+ *
+ * @param domain_sid The domain sid acquired from the remote server
+ * @param cli A cli_state connected to the server.
+ * @param mem_ctx Talloc context, destoyed on completion of the function.
+ * @param argc  Standard main() style argc
+ * @param argv  Standard main() style argv.  Initial components are already
+ *              stripped
+ *
+ * @return Normal NTSTATUS return.
+ **/
+static NTSTATUS rpc_share_del_internals(const DOM_SID *domain_sid,
+                                       const char *domain_name, 
+                                       struct cli_state *cli,
+                                       struct rpc_pipe_client *pipe_hnd,
+                                       TALLOC_CTX *mem_ctx,
+                                       int argc,
+                                       const char **argv)
+{
+       WERROR result;
+
+       result = rpccli_srvsvc_net_share_del(pipe_hnd, mem_ctx, argv[0]);
+       return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+}
+
+/** 
+ * Delete a share on a remote RPC server
+ *
+ * @param domain_sid The domain sid acquired from the remote server
+ * @param argc  Standard main() style argc
+ * @param argv  Standard main() style argv.  Initial components are already
+ *              stripped
+ *
+ * @return A shell status integer (0 for success)
+ **/
+static int rpc_share_delete(int argc, const char **argv)
+{
+       if (argc < 1) {
+               DEBUG(1,("Sharename not specified on delete\n"));
+               return rpc_share_usage(argc, argv);
+       }
+       return run_rpc_command(NULL, PI_SRVSVC, 0, 
+                              rpc_share_del_internals,
+                              argc, argv);
+}
+
+/**
+ * Formatted print of share info
+ *
+ * @param info1  pointer to SRV_SHARE_INFO_1 to format
+ **/
+static void display_share_info_1(SRV_SHARE_INFO_1 *info1)
+{
+       fstring netname = "", remark = "";
+
+       rpcstr_pull_unistr2_fstring(netname, &info1->info_1_str.uni_netname);
+       rpcstr_pull_unistr2_fstring(remark, &info1->info_1_str.uni_remark);
+
+       if (opt_long_list_entries) {
+               d_printf("%-12s %-8.8s %-50s\n",
+                        netname, share_type[info1->info_1.type], remark);
+       } else {
+               d_printf("%s\n", netname);
+       }
+
+}
+
+static WERROR get_share_info(struct rpc_pipe_client *pipe_hnd,
+                               TALLOC_CTX *mem_ctx, 
+                               uint32 level,
+                               int argc,
+                               const char **argv, 
+                               SRV_SHARE_INFO_CTR *ctr)
+{
+       WERROR result;
+       SRV_SHARE_INFO info;
+
+       /* no specific share requested, enumerate all */
+       if (argc == 0) {
+
+               ENUM_HND hnd;
+               uint32 preferred_len = 0xffffffff;
+
+               init_enum_hnd(&hnd, 0);
+
+               return rpccli_srvsvc_net_share_enum(pipe_hnd, mem_ctx, level, ctr, 
+                                                preferred_len, &hnd);
+       }
+
+       /* request just one share */
+       result = rpccli_srvsvc_net_share_get_info(pipe_hnd, mem_ctx, argv[0], level, &info);
+
+       if (!W_ERROR_IS_OK(result))
+               goto done;
+
+       /* construct ctr */
+       ZERO_STRUCTP(ctr);
+
+       ctr->info_level = ctr->switch_value = level;
+       ctr->ptr_share_info = ctr->ptr_entries = 1;
+       ctr->num_entries = ctr->num_entries2 = 1;
+
+       switch (level) {
+       case 1:
+       {
+               char *s;
+               SRV_SHARE_INFO_1 *info1;
+               
+               ctr->share.info1 = TALLOC_ARRAY(mem_ctx, SRV_SHARE_INFO_1, 1);
+               info1 = ctr->share.info1;
+                               
+               memset(ctr->share.info1, 0, sizeof(SRV_SHARE_INFO_1));
+
+               /* Copy pointer crap */
+
+               memcpy(&info1->info_1, &info.share.info1.info_1, sizeof(SH_INFO_1));
+
+               /* Duplicate strings */
+
+               s = unistr2_tdup(mem_ctx, &info.share.info1.info_1_str.uni_netname);
+               if (s)
+                       init_unistr2(&info1->info_1_str.uni_netname, s, UNI_STR_TERMINATE);
+
+               s = unistr2_tdup(mem_ctx, &info.share.info1.info_1_str.uni_remark);
+               if (s)
+                       init_unistr2(&info1->info_1_str.uni_remark, s, UNI_STR_TERMINATE);
+       }
+       case 2:
+       {
+               char *s;
+               SRV_SHARE_INFO_2 *info2;
+               
+               ctr->share.info2 = TALLOC_ARRAY(mem_ctx, SRV_SHARE_INFO_2, 1);
+               info2 = ctr->share.info2;
+                               
+               memset(ctr->share.info2, 0, sizeof(SRV_SHARE_INFO_2));
+
+               /* Copy pointer crap */
+
+               memcpy(&info2->info_2, &info.share.info2.info_2, sizeof(SH_INFO_2));
+
+               /* Duplicate strings */
+
+               s = unistr2_tdup(mem_ctx, &info.share.info2.info_2_str.uni_netname);
+               if (s)
+                       init_unistr2(&info2->info_2_str.uni_netname, s, UNI_STR_TERMINATE);
+
+               s = unistr2_tdup(mem_ctx, &info.share.info2.info_2_str.uni_remark);
+               if (s)
+                       init_unistr2(&info2->info_2_str.uni_remark, s, UNI_STR_TERMINATE);
+
+               s = unistr2_tdup(mem_ctx, &info.share.info2.info_2_str.uni_path);
+               if (s)
+                       init_unistr2(&info2->info_2_str.uni_path, s, UNI_STR_TERMINATE);
+
+               s = unistr2_tdup(mem_ctx, &info.share.info2.info_2_str.uni_passwd);
+               if (s)
+                       init_unistr2(&info2->info_2_str.uni_passwd, s, UNI_STR_TERMINATE);
+       }
+       case 502:
+       {
+               char *s;
+               SRV_SHARE_INFO_502 *info502;
+
+               ctr->share.info502 = TALLOC_ARRAY(mem_ctx, SRV_SHARE_INFO_502, 1);
+               info502 = ctr->share.info502;
+
+               memset(ctr->share.info502, 0, sizeof(SRV_SHARE_INFO_502));
+
+               /* Copy pointer crap */
+
+               memcpy(&info502->info_502, &info.share.info502.info_502, sizeof(SH_INFO_502));
+
+               /* Duplicate strings */
+
+               s = unistr2_tdup(mem_ctx, &info.share.info502.info_502_str.uni_netname);
+               if (s)
+                       init_unistr2(&info502->info_502_str.uni_netname, s, UNI_STR_TERMINATE);
+
+               s = unistr2_tdup(mem_ctx, &info.share.info502.info_502_str.uni_remark);
+               if (s)
+                       init_unistr2(&info502->info_502_str.uni_remark, s, UNI_STR_TERMINATE);
+
+               s = unistr2_tdup(mem_ctx, &info.share.info502.info_502_str.uni_path);
+               if (s)
+                       init_unistr2(&info502->info_502_str.uni_path, s, UNI_STR_TERMINATE);
+
+               s = unistr2_tdup(mem_ctx, &info.share.info502.info_502_str.uni_passwd);
+               if (s)
+                       init_unistr2(&info502->info_502_str.uni_passwd, s, UNI_STR_TERMINATE);
+
+               info502->info_502_str.sd = dup_sec_desc(mem_ctx, info.share.info502.info_502_str.sd);
+                               
+       }
+
+       } /* switch */
+
+done:
+       return result;
+}
+
+/** 
+ * List shares on a remote RPC server
+ *
+ * All parameters are provided by the run_rpc_command function, except for
+ * argc, argv which are passes through. 
+ *
+ * @param domain_sid The domain sid acquired from the remote server
+ * @param cli A cli_state connected to the server.
+ * @param mem_ctx Talloc context, destoyed on completion of the function.
+ * @param argc  Standard main() style argc
+ * @param argv  Standard main() style argv.  Initial components are already
+ *              stripped
+ *
+ * @return Normal NTSTATUS return.
+ **/
+
+static NTSTATUS rpc_share_list_internals(const DOM_SID *domain_sid,
+                                       const char *domain_name, 
+                                       struct cli_state *cli,
+                                       struct rpc_pipe_client *pipe_hnd,
+                                       TALLOC_CTX *mem_ctx,
+                                       int argc,
+                                       const char **argv)
+{
+       SRV_SHARE_INFO_CTR ctr;
+       WERROR result;
+       uint32 i, level = 1;
+
+       result = get_share_info(pipe_hnd, mem_ctx, level, argc, argv, &ctr);
+       if (!W_ERROR_IS_OK(result))
+               goto done;
+
+       /* Display results */
+
+       if (opt_long_list_entries) {
+               d_printf(
+       "\nEnumerating shared resources (exports) on remote server:\n\n"\
+       "\nShare name   Type     Description\n"\
+       "----------   ----     -----------\n");
+       }
+       for (i = 0; i < ctr.num_entries; i++)
+               display_share_info_1(&ctr.share.info1[i]);
+ done:
+       return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+}
+
+/*** 
+ * 'net rpc share list' entrypoint.
+ * @param argc  Standard main() style argc
+ * @param argv  Standard main() style argv.  Initial components are already
+ *              stripped
+ **/
+static int rpc_share_list(int argc, const char **argv)
+{
+       return run_rpc_command(NULL, PI_SRVSVC, 0, rpc_share_list_internals, argc, argv);
+}
+
+static BOOL check_share_availability(struct cli_state *cli, const char *netname)
+{
+       if (!cli_send_tconX(cli, netname, "A:", "", 0)) {
+               d_printf("skipping   [%s]: not a file share.\n", netname);
+               return False;
+       }
+
+       if (!cli_tdis(cli)) 
+               return False;
+
+       return True;
+}
+
+static BOOL check_share_sanity(struct cli_state *cli, fstring netname, uint32 type)
+{
+       /* only support disk shares */
+       if (! ( type == STYPE_DISKTREE || type == (STYPE_DISKTREE | STYPE_HIDDEN)) ) {
+               printf("share [%s] is not a diskshare (type: %x)\n", netname, type);
+               return False;
+       }
+
+       /* skip builtin shares */
+       /* FIXME: should print$ be added too ? */
+       if (strequal(netname,"IPC$") || strequal(netname,"ADMIN$") || 
+           strequal(netname,"global")) 
+               return False;
+
+       if (opt_exclude && in_list(netname, opt_exclude, False)) {
+               printf("excluding  [%s]\n", netname);
+               return False;
+       }
+
+       return check_share_availability(cli, netname);
+}
+
+/** 
+ * Migrate shares from a remote RPC server to the local RPC srever
+ *
+ * All parameters are provided by the run_rpc_command function, except for
+ * argc, argv which are passes through. 
+ *
+ * @param domain_sid The domain sid acquired from the remote server
+ * @param cli A cli_state connected to the server.
+ * @param mem_ctx Talloc context, destoyed on completion of the function.
+ * @param argc  Standard main() style argc
+ * @param argv  Standard main() style argv.  Initial components are already
+ *              stripped
+ *
+ * @return Normal NTSTATUS return.
+ **/
+
+static NTSTATUS rpc_share_migrate_shares_internals(const DOM_SID *domain_sid,
+                                               const char *domain_name, 
+                                               struct cli_state *cli,
+                                               struct rpc_pipe_client *pipe_hnd,
+                                               TALLOC_CTX *mem_ctx, 
+                                               int argc,
+                                               const char **argv)
+{
+       WERROR result;
+       NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
+       SRV_SHARE_INFO_CTR ctr_src;
+       uint32 type = STYPE_DISKTREE; /* only allow disk shares to be added */
+       char *password = NULL; /* don't allow a share password */
+       uint32 i;
+       struct rpc_pipe_client *srvsvc_pipe = NULL;
+       struct cli_state *cli_dst = NULL;
+       uint32 level = 502; /* includes secdesc */
+
+       result = get_share_info(pipe_hnd, mem_ctx, level, argc, argv, &ctr_src);
+       if (!W_ERROR_IS_OK(result))
+               goto done;
+
+       /* connect destination PI_SRVSVC */
+        nt_status = connect_dst_pipe(&cli_dst, &srvsvc_pipe, PI_SRVSVC);
+        if (!NT_STATUS_IS_OK(nt_status))
+                return nt_status;
+
+
+       for (i = 0; i < ctr_src.num_entries; i++) {
+
+               fstring netname = "", remark = "", path = "";
+               /* reset error-code */
+               nt_status = NT_STATUS_UNSUCCESSFUL;
+
+               rpcstr_pull_unistr2_fstring(
+                       netname, &ctr_src.share.info502[i].info_502_str.uni_netname);
+               rpcstr_pull_unistr2_fstring(
+                       remark, &ctr_src.share.info502[i].info_502_str.uni_remark);
+               rpcstr_pull_unistr2_fstring(
+                       path, &ctr_src.share.info502[i].info_502_str.uni_path);
+
+               if (!check_share_sanity(cli, netname, ctr_src.share.info502[i].info_502.type))
+                       continue;
+
+               /* finally add the share on the dst server */ 
+
+               printf("migrating: [%s], path: %s, comment: %s, without share-ACLs\n", 
+                       netname, path, remark);
+
+               result = rpccli_srvsvc_net_share_add(srvsvc_pipe, mem_ctx, netname, type, remark,
+                                                 ctr_src.share.info502[i].info_502.perms,
+                                                 ctr_src.share.info502[i].info_502.max_uses,
+                                                 ctr_src.share.info502[i].info_502.num_uses,
+                                                 path, password, level, 
+                                                 NULL);
+       
+                if (W_ERROR_V(result) == W_ERROR_V(WERR_ALREADY_EXISTS)) {
+                       printf("           [%s] does already exist\n", netname);
+                       continue;
+               }
+
+               if (!W_ERROR_IS_OK(result)) {
+                       printf("cannot add share: %s\n", dos_errstr(result));
+                       goto done;
+               }
+
+       }
+
+       nt_status = NT_STATUS_OK;
+
+done:
+       if (cli_dst) {
+               cli_shutdown(cli_dst);
+       }
+
+       return nt_status;
+
+}
+
+/** 
+ * Migrate shares from a rpc-server to another
+ *
+ * @param argc  Standard main() style argc
+ * @param argv  Standard main() style argv.  Initial components are already
+ *              stripped
+ *
+ * @return A shell status integer (0 for success)
+ **/
+static int rpc_share_migrate_shares(int argc, const char **argv)
+{
+
+       if (!opt_host) {
+               printf("no server to migrate\n");
+               return -1;
+       }
+
+       return run_rpc_command(NULL, PI_SRVSVC, 0, 
+                              rpc_share_migrate_shares_internals,
+                              argc, argv);
+}
+
+/**
+ * Copy a file/dir 
+ *
+ * @param f    file_info
+ * @param mask current search mask
+ * @param state        arg-pointer
+ *
+ **/
+static void copy_fn(const char *mnt, file_info *f, const char *mask, void *state)
+{
+       static NTSTATUS nt_status;
+       static struct copy_clistate *local_state;
+       static fstring filename, new_mask;
+       fstring dir;
+       char *old_dir;
+
+       local_state = (struct copy_clistate *)state;
+       nt_status = NT_STATUS_UNSUCCESSFUL;
+
+       if (strequal(f->name, ".") || strequal(f->name, ".."))
+               return;
+
+       DEBUG(3,("got mask: %s, name: %s\n", mask, f->name));
+
+       /* DIRECTORY */
+       if (f->mode & aDIR) {
+
+               DEBUG(3,("got dir: %s\n", f->name));
+
+               fstrcpy(dir, local_state->cwd);
+               fstrcat(dir, "\\");
+               fstrcat(dir, f->name);
+
+               switch (net_mode_share)
+               {
+               case NET_MODE_SHARE_MIGRATE:
+                       /* create that directory */
+                       nt_status = net_copy_file(local_state->mem_ctx,
+                                                 local_state->cli_share_src,
+                                                 local_state->cli_share_dst,
+                                                 dir, dir,
+                                                 opt_acls? True : False,
+                                                 opt_attrs? True : False,
+                                                 opt_timestamps? True : False,
+                                                 False);
+                       break;
+               default:
+                       d_printf("Unsupported mode %d\n", net_mode_share);
+                       return;
+               }
+
+               if (!NT_STATUS_IS_OK(nt_status)) 
+                       printf("could not handle dir %s: %s\n", 
+                               dir, nt_errstr(nt_status));
+
+               /* search below that directory */
+               fstrcpy(new_mask, dir);
+               fstrcat(new_mask, "\\*");
+
+               old_dir = local_state->cwd;
+               local_state->cwd = dir;
+               if (!sync_files(local_state, new_mask))
+                       printf("could not handle files\n");
+               local_state->cwd = old_dir;
+
+               return;
+       }
+
+
+       /* FILE */
+       fstrcpy(filename, local_state->cwd);
+       fstrcat(filename, "\\");
+       fstrcat(filename, f->name);
+
+       DEBUG(3,("got file: %s\n", filename));
+
+       switch (net_mode_share)
+       {
+       case NET_MODE_SHARE_MIGRATE:
+               nt_status = net_copy_file(local_state->mem_ctx, 
+                                         local_state->cli_share_src, 
+                                         local_state->cli_share_dst, 
+                                         filename, filename, 
+                                         opt_acls? True : False, 
+                                         opt_attrs? True : False,
+                                         opt_timestamps? True: False,
+                                         True);
+               break;
+       default:
+               d_printf("Unsupported file mode %d\n", net_mode_share);
+               return;
+       }
+
+       if (!NT_STATUS_IS_OK(nt_status)) 
+               printf("could not handle file %s: %s\n", 
+                       filename, nt_errstr(nt_status));
+
+}
+
+/**
+ * sync files, can be called recursivly to list files 
+ * and then call copy_fn for each file 
+ *
+ * @param cp_clistate  pointer to the copy_clistate we work with
+ * @param mask         the current search mask
+ *
+ * @return             Boolean result
+ **/
+BOOL sync_files(struct copy_clistate *cp_clistate, pstring mask)
+{
+
+       DEBUG(3,("calling cli_list with mask: %s\n", mask));
+
+       if (cli_list(cp_clistate->cli_share_src, mask, cp_clistate->attribute, copy_fn, cp_clistate) == -1) {
+               d_printf("listing %s failed with error: %s\n", 
+                       mask, cli_errstr(cp_clistate->cli_share_src));
+               return False;
+       }
+
+       return True;
+}
+
+
+/**
+ * Set the top level directory permissions before we do any further copies.
+ * Should set up ACL inheritance.
+ **/
+
+BOOL copy_top_level_perms(struct copy_clistate *cp_clistate, 
+                               const char *sharename)
+{
+       NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
+
+       switch (net_mode_share) {
+       case NET_MODE_SHARE_MIGRATE:
+               DEBUG(3,("calling net_copy_fileattr for '.' directory in share %s\n", sharename));
+               nt_status = net_copy_fileattr(cp_clistate->mem_ctx,
+                                               cp_clistate->cli_share_src, 
+                                               cp_clistate->cli_share_dst,
+                                               "\\", "\\",
+                                               opt_acls? True : False, 
+                                               opt_attrs? True : False,
+                                               opt_timestamps? True: False,
+                                               False);
+               break;
+       default:
+               d_printf("Unsupported mode %d\n", net_mode_share);
+               break;
+       }
+
+       if (!NT_STATUS_IS_OK(nt_status))  {
+               printf("Could handle directory attributes for top level directory of share %s. Error %s\n", 
+                       sharename, nt_errstr(nt_status));
+               return False;
+       }
+
+       return True;
+}
+
+/** 
+ * Sync all files inside a remote share to another share (over smb)
+ *
+ * All parameters are provided by the run_rpc_command function, except for
+ * argc, argv which are passes through. 
+ *
+ * @param domain_sid The domain sid acquired from the remote server
+ * @param cli A cli_state connected to the server.
+ * @param mem_ctx Talloc context, destoyed on completion of the function.
+ * @param argc  Standard main() style argc
+ * @param argv  Standard main() style argv.  Initial components are already
+ *              stripped
+ *
+ * @return Normal NTSTATUS return.
+ **/
+
+static NTSTATUS rpc_share_migrate_files_internals(const DOM_SID *domain_sid,
+                                               const char *domain_name, 
+                                               struct cli_state *cli,
+                                               struct rpc_pipe_client *pipe_hnd,
+                                               TALLOC_CTX *mem_ctx,
+                                               int argc,
+                                               const char **argv)
+{
+       WERROR result;
+       NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
+       SRV_SHARE_INFO_CTR ctr_src;
+       uint32 i;
+       uint32 level = 502;
+       struct copy_clistate cp_clistate;
+       BOOL got_src_share = False;
+       BOOL got_dst_share = False;
+       pstring mask = "\\*";
+       char *dst = NULL;
+
+       dst = SMB_STRDUP(opt_destination?opt_destination:"127.0.0.1");
+
+       result = get_share_info(pipe_hnd, mem_ctx, level, argc, argv, &ctr_src);
+
+       if (!W_ERROR_IS_OK(result))
+               goto done;
+
+       for (i = 0; i < ctr_src.num_entries; i++) {
+
+               fstring netname = "";
+
+               rpcstr_pull_unistr2_fstring(
+                       netname, &ctr_src.share.info502[i].info_502_str.uni_netname);
+
+               if (!check_share_sanity(cli, netname, ctr_src.share.info502[i].info_502.type))
+                       continue;
+
+               /* one might not want to mirror whole discs :) */
+               if (strequal(netname, "print$") || netname[1] == '$') {
+                       d_printf("skipping   [%s]: builtin/hidden share\n", netname);
+                       continue;
+               }
+
+               switch (net_mode_share)
+               {
+               case NET_MODE_SHARE_MIGRATE:
+                       printf("syncing");
+                       break;
+               default:
+                       d_printf("Unsupported mode %d\n", net_mode_share);
+                       break;
+               }
+               printf("    [%s] files and directories %s ACLs, %s DOS Attributes %s\n", 
+                       netname, 
+                       opt_acls ? "including" : "without", 
+                       opt_attrs ? "including" : "without",
+                       opt_timestamps ? "(preserving timestamps)" : "");
+
+               cp_clistate.mem_ctx = mem_ctx;
+               cp_clistate.cli_share_src = NULL;
+               cp_clistate.cli_share_dst = NULL;
+               cp_clistate.cwd = NULL;
+               cp_clistate.attribute = aSYSTEM | aHIDDEN | aDIR;
+
+               /* open share source */
+               nt_status = connect_to_service(&cp_clistate.cli_share_src,
+                                              &cli->dest_ip, cli->desthost,
+                                              netname, "A:");
+               if (!NT_STATUS_IS_OK(nt_status))
+                       goto done;
+
+               got_src_share = True;
+
+               if (net_mode_share == NET_MODE_SHARE_MIGRATE) {
+                       /* open share destination */
+                       nt_status = connect_to_service(&cp_clistate.cli_share_dst,
+                                                      NULL, dst, netname, "A:");
+                       if (!NT_STATUS_IS_OK(nt_status))
+                               goto done;
+
+                       got_dst_share = True;
+               }
+
+               if (!copy_top_level_perms(&cp_clistate, netname)) {
+                       d_printf("Could not handle the top level directory permissions for the share: %s\n", netname);
+                       nt_status = NT_STATUS_UNSUCCESSFUL;
+                       goto done;
+               }
+
+               if (!sync_files(&cp_clistate, mask)) {
+                       d_printf("could not handle files for share: %s\n", netname);
+                       nt_status = NT_STATUS_UNSUCCESSFUL;
+                       goto done;
+               }
+       }
+
+       nt_status = NT_STATUS_OK;
+
+done:
+
+       if (got_src_share)
+               cli_shutdown(cp_clistate.cli_share_src);
+
+       if (got_dst_share)
+               cli_shutdown(cp_clistate.cli_share_dst);
+
+       return nt_status;
+
+}
+
+static int rpc_share_migrate_files(int argc, const char **argv)
+{
+
+       if (!opt_host) {
+               printf("no server to migrate\n");
+               return -1;
+       }
+
+       return run_rpc_command(NULL, PI_SRVSVC, 0, 
+                              rpc_share_migrate_files_internals,
+                              argc, argv);
+}
+
+/** 
+ * Migrate share-ACLs from a remote RPC server to the local RPC srever
+ *
+ * All parameters are provided by the run_rpc_command function, except for
+ * argc, argv which are passes through. 
+ *
+ * @param domain_sid The domain sid acquired from the remote server
+ * @param cli A cli_state connected to the server.
+ * @param mem_ctx Talloc context, destoyed on completion of the function.
+ * @param argc  Standard main() style argc
+ * @param argv  Standard main() style argv.  Initial components are already
+ *              stripped
+ *
+ * @return Normal NTSTATUS return.
+ **/
+
+static NTSTATUS rpc_share_migrate_security_internals(const DOM_SID *domain_sid,
+                                               const char *domain_name, 
+                                               struct cli_state *cli,
+                                               struct rpc_pipe_client *pipe_hnd,
+                                               TALLOC_CTX *mem_ctx, 
+                                               int argc,
+                                               const char **argv)
+{
+       WERROR result;
+       NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
+       SRV_SHARE_INFO_CTR ctr_src;
+       SRV_SHARE_INFO info;
+       uint32 i;
+       struct rpc_pipe_client *srvsvc_pipe = NULL;
+       struct cli_state *cli_dst = NULL;
+       uint32 level = 502; /* includes secdesc */
+
+       result = get_share_info(pipe_hnd, mem_ctx, level, argc, argv, &ctr_src);
+
+       if (!W_ERROR_IS_OK(result))
+               goto done;
+
+       /* connect destination PI_SRVSVC */
+        nt_status = connect_dst_pipe(&cli_dst, &srvsvc_pipe, PI_SRVSVC);
+        if (!NT_STATUS_IS_OK(nt_status))
+                return nt_status;
+
+
+       for (i = 0; i < ctr_src.num_entries; i++) {
+
+               fstring netname = "", remark = "", path = "";
+               /* reset error-code */
+               nt_status = NT_STATUS_UNSUCCESSFUL;
+
+               rpcstr_pull_unistr2_fstring(
+                       netname, &ctr_src.share.info502[i].info_502_str.uni_netname);
+               rpcstr_pull_unistr2_fstring(
+                       remark, &ctr_src.share.info502[i].info_502_str.uni_remark);
+               rpcstr_pull_unistr2_fstring(
+                       path, &ctr_src.share.info502[i].info_502_str.uni_path);
+
+               if (!check_share_sanity(cli, netname, ctr_src.share.info502[i].info_502.type))
+                       continue;
+
+               printf("migrating: [%s], path: %s, comment: %s, including share-ACLs\n", 
+                       netname, path, remark);
+
+               if (opt_verbose)
+                       display_sec_desc(ctr_src.share.info502[i].info_502_str.sd);
+
+               /* init info */
+               ZERO_STRUCT(info);
+
+               info.switch_value = level;
+               info.ptr_share_ctr = 1;
+
+               /* FIXME: shouldn't we be able to just set the security descriptor ? */
+               info.share.info502 = ctr_src.share.info502[i];
+
+               /* finally modify the share on the dst server */
+               result = rpccli_srvsvc_net_share_set_info(srvsvc_pipe, mem_ctx, netname, level, &info);
+       
+               if (!W_ERROR_IS_OK(result)) {
+                       printf("cannot set share-acl: %s\n", dos_errstr(result));
+                       goto done;
+               }
+
+       }
+
+       nt_status = NT_STATUS_OK;
+
+done:
+       if (cli_dst) {
+               cli_shutdown(cli_dst);
+       }
+
+       return nt_status;
+
+}
+
+/** 
+ * Migrate share-acls from a rpc-server to another
+ *
+ * @param argc  Standard main() style argc
+ * @param argv  Standard main() style argv.  Initial components are already
+ *              stripped
+ *
+ * @return A shell status integer (0 for success)
+ **/
+static int rpc_share_migrate_security(int argc, const char **argv)
+{
+
+       if (!opt_host) {
+               printf("no server to migrate\n");
+               return -1;
+       }
+
+       return run_rpc_command(NULL, PI_SRVSVC, 0, 
+                              rpc_share_migrate_security_internals,
+                              argc, argv);
+}
+
+/** 
+ * Migrate shares (including share-definitions, share-acls and files with acls/attrs)
+ * from one server to another
+ *
+ * @param argc  Standard main() style argc
+ * @param argv  Standard main() style argv.  Initial components are already
+ *              stripped
+ *
+ * @return A shell status integer (0 for success)
+ *
+ **/
+static int rpc_share_migrate_all(int argc, const char **argv)
+{
+       int ret;
+
+       if (!opt_host) {
+               printf("no server to migrate\n");
+               return -1;
+       }
+
+       /* order is important. we don't want to be locked out by the share-acl
+        * before copying files - gd */
+       
+       ret = run_rpc_command(NULL, PI_SRVSVC, 0, rpc_share_migrate_shares_internals, argc, argv);
+       if (ret)
+               return ret;
+
+       ret = run_rpc_command(NULL, PI_SRVSVC, 0, rpc_share_migrate_files_internals, argc, argv);
+       if (ret)
+               return ret;
+       
+       return run_rpc_command(NULL, PI_SRVSVC, 0, rpc_share_migrate_security_internals, argc, argv);
+}
+
+
+/** 
+ * 'net rpc share migrate' entrypoint.
+ * @param argc  Standard main() style argc
+ * @param argv  Standard main() style argv.  Initial components are already
+ *              stripped
+ **/
+static int rpc_share_migrate(int argc, const char **argv)
+{
+
+       struct functable func[] = {
+               {"all",         rpc_share_migrate_all},
+               {"files",       rpc_share_migrate_files},
+               {"help",        rpc_share_usage},
+               {"security",    rpc_share_migrate_security},
+               {"shares",      rpc_share_migrate_shares},
+               {NULL, NULL}
+       };
+
+       net_mode_share = NET_MODE_SHARE_MIGRATE;
+
+       return net_run_function(argc, argv, func, rpc_share_usage);
+}
+
+struct full_alias {
+       DOM_SID sid;
+       uint32 num_members;
+       DOM_SID *members;
+};
+
+static int num_server_aliases;
+static struct full_alias *server_aliases;
+
+/*
+ * Add an alias to the static list.
+ */
+static void push_alias(TALLOC_CTX *mem_ctx, struct full_alias *alias)
+{
+       if (server_aliases == NULL)
+               server_aliases = SMB_MALLOC_ARRAY(struct full_alias, 100);
+
+       server_aliases[num_server_aliases] = *alias;
+       num_server_aliases += 1;
+}
+
+/*
+ * For a specific domain on the server, fetch all the aliases
+ * and their members. Add all of them to the server_aliases.
+ */
+
+static NTSTATUS rpc_fetch_domain_aliases(struct rpc_pipe_client *pipe_hnd,
+                                       TALLOC_CTX *mem_ctx,
+                                       POLICY_HND *connect_pol,
+                                       const DOM_SID *domain_sid)
+{
+       uint32 start_idx, max_entries, num_entries, i;
+       struct acct_info *groups;
+       NTSTATUS result;
+       POLICY_HND domain_pol;
+
+       /* Get domain policy handle */
+       
+       result = rpccli_samr_open_domain(pipe_hnd, mem_ctx, connect_pol,
+                                     MAXIMUM_ALLOWED_ACCESS,
+                                     domain_sid, &domain_pol);
+       if (!NT_STATUS_IS_OK(result))
+               return result;
+
+       start_idx = 0;
+       max_entries = 250;
+
+       do {
+               result = rpccli_samr_enum_als_groups(pipe_hnd, mem_ctx, &domain_pol,
+                                                 &start_idx, max_entries,
+                                                 &groups, &num_entries);
+
+               for (i = 0; i < num_entries; i++) {
+
+                       POLICY_HND alias_pol;
+                       struct full_alias alias;
+                       DOM_SID *members;
+                       int j;
+
+                       result = rpccli_samr_open_alias(pipe_hnd, mem_ctx, &domain_pol,
+                                                    MAXIMUM_ALLOWED_ACCESS,
+                                                    groups[i].rid,
+                                                    &alias_pol);
+                       if (!NT_STATUS_IS_OK(result))
+                               goto done;
+
+                       result = rpccli_samr_query_aliasmem(pipe_hnd, mem_ctx,
+                                                        &alias_pol,
+                                                        &alias.num_members,
+                                                        &members);
+                       if (!NT_STATUS_IS_OK(result))
+                               goto done;
+
+                       result = rpccli_samr_close(pipe_hnd, mem_ctx, &alias_pol);
+                       if (!NT_STATUS_IS_OK(result))
+                               goto done;
+
+                       alias.members = NULL;
+
+                       if (alias.num_members > 0) {
+                               alias.members = SMB_MALLOC_ARRAY(DOM_SID, alias.num_members);
+
+                               for (j = 0; j < alias.num_members; j++)
+                                       sid_copy(&alias.members[j],
+                                                &members[j]);
+                       }
+
+                       sid_copy(&alias.sid, domain_sid);
+                       sid_append_rid(&alias.sid, groups[i].rid);
+
+                       push_alias(mem_ctx, &alias);
+               }
+       } while (NT_STATUS_EQUAL(result, STATUS_MORE_ENTRIES));
+
+       result = NT_STATUS_OK;
+
+ done:
+       rpccli_samr_close(pipe_hnd, mem_ctx, &domain_pol);
+
+       return result;
+}
+
+/*
+ * Dump server_aliases as names for debugging purposes.
+ */
+
+static NTSTATUS rpc_aliaslist_dump(const DOM_SID *domain_sid,
+                               const char *domain_name,
+                               struct cli_state *cli,
+                               struct rpc_pipe_client *pipe_hnd,
+                               TALLOC_CTX *mem_ctx, 
+                               int argc,
+                               const char **argv)
+{
+       int i;
+       NTSTATUS result;
+       POLICY_HND lsa_pol;
+
+       result = rpccli_lsa_open_policy(pipe_hnd, mem_ctx, True, 
+                                    SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                    &lsa_pol);
+       if (!NT_STATUS_IS_OK(result))
+               return result;
+
+       for (i=0; i<num_server_aliases; i++) {
+               char **names;
+               char **domains;
+               uint32 *types;
+               int j;
+
+               struct full_alias *alias = &server_aliases[i];
+
+               result = rpccli_lsa_lookup_sids(pipe_hnd, mem_ctx, &lsa_pol, 1,
+                                            &alias->sid,
+                                            &domains, &names, &types);
+               if (!NT_STATUS_IS_OK(result))
+                       continue;
+
+               DEBUG(1, ("%s\\%s %d: ", domains[0], names[0], types[0]));
+
+               if (alias->num_members == 0) {
+                       DEBUG(1, ("\n"));
+                       continue;
+               }
+
+               result = rpccli_lsa_lookup_sids(pipe_hnd, mem_ctx, &lsa_pol,
+                                            alias->num_members,
+                                            alias->members,
+                                            &domains, &names, &types);
+
+               if (!NT_STATUS_IS_OK(result) &&
+                   !NT_STATUS_EQUAL(result, STATUS_SOME_UNMAPPED))
+                       continue;
+
+               for (j=0; j<alias->num_members; j++)
+                       DEBUG(1, ("%s\\%s (%d); ",
+                                 domains[j] ? domains[j] : "*unknown*", 
+                                 names[j] ? names[j] : "*unknown*",types[j]));
+               DEBUG(1, ("\n"));
+       }
+
+       rpccli_lsa_close(pipe_hnd, mem_ctx, &lsa_pol);
+
+       return NT_STATUS_OK;
+}
+
+/*
+ * Fetch a list of all server aliases and their members into
+ * server_aliases.
+ */
+
+static NTSTATUS rpc_aliaslist_internals(const DOM_SID *domain_sid,
+                                       const char *domain_name,
+                                       struct cli_state *cli,
+                                       struct rpc_pipe_client *pipe_hnd,
+                                       TALLOC_CTX *mem_ctx, 
+                                       int argc,
+                                       const char **argv)
+{
+       NTSTATUS result;
+       POLICY_HND connect_pol;
+
+       result = rpccli_samr_connect(pipe_hnd, mem_ctx, MAXIMUM_ALLOWED_ACCESS, 
+                                 &connect_pol);
+
+       if (!NT_STATUS_IS_OK(result))
+               goto done;
+       
+       result = rpc_fetch_domain_aliases(pipe_hnd, mem_ctx, &connect_pol,
+                                         &global_sid_Builtin);
+
+       if (!NT_STATUS_IS_OK(result))
+               goto done;
+       
+       result = rpc_fetch_domain_aliases(pipe_hnd, mem_ctx, &connect_pol,
+                                         domain_sid);
+
+       rpccli_samr_close(pipe_hnd, mem_ctx, &connect_pol);
+ done:
+       return result;
+}
+
+static void init_user_token(NT_USER_TOKEN *token, DOM_SID *user_sid)
+{
+       token->num_sids = 4;
+
+       token->user_sids = SMB_MALLOC_ARRAY(DOM_SID, 4);
+
+       token->user_sids[0] = *user_sid;
+       sid_copy(&token->user_sids[1], &global_sid_World);
+       sid_copy(&token->user_sids[2], &global_sid_Network);
+       sid_copy(&token->user_sids[3], &global_sid_Authenticated_Users);
+}
+
+static void free_user_token(NT_USER_TOKEN *token)
+{
+       SAFE_FREE(token->user_sids);
+}
+
+static BOOL is_sid_in_token(NT_USER_TOKEN *token, DOM_SID *sid)
+{
+       int i;
+
+       for (i=0; i<token->num_sids; i++) {
+               if (sid_compare(sid, &token->user_sids[i]) == 0)
+                       return True;
+       }
+       return False;
+}
+
+static void add_sid_to_token(NT_USER_TOKEN *token, DOM_SID *sid)
+{
+       if (is_sid_in_token(token, sid))
+               return;
+
+       token->user_sids = SMB_REALLOC_ARRAY(token->user_sids, DOM_SID, token->num_sids+1);
+
+       sid_copy(&token->user_sids[token->num_sids], sid);
+
+       token->num_sids += 1;
+}
+
+struct user_token {
+       fstring name;
+       NT_USER_TOKEN token;
+};
+
+static void dump_user_token(struct user_token *token)
+{
+       int i;
+
+       d_printf("%s\n", token->name);
+
+       for (i=0; i<token->token.num_sids; i++) {
+               d_printf(" %s\n", sid_string_static(&token->token.user_sids[i]));
+       }
+}
+
+static BOOL is_alias_member(DOM_SID *sid, struct full_alias *alias)
+{
+       int i;
+
+       for (i=0; i<alias->num_members; i++) {
+               if (sid_compare(sid, &alias->members[i]) == 0)
+                       return True;
+       }
+
+       return False;
+}
+
+static void collect_sid_memberships(NT_USER_TOKEN *token, DOM_SID sid)
+{
+       int i;
+
+       for (i=0; i<num_server_aliases; i++) {
+               if (is_alias_member(&sid, &server_aliases[i]))
+                       add_sid_to_token(token, &server_aliases[i].sid);
+       }
+}
+
+/*
+ * We got a user token with all the SIDs we can know about without asking the
+ * server directly. These are the user and domain group sids. All of these can
+ * be members of aliases. So scan the list of aliases for each of the SIDs and
+ * add them to the token.
+ */
+
+static void collect_alias_memberships(NT_USER_TOKEN *token)
+{
+       int num_global_sids = token->num_sids;
+       int i;
+
+       for (i=0; i<num_global_sids; i++) {
+               collect_sid_memberships(token, token->user_sids[i]);
+       }
+}
+
+static BOOL get_user_sids(const char *domain, const char *user, NT_USER_TOKEN *token)
+{
+       struct winbindd_request request;
+       struct winbindd_response response;
+       fstring full_name;
+       NSS_STATUS result;
+
+       DOM_SID user_sid;
+
+       int i;
+
+       fstr_sprintf(full_name, "%s%c%s",
+                    domain, *lp_winbind_separator(), user);
+
+       /* First let's find out the user sid */
+
+       ZERO_STRUCT(request);
+       ZERO_STRUCT(response);
+
+       fstrcpy(request.data.name.dom_name, domain);
+       fstrcpy(request.data.name.name, user);
+
+       result = winbindd_request_response(WINBINDD_LOOKUPNAME, &request, &response);
+
+       if (result != NSS_STATUS_SUCCESS) {
+               DEBUG(1, ("winbind could not find %s\n", full_name));
+               return False;
+       }
+
+       if (response.data.sid.type != SID_NAME_USER) {
+               DEBUG(1, ("%s is not a user\n", full_name));
+               return False;
+       }
+
+       string_to_sid(&user_sid, response.data.sid.sid);
+
+       init_user_token(token, &user_sid);
+
+       /* And now the groups winbind knows about */
+
+       ZERO_STRUCT(response);
+
+       fstrcpy(request.data.username, full_name);
+
+       result = winbindd_request_response(WINBINDD_GETGROUPS, &request, &response);
+
+       if (result != NSS_STATUS_SUCCESS) {
+               DEBUG(1, ("winbind could not get groups of %s\n", full_name));
+               return False;
+       }
+
+       for (i = 0; i < response.data.num_entries; i++) {
+               gid_t gid = ((gid_t *)response.extra_data)[i];
+               DOM_SID sid;
+
+               struct winbindd_request sidrequest;
+               struct winbindd_response sidresponse;
+
+               ZERO_STRUCT(sidrequest);
+               ZERO_STRUCT(sidresponse);
+
+               sidrequest.data.gid = gid;
+
+               result = winbindd_request_response(WINBINDD_GID_TO_SID,
+                                         &sidrequest, &sidresponse);
+
+               if (result != NSS_STATUS_SUCCESS) {
+                       DEBUG(1, ("winbind could not find SID of gid %d\n",
+                                 gid));
+                       return False;
+               }
+
+               DEBUG(3, (" %s\n", sidresponse.data.sid.sid));
+
+               string_to_sid(&sid, sidresponse.data.sid.sid);
+               add_sid_to_token(token, &sid);
+       }
+
+       SAFE_FREE(response.extra_data);
+
+       return True;
+}
+       
+/**
+ * Get a list of all user tokens we want to look at
+ **/
+
+static BOOL get_user_tokens(int *num_tokens, struct user_token **user_tokens)
+{
+       struct winbindd_request request;
+       struct winbindd_response response;
+       const char *extra_data;
+       fstring name;
+       int i;
+       struct user_token *result;
+
+       if (lp_winbind_use_default_domain() &&
+           (opt_target_workgroup == NULL)) {
+               d_printf("winbind use default domain = yes set, please "
+                        "specify a workgroup\n");
+               return False;
+       }
+
+       /* Send request to winbind daemon */
+
+       ZERO_STRUCT(request);
+       ZERO_STRUCT(response);
+       
+       if (winbindd_request_response(WINBINDD_LIST_USERS, &request, &response) !=
+           NSS_STATUS_SUCCESS)
+               return False;
+
+       /* Look through extra data */
+
+       if (!response.extra_data)
+               return False;
+
+       extra_data = (const char *)response.extra_data;
+       *num_tokens = 0;
+
+       while(next_token(&extra_data, name, ",", sizeof(fstring))) {
+               *num_tokens += 1;
+       }
+
+       result = SMB_MALLOC_ARRAY(struct user_token, *num_tokens);
+
+       if (result == NULL) {
+               DEBUG(1, ("Could not malloc sid array\n"));
+               return False;
+       }
+
+       extra_data = (const char *)response.extra_data;
+       i=0;
+
+       while(next_token(&extra_data, name, ",", sizeof(fstring))) {
+
+               fstring domain, user;
+               char *p;
+
+               fstrcpy(result[i].name, name);
+
+               p = strchr(name, *lp_winbind_separator());
+
+               DEBUG(3, ("%s\n", name));
+
+               if (p == NULL) {
+                       fstrcpy(domain, opt_target_workgroup);
+                       fstrcpy(user, name);
+               } else {
+                       *p++ = '\0';
+                       fstrcpy(domain, name);
+                       strupper_m(domain);
+                       fstrcpy(user, p);
+               }
+
+               get_user_sids(domain, user, &(result[i].token));
+               i+=1;
+       }
+       
+       SAFE_FREE(response.extra_data);
+
+       *user_tokens = result;
+
+       return True;
+}
+
+static BOOL get_user_tokens_from_file(FILE *f,
+                                     int *num_tokens,
+                                     struct user_token **tokens)
+{
+       struct user_token *token = NULL;
+
+       while (!feof(f)) {
+               fstring line;
+
+               if (fgets(line, sizeof(line)-1, f) == NULL) {
+                       return True;
+               }
+
+               if (line[strlen(line)-1] == '\n')
+                       line[strlen(line)-1] = '\0';
+
+               if (line[0] == ' ') {
+                       /* We have a SID */
+
+                       DOM_SID sid;
+                       string_to_sid(&sid, &line[1]);
+
+                       if (token == NULL) {
+                               DEBUG(0, ("File does not begin with username"));
+                               return False;
+                       }
+
+                       add_sid_to_token(&token->token, &sid);
+                       continue;
+               }
+
+               /* And a new user... */
+
+               *num_tokens += 1;
+               *tokens = SMB_REALLOC_ARRAY(*tokens, struct user_token, *num_tokens);
+               if (*tokens == NULL) {
+                       DEBUG(0, ("Could not realloc tokens\n"));
+                       return False;
+               }
+
+               token = &((*tokens)[*num_tokens-1]);
+
+               fstrcpy(token->name, line);
+               token->token.num_sids = 0;
+               token->token.user_sids = NULL;
+               continue;
+       }
+       
+       return False;
+}
+
+
+/*
+ * Show the list of all users that have access to a share
+ */
+
+static void show_userlist(struct rpc_pipe_client *pipe_hnd,
+                       TALLOC_CTX *mem_ctx,
+                       const char *netname,
+                       int num_tokens,
+                       struct user_token *tokens)
+{
+       int fnum;
+       SEC_DESC *share_sd = NULL;
+       SEC_DESC *root_sd = NULL;
+       struct cli_state *cli = pipe_hnd->cli;
+       int i;
+       SRV_SHARE_INFO info;
+       WERROR result;
+       uint16 cnum;
+
+       result = rpccli_srvsvc_net_share_get_info(pipe_hnd, mem_ctx, netname,
+                                              502, &info);
+
+       if (!W_ERROR_IS_OK(result)) {
+               DEBUG(1, ("Coult not query secdesc for share %s\n",
+                         netname));
+               return;
+       }
+
+       share_sd = info.share.info502.info_502_str.sd;
+       if (share_sd == NULL) {
+               DEBUG(1, ("Got no secdesc for share %s\n",
+                         netname));
+       }
+
+       cnum = cli->cnum;
+
+       if (!cli_send_tconX(cli, netname, "A:", "", 0)) {
+               return;
+       }
+
+       fnum = cli_nt_create(cli, "\\", READ_CONTROL_ACCESS);
+
+       if (fnum != -1) {
+               root_sd = cli_query_secdesc(cli, fnum, mem_ctx);
+       }
+
+       for (i=0; i<num_tokens; i++) {
+               uint32 acc_granted;
+               NTSTATUS status;
+
+               if (share_sd != NULL) {
+                       if (!se_access_check(share_sd, &tokens[i].token,
+                                            1, &acc_granted, &status)) {
+                               DEBUG(1, ("Could not check share_sd for "
+                                         "user %s\n",
+                                         tokens[i].name));
+                               continue;
+                       }
+
+                       if (!NT_STATUS_IS_OK(status))
+                               continue;
+               }
+
+               if (root_sd == NULL) {
+                       d_printf(" %s\n", tokens[i].name);
+                       continue;
+               }
+
+               if (!se_access_check(root_sd, &tokens[i].token,
+                                    1, &acc_granted, &status)) {
+                       DEBUG(1, ("Could not check root_sd for user %s\n",
+                                 tokens[i].name));
+                       continue;
+               }
+
+               if (!NT_STATUS_IS_OK(status))
+                       continue;
+
+               d_printf(" %s\n", tokens[i].name);
+       }
+
+       if (fnum != -1)
+               cli_close(cli, fnum);
+       cli_tdis(cli);
+       cli->cnum = cnum;
+       
+       return;
 }
 
-/**
- * Formatted print of share info
- *
- * @param info1  pointer to SRV_SHARE_INFO_1 to format
- **/
-static void display_share_info_1(SRV_SHARE_INFO_1 *info1)
-{
-       fstring netname = "", remark = "";
+struct share_list {
+       int num_shares;
+       char **shares;
+};
 
-       rpcstr_pull_unistr2_fstring(netname, &info1->info_1_str.uni_netname);
-       rpcstr_pull_unistr2_fstring(remark, &info1->info_1_str.uni_remark);
+static void collect_share(const char *name, uint32 m,
+                         const char *comment, void *state)
+{
+       struct share_list *share_list = (struct share_list *)state;
 
-       if (opt_long_list_entries) {
-               d_printf("%-12s %-8.8s %-50s\n",
-                        netname, share_type[info1->info_1.type], remark);
-       } else {
-               d_printf("%s\n", netname);
-       }
+       if (m != STYPE_DISKTREE)
+               return;
 
+       share_list->num_shares += 1;
+       share_list->shares = SMB_REALLOC_ARRAY(share_list->shares, char *, share_list->num_shares);
+       share_list->shares[share_list->num_shares-1] = SMB_STRDUP(name);
 }
 
+static void rpc_share_userlist_usage(void)
+{
+       return;
+}
+       
 /** 
- * List shares on a remote RPC server
+ * List shares on a remote RPC server, including the security descriptors
  *
  * All parameters are provided by the run_rpc_command function, except for
  * argc, argv which are passes through. 
@@ -1651,36 +4126,143 @@ static void display_share_info_1(SRV_SHARE_INFO_1 *info1)
  * @return Normal NTSTATUS return.
  **/
 
-static NTSTATUS 
-rpc_share_list_internals(const DOM_SID *domain_sid, const char *domain_name, 
-                        struct cli_state *cli,
-                        TALLOC_CTX *mem_ctx, int argc, const char **argv)
+static NTSTATUS rpc_share_allowedusers_internals(const DOM_SID *domain_sid,
+                                               const char *domain_name,
+                                               struct cli_state *cli,
+                                               struct rpc_pipe_client *pipe_hnd,
+                                               TALLOC_CTX *mem_ctx,
+                                               int argc,
+                                               const char **argv)
 {
-       SRV_SHARE_INFO_CTR ctr;
-       WERROR result;
+       int ret;
+       BOOL r;
        ENUM_HND hnd;
-       uint32 preferred_len = 0xffffffff, i;
+       uint32 i;
+       FILE *f;
+
+       struct user_token *tokens = NULL;
+       int num_tokens = 0;
+
+       struct share_list share_list;
+
+       if (argc > 1) {
+               rpc_share_userlist_usage();
+               return NT_STATUS_UNSUCCESSFUL;
+       }
+
+       if (argc == 0) {
+               f = stdin;
+       } else {
+               f = fopen(argv[0], "r");
+       }
+
+       if (f == NULL) {
+               DEBUG(0, ("Could not open userlist: %s\n", strerror(errno)));
+               return NT_STATUS_UNSUCCESSFUL;
+       }
+
+       r = get_user_tokens_from_file(f, &num_tokens, &tokens);
+
+       if (f != stdin)
+               fclose(f);
+
+       if (!r) {
+               DEBUG(0, ("Could not read users from file\n"));
+               return NT_STATUS_UNSUCCESSFUL;
+       }
+
+       for (i=0; i<num_tokens; i++)
+               collect_alias_memberships(&tokens[i].token);
 
        init_enum_hnd(&hnd, 0);
 
-       result = cli_srvsvc_net_share_enum(
-               cli, mem_ctx, 1, &ctr, preferred_len, &hnd);
+       share_list.num_shares = 0;
+       share_list.shares = NULL;
 
-       if (!W_ERROR_IS_OK(result))
+       ret = cli_RNetShareEnum(cli, collect_share, &share_list);
+
+       if (ret == -1) {
+               DEBUG(0, ("Error returning browse list: %s\n",
+                         cli_errstr(cli)));
                goto done;
+       }
 
-       /* Display results */
+       for (i = 0; i < share_list.num_shares; i++) {
+               char *netname = share_list.shares[i];
 
-       if (opt_long_list_entries) {
-               d_printf(
-       "\nEnumerating shared resources (exports) on remote server:\n\n"\
-       "\nShare name   Type     Description\n"\
-       "----------   ----     -----------\n");
+               if (netname[strlen(netname)-1] == '$')
+                       continue;
+
+               d_printf("%s\n", netname);
+
+               show_userlist(pipe_hnd, mem_ctx, netname,
+                             num_tokens, tokens);
        }
-       for (i = 0; i < ctr.num_entries; i++)
-               display_share_info_1(&ctr.share.info1[i]);
  done:
-       return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+       for (i=0; i<num_tokens; i++) {
+               free_user_token(&tokens[i].token);
+       }
+       SAFE_FREE(tokens);
+       SAFE_FREE(share_list.shares);
+
+       return NT_STATUS_OK;
+}
+
+static int rpc_share_allowedusers(int argc, const char **argv)
+{
+       int result;
+
+       result = run_rpc_command(NULL, PI_SAMR, 0,
+                                rpc_aliaslist_internals,
+                                argc, argv);
+       if (result != 0)
+               return result;
+
+       result = run_rpc_command(NULL, PI_LSARPC, 0,
+                                rpc_aliaslist_dump,
+                                argc, argv);
+       if (result != 0)
+               return result;
+
+       return run_rpc_command(NULL, PI_SRVSVC, 0,
+                              rpc_share_allowedusers_internals,
+                              argc, argv);
+}
+
+int net_usersidlist(int argc, const char **argv)
+{
+       int num_tokens = 0;
+       struct user_token *tokens = NULL;
+       int i;
+
+       if (argc != 0) {
+               net_usersidlist_usage(argc, argv);
+               return 0;
+       }
+
+       if (!get_user_tokens(&num_tokens, &tokens)) {
+               DEBUG(0, ("Could not get the user/sid list\n"));
+               return 0;
+       }
+
+       for (i=0; i<num_tokens; i++) {
+               dump_user_token(&tokens[i]);
+               free_user_token(&tokens[i].token);
+       }
+
+       SAFE_FREE(tokens);
+       return 1;
+}
+
+int net_usersidlist_usage(int argc, const char **argv)
+{
+       d_printf("net usersidlist\n"
+                "\tprints out a list of all users the running winbind knows\n"
+                "\tabout, together with all their SIDs. This is used as\n"
+                "\tinput to the 'net rpc share allowedusers' command.\n\n");
+
+       net_common_flags_usage(argc, argv);
+       return -1;
 }
 
 /** 
@@ -1695,6 +4277,9 @@ int net_rpc_share(int argc, const char **argv)
        struct functable func[] = {
                {"add", rpc_share_add},
                {"delete", rpc_share_delete},
+               {"allowedusers", rpc_share_allowedusers},
+               {"migrate", rpc_share_migrate},
+               {"list", rpc_share_list},
                {NULL, NULL}
        };
 
@@ -1728,13 +4313,16 @@ static int rpc_file_usage(int argc, const char **argv)
  *
  * @return Normal NTSTATUS return.
  **/
-static NTSTATUS 
-rpc_file_close_internals(const DOM_SID *domain_sid, const char *domain_name, 
-                        struct cli_state *cli,
-                        TALLOC_CTX *mem_ctx, int argc, const char **argv)
+static NTSTATUS rpc_file_close_internals(const DOM_SID *domain_sid,
+                                       const char *domain_name, 
+                                       struct cli_state *cli,
+                                       struct rpc_pipe_client *pipe_hnd,
+                                       TALLOC_CTX *mem_ctx,
+                                       int argc,
+                                       const char **argv)
 {
        WERROR result;
-       result = cli_srvsvc_net_file_close(cli, mem_ctx, atoi(argv[0]));
+       result = rpccli_srvsvc_net_file_close(pipe_hnd, mem_ctx, atoi(argv[0]));
        return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
 }
 
@@ -1793,10 +4381,13 @@ static void display_file_info_3(FILE_INFO_3 *info3, FILE_INFO_3_STR *str3)
  * @return Normal NTSTATUS return.
  **/
 
-static NTSTATUS 
-rpc_file_list_internals(const DOM_SID *domain_sid, const char *domain_name, 
-                       struct cli_state *cli,
-                       TALLOC_CTX *mem_ctx, int argc, const char **argv)
+static NTSTATUS rpc_file_list_internals(const DOM_SID *domain_sid,
+                                       const char *domain_name, 
+                                       struct cli_state *cli,
+                                       struct rpc_pipe_client *pipe_hnd,
+                                       TALLOC_CTX *mem_ctx,
+                                       int argc,
+                                       const char **argv)
 {
        SRV_FILE_INFO_CTR ctr;
        WERROR result;
@@ -1810,8 +4401,8 @@ rpc_file_list_internals(const DOM_SID *domain_sid, const char *domain_name,
        if (argc > 0)
                username = smb_xstrdup(argv[0]);
                
-       result = cli_srvsvc_net_file_enum(
-               cli, mem_ctx, 3, username, &ctr, preferred_len, &hnd);
+       result = rpccli_srvsvc_net_file_enum(pipe_hnd,
+                                       mem_ctx, 3, username, &ctr, preferred_len, &hnd);
 
        if (!W_ERROR_IS_OK(result))
                goto done;
@@ -1829,7 +4420,6 @@ rpc_file_list_internals(const DOM_SID *domain_sid, const char *domain_name,
        return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
 }
 
-
 /** 
  * List files for a user on a remote RPC server
  *
@@ -1839,6 +4429,7 @@ rpc_file_list_internals(const DOM_SID *domain_sid, const char *domain_name,
  *
  * @return A shell status integer (0 for success)
  **/
+
 static int rpc_file_user(int argc, const char **argv)
 {
        if (argc < 1) {
@@ -1851,7 +4442,6 @@ static int rpc_file_user(int argc, const char **argv)
                               argc, argv);
 }
 
-
 /** 
  * 'net rpc file' entrypoint.
  * @param argc  Standard main() style argc
@@ -1878,10 +4468,6 @@ int net_rpc_file(int argc, const char **argv)
        return net_run_function(argc, argv, func, rpc_file_usage);
 }
 
-/****************************************************************************/
-
-
-
 /** 
  * ABORT the shutdown of a remote RPC Server over, initshutdown pipe
  *
@@ -1899,24 +4485,26 @@ int net_rpc_file(int argc, const char **argv)
  **/
 
 static NTSTATUS rpc_shutdown_abort_internals(const DOM_SID *domain_sid, 
-                                            const char *domain_name, 
-                                            struct cli_state *cli, 
-                                            TALLOC_CTX *mem_ctx, 
-                                            int argc, const char **argv) 
+                                       const char *domain_name, 
+                                       struct cli_state *cli, 
+                                       struct rpc_pipe_client *pipe_hnd,
+                                       TALLOC_CTX *mem_ctx, 
+                                       int argc,
+                                       const char **argv) 
 {
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
        
-       result = cli_shutdown_abort(cli, mem_ctx);
+       result = rpccli_shutdown_abort(pipe_hnd, mem_ctx);
        
-       if (NT_STATUS_IS_OK(result))
+       if (NT_STATUS_IS_OK(result)) {
+               d_printf("\nShutdown successfully aborted\n");
                DEBUG(5,("cmd_shutdown_abort: query succeeded\n"));
-       else
+       else
                DEBUG(5,("cmd_shutdown_abort: query failed\n"));
        
        return result;
 }
 
-
 /** 
  * ABORT the shutdown of a remote RPC Server,  over winreg pipe
  *
@@ -1934,18 +4522,21 @@ static NTSTATUS rpc_shutdown_abort_internals(const DOM_SID *domain_sid,
  **/
 
 static NTSTATUS rpc_reg_shutdown_abort_internals(const DOM_SID *domain_sid, 
-                                                const char *domain_name, 
-                                                struct cli_state *cli, 
-                                                TALLOC_CTX *mem_ctx, 
-                                                int argc, const char **argv) 
+                                               const char *domain_name, 
+                                               struct cli_state *cli, 
+                                               struct rpc_pipe_client *pipe_hnd,
+                                               TALLOC_CTX *mem_ctx, 
+                                               int argc,
+                                               const char **argv) 
 {
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
        
-       result = cli_reg_abort_shutdown(cli, mem_ctx);
+       result = werror_to_ntstatus(rpccli_reg_abort_shutdown(pipe_hnd, mem_ctx));
        
-       if (NT_STATUS_IS_OK(result))
+       if (NT_STATUS_IS_OK(result)) {
+               d_printf("\nShutdown successfully aborted\n");
                DEBUG(5,("cmd_reg_abort_shutdown: query succeeded\n"));
-       else
+       else
                DEBUG(5,("cmd_reg_abort_shutdown: query failed\n"));
        
        return result;
@@ -1978,7 +4569,55 @@ static int rpc_shutdown_abort(int argc, const char **argv)
 }
 
 /** 
- * Shut down a remote RPC Server
+ * Shut down a remote RPC Server via initshutdown pipe
+ *
+ * All parameters are provided by the run_rpc_command function, except for
+ * argc, argv which are passes through. 
+ *
+ * @param domain_sid The domain sid aquired from the remote server
+ * @param cli A cli_state connected to the server.
+ * @param mem_ctx Talloc context, destoyed on compleation of the function.
+ * @param argc  Standard main() style argc
+ * @param argc  Standard main() style argv.  Initial components are already
+ *              stripped
+ *
+ * @return Normal NTSTATUS return.
+ **/
+
+static NTSTATUS rpc_init_shutdown_internals(const DOM_SID *domain_sid, 
+                                               const char *domain_name, 
+                                               struct cli_state *cli, 
+                                               struct rpc_pipe_client *pipe_hnd,
+                                               TALLOC_CTX *mem_ctx, 
+                                               int argc,
+                                               const char **argv) 
+{
+       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+        const char *msg = "This machine will be shutdown shortly";
+       uint32 timeout = 20;
+
+       if (opt_comment) {
+               msg = opt_comment;
+       }
+       if (opt_timeout) {
+               timeout = opt_timeout;
+       }
+
+       /* create an entry */
+       result = rpccli_shutdown_init(pipe_hnd, mem_ctx, msg, timeout, opt_reboot, 
+                                  opt_force);
+
+       if (NT_STATUS_IS_OK(result)) {
+               d_printf("\nShutdown of remote machine succeeded\n");
+               DEBUG(5,("Shutdown of remote machine succeeded\n"));
+       } else
+               DEBUG(0,("Shutdown of remote machine failed!\n"));
+
+       return result;
+}
+
+/** 
+ * Shut down a remote RPC Server via winreg pipe
  *
  * All parameters are provided by the run_rpc_command function, except for
  * argc, argv which are passes through. 
@@ -1993,10 +4632,13 @@ static int rpc_shutdown_abort(int argc, const char **argv)
  * @return Normal NTSTATUS return.
  **/
 
-static NTSTATUS rpc_shutdown_internals(const DOM_SID *domain_sid, 
-                                      const char *domain_name, 
-                                      struct cli_state *cli, TALLOC_CTX *mem_ctx, 
-                                      int argc, const char **argv) 
+static NTSTATUS rpc_reg_shutdown_internals(const DOM_SID *domain_sid, 
+                                               const char *domain_name, 
+                                               struct cli_state *cli, 
+                                               struct rpc_pipe_client *pipe_hnd,
+                                               TALLOC_CTX *mem_ctx, 
+                                               int argc,
+                                               const char **argv) 
 {
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
         const char *msg = "This machine will be shutdown shortly";
@@ -2034,10 +4676,12 @@ static NTSTATUS rpc_shutdown_internals(const DOM_SID *domain_sid,
        }
 
        /* create an entry */
-       result = cli_reg_shutdown(cli, mem_ctx, msg, timeout, opt_reboot, opt_force);
+       result = werror_to_ntstatus(rpccli_reg_shutdown(pipe_hnd, mem_ctx, msg, timeout, opt_reboot, opt_force));
 
-       if (NT_STATUS_IS_OK(result))
+       if (NT_STATUS_IS_OK(result)) {
+               d_printf("\nShutdown of remote machine succeeded\n");
                DEBUG(5,("Shutdown of remote machine succeeded\n"));
+       }
        else
                DEBUG(0,("Shutdown of remote machine failed!\n"));
 
@@ -2051,22 +4695,166 @@ static NTSTATUS rpc_shutdown_internals(const DOM_SID *domain_sid,
  * @param argc  Standard main() style argv.  Initial components are already
  *              stripped
  *
- * @return A shell status integer (0 for success)
+ * @return A shell status integer (0 for success)
+ **/
+
+static int rpc_shutdown(int argc, const char **argv) 
+{
+       int rc = run_rpc_command(NULL, PI_SHUTDOWN, 0, 
+                                rpc_init_shutdown_internals,
+                                argc, argv);
+       if (rc == 0)
+               return rc;
+
+       DEBUG(1, ("initshutdown pipe didn't work, trying winreg pipe\n"));
+
+       return run_rpc_command(NULL, PI_WINREG, 0, rpc_reg_shutdown_internals,
+                                      argc, argv);
+}
+
+/***************************************************************************
+  NT Domain trusts code (i.e. 'net rpc trustdom' functionality)
+  
+ ***************************************************************************/
+
+/**
+ * Add interdomain trust account to the RPC server.
+ * All parameters (except for argc and argv) are passed by run_rpc_command
+ * function.
+ *
+ * @param domain_sid The domain sid acquired from the server
+ * @param cli A cli_state connected to the server.
+ * @param mem_ctx Talloc context, destoyed on completion of the function.
+ * @param argc  Standard main() style argc
+ * @param argc  Standard main() style argv.  Initial components are already
+ *              stripped
+ *
+ * @return normal NTSTATUS return code
+ */
+
+static NTSTATUS rpc_trustdom_add_internals(const DOM_SID *domain_sid, 
+                                               const char *domain_name, 
+                                               struct cli_state *cli,
+                                               struct rpc_pipe_client *pipe_hnd,
+                                               TALLOC_CTX *mem_ctx, 
+                                               int argc,
+                                               const char **argv)
+{
+       POLICY_HND connect_pol, domain_pol, user_pol;
+       NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
+       char *acct_name;
+       uint16 acb_info;
+       uint32 unknown, user_rid;
+
+       if (argc != 2) {
+               d_printf("Usage: net rpc trustdom add <domain_name> <pw>\n");
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       /* 
+        * Make valid trusting domain account (ie. uppercased and with '$' appended)
+        */
+        
+       if (asprintf(&acct_name, "%s$", argv[0]) < 0) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       strupper_m(acct_name);
+
+       /* Get samr policy handle */
+       result = rpccli_samr_connect(pipe_hnd, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
+                                 &connect_pol);
+       if (!NT_STATUS_IS_OK(result)) {
+               goto done;
+       }
+       
+       /* Get domain policy handle */
+       result = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &connect_pol,
+                                     MAXIMUM_ALLOWED_ACCESS,
+                                     domain_sid, &domain_pol);
+       if (!NT_STATUS_IS_OK(result)) {
+               goto done;
+       }
+
+       /* Create trusting domain's account */
+       acb_info = ACB_NORMAL; 
+       unknown = 0xe00500b0; /* No idea what this is - a permission mask?
+                                mimir: yes, most probably it is */
+
+       result = rpccli_samr_create_dom_user(pipe_hnd, mem_ctx, &domain_pol,
+                                         acct_name, acb_info, unknown,
+                                         &user_pol, &user_rid);
+       if (!NT_STATUS_IS_OK(result)) {
+               goto done;
+       }
+
+       {
+               SAM_USERINFO_CTR ctr;
+               SAM_USER_INFO_23 p23;
+               NTTIME notime;
+               char nostr[] = "";
+               LOGON_HRS hrs;
+               uchar pwbuf[516];
+
+               encode_pw_buffer((char *)pwbuf, argv[1], STR_UNICODE);
+
+               ZERO_STRUCT(ctr);
+               ZERO_STRUCT(p23);
+               ZERO_STRUCT(notime);
+               hrs.max_len = 1260;
+               hrs.offset = 0;
+               hrs.len = 21;
+               memset(hrs.hours, 0xFF, sizeof(hrs.hours));
+               acb_info = ACB_DOMTRUST;
+
+               init_sam_user_info23A(&p23, &notime, &notime, &notime,
+                                     &notime, &notime, &notime,
+                                     nostr, nostr, nostr, nostr, nostr,
+                                     nostr, nostr, nostr, nostr, nostr,
+                                     0, 0, acb_info, ACCT_FLAGS, 168, &hrs, 
+                                     0, 0, (char *)pwbuf);
+               ctr.switch_value = 23;
+               ctr.info.id23 = &p23;
+               p23.passmustchange = 0;
+
+               result = rpccli_samr_set_userinfo(pipe_hnd, mem_ctx, &user_pol, 23,
+                                              &cli->user_session_key, &ctr);
+
+               if (!NT_STATUS_IS_OK(result)) {
+                       DEBUG(0,("Could not set trust account password: %s\n",
+                                nt_errstr(result)));
+                       goto done;
+               }
+       }
+
+ done:
+       SAFE_FREE(acct_name);
+       return result;
+}
+
+/**
+ * Create interdomain trust account for a remote domain.
+ *
+ * @param argc standard argc
+ * @param argv standard argv without initial components
+ *
+ * @return Integer status (0 means success)
  **/
 
-static int rpc_shutdown(int argc, const char **argv) 
+static int rpc_trustdom_add(int argc, const char **argv)
 {
-       return run_rpc_command(NULL, PI_WINREG, 0, rpc_shutdown_internals,
-                                      argc, argv);
+       if (argc > 0) {
+               return run_rpc_command(NULL, PI_SAMR, 0, rpc_trustdom_add_internals,
+                                      argc, argv);
+       } else {
+               d_printf("Usage: net rpc trustdom add <domain>\n");
+               return -1;
+       }
 }
 
-/***************************************************************************
-  NT Domain trusts code (i.e. 'net rpc trustdom' functionality)
-  
- ***************************************************************************/
 
 /**
- * Add interdomain trust account to the RPC server.
+ * Remove interdomain trust account from the RPC server.
  * All parameters (except for argc and argv) are passed by run_rpc_command
  * function.
  *
@@ -2080,91 +4868,107 @@ static int rpc_shutdown(int argc, const char **argv)
  * @return normal NTSTATUS return code
  */
 
-static NTSTATUS rpc_trustdom_add_internals(const DOM_SID *domain_sid, 
-                                          const char *domain_name, 
-                                          struct cli_state *cli, TALLOC_CTX *mem_ctx, 
-                                           int argc, const char **argv) {
-
+static NTSTATUS rpc_trustdom_del_internals(const DOM_SID *domain_sid, 
+                                       const char *domain_name, 
+                                       struct cli_state *cli,
+                                       struct rpc_pipe_client *pipe_hnd,
+                                       TALLOC_CTX *mem_ctx, 
+                                       int argc,
+                                       const char **argv)
+{
        POLICY_HND connect_pol, domain_pol, user_pol;
        NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
        char *acct_name;
-       uint16 acb_info;
-       uint32 unknown, user_rid;
+       const char **names;
+       DOM_SID trust_acct_sid;
+       uint32 *user_rids, num_rids, *name_types;
+       uint32 flags = 0x000003e8; /* Unknown */
 
-       if (argc != 2) {
-               d_printf("Usage: net rpc trustdom add <domain_name> <pw>\n");
+       if (argc != 1) {
+               d_printf("Usage: net rpc trustdom del <domain_name>\n");
                return NT_STATUS_INVALID_PARAMETER;
        }
 
        /* 
         * Make valid trusting domain account (ie. uppercased and with '$' appended)
         */
-        
-       if (asprintf(&acct_name, "%s$", argv[0]) < 0) {
+       acct_name = talloc_asprintf(mem_ctx, "%s$", argv[0]);
+
+       if (acct_name == NULL)
                return NT_STATUS_NO_MEMORY;
-       }
 
        strupper_m(acct_name);
 
+       names = TALLOC_ARRAY(mem_ctx, const char *, 1);
+       names[0] = acct_name;
+
+
        /* Get samr policy handle */
-       result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS,
+       result = rpccli_samr_connect(pipe_hnd, 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,
+       result = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &connect_pol,
                                      MAXIMUM_ALLOWED_ACCESS,
                                      domain_sid, &domain_pol);
        if (!NT_STATUS_IS_OK(result)) {
                goto done;
        }
 
-       /* Create trusting domain's account */
-       acb_info = ACB_DOMTRUST;
-       unknown = 0xe00500b0; /* No idea what this is - a permission mask?
-                                mimir: yes, most probably it is */
+       result = rpccli_samr_lookup_names(pipe_hnd, mem_ctx, &domain_pol, flags, 1,
+                                      names, &num_rids,
+                                      &user_rids, &name_types);
+       
+       if (!NT_STATUS_IS_OK(result)) {
+               goto done;
+       }
+
+       result = rpccli_samr_open_user(pipe_hnd, mem_ctx, &domain_pol,
+                                   MAXIMUM_ALLOWED_ACCESS,
+                                   user_rids[0], &user_pol);
 
-       result = cli_samr_create_dom_user(cli, mem_ctx, &domain_pol,
-                                         acct_name, acb_info, unknown,
-                                         &user_pol, &user_rid);
        if (!NT_STATUS_IS_OK(result)) {
                goto done;
        }
 
-       {
-               SAM_USERINFO_CTR ctr;
-               SAM_USER_INFO_24 p24;
-               uchar pwbuf[516];
+       /* append the rid to the domain sid */
+       sid_copy(&trust_acct_sid, domain_sid);
+       if (!sid_append_rid(&trust_acct_sid, user_rids[0])) {
+               goto done;
+       }
 
-               encode_pw_buffer((char *)pwbuf, argv[1], STR_UNICODE);
+       /* remove the sid */
 
-               ZERO_STRUCT(ctr);
-               ZERO_STRUCT(p24);
+       result = rpccli_samr_remove_sid_foreign_domain(pipe_hnd, mem_ctx, &user_pol,
+                                                   &trust_acct_sid);
 
-               init_sam_user_info24(&p24, (char *)pwbuf, 24);
+       if (!NT_STATUS_IS_OK(result)) {
+               goto done;
+       }
 
-               ctr.switch_value = 24;
-               ctr.info.id24 = &p24;
+       /* Delete user */
 
-               result = cli_samr_set_userinfo(cli, mem_ctx, &user_pol, 24,
-                                              &cli->user_session_key, &ctr);
+       result = rpccli_samr_delete_dom_user(pipe_hnd, mem_ctx, &user_pol);
 
-               if (!NT_STATUS_IS_OK(result)) {
-                       DEBUG(0,("Could not set trust account password: %s\n",
-                                nt_errstr(result)));
-                       goto done;
-               }
+       if (!NT_STATUS_IS_OK(result)) {
+               goto done;
+       }
+
+       if (!NT_STATUS_IS_OK(result)) {
+         DEBUG(0,("Could not set trust account password: %s\n",
+                  nt_errstr(result)));
+         goto done;
        }
 
  done:
-       SAFE_FREE(acct_name);
        return result;
 }
 
 /**
- * Create interdomain trust account for a remote domain.
+ * Delete interdomain trust account for a remote domain.
  *
  * @param argc standard argc
  * @param argv standard argv without initial components
@@ -2172,35 +4976,18 @@ static NTSTATUS rpc_trustdom_add_internals(const DOM_SID *domain_sid,
  * @return Integer status (0 means success)
  **/
 
-static int rpc_trustdom_add(int argc, const char **argv)
+static int rpc_trustdom_del(int argc, const char **argv)
 {
        if (argc > 0) {
-               return run_rpc_command(NULL, PI_SAMR, 0, rpc_trustdom_add_internals,
+               return run_rpc_command(NULL, PI_SAMR, 0, rpc_trustdom_del_internals,
                                       argc, argv);
        } else {
-               d_printf("Usage: net rpc trustdom add <domain>\n");
+               d_printf("Usage: net rpc trustdom del <domain>\n");
                return -1;
        }
 }
-
-
-/**
- * Delete interdomain trust account for a remote domain.
- *
- * @param argc standard argc
- * @param argv standard argv without initial components
- *
- * @return Integer status (0 means success)
- **/
  
-static int rpc_trustdom_del(int argc, const char **argv)
-{
-       d_printf("Sorry, not yet implemented.\n");
-       d_printf("Use 'smbpasswd -x -i' instead.\n");
-       return -1;
-}
 
 /**
  * Establish trust relationship to a trusting domain.
  * Interdomain account must already be created on remote PDC.
@@ -2213,13 +5000,14 @@ static int rpc_trustdom_del(int argc, const char **argv)
 
 static int rpc_trustdom_establish(int argc, const char **argv)
 {
-       struct cli_state *cli;
+       struct cli_state *cli = NULL;
        struct in_addr server_ip;
+       struct rpc_pipe_client *pipe_hnd = NULL;
        POLICY_HND connect_hnd;
        TALLOC_CTX *mem_ctx;
        NTSTATUS nt_status;
        DOM_SID *domain_sid;
-       WKS_INFO_100 wks_info;
+       smb_ucs2_t *uni_domain_name;
        
        char* domain_name;
        char* domain_name_pol;
@@ -2288,71 +5076,51 @@ static int rpc_trustdom_establish(int argc, const char **argv)
                         for domain %s\n", domain_name));
        }
         
-       /*
-        * Call WksQueryInfo to check remote server's capabilities
-        * note: It is now used only to get unicode domain name
-        */
-       
-       if (!cli_nt_session_open(cli, PI_WKSSVC)) {
-               DEBUG(0, ("Couldn't not initialise wkssvc pipe\n"));
-               return -1;
-       }
-
-       if (!(mem_ctx = talloc_init("establishing trust relationship to domain %s",
-                       domain_name))) {
+       if (!(mem_ctx = talloc_init("establishing trust relationship to "
+                                   "domain %s", domain_name))) {
                DEBUG(0, ("talloc_init() failed\n"));
                cli_shutdown(cli);
                return -1;
        }
-       
-       nt_status = cli_wks_query_info(cli, mem_ctx, &wks_info);
-       
-       if (NT_STATUS_IS_ERR(nt_status)) {
-               DEBUG(0, ("WksQueryInfo call failed.\n"));
-               return -1;
-       }
-
-       if (cli->nt_pipe_fnum)
-               cli_nt_session_close(cli);
-
 
        /*
         * Call LsaOpenPolicy and LsaQueryInfo
         */
         
-       if (!(mem_ctx = talloc_init("rpc_trustdom_establish"))) {
-               DEBUG(0, ("talloc_init() failed\n"));
-               cli_shutdown(cli);
-               return -1;
-       }
-
-       if (!cli_nt_session_open(cli, PI_LSARPC)) {
-               DEBUG(0, ("Could not initialise lsa pipe\n"));
+       pipe_hnd = cli_rpc_pipe_open_noauth(cli, PI_LSARPC, &nt_status);
+       if (!pipe_hnd) {
+               DEBUG(0, ("Could not initialise lsa pipe. Error was %s\n", nt_errstr(nt_status) ));
                cli_shutdown(cli);
                return -1;
        }
 
-       nt_status = cli_lsa_open_policy2(cli, mem_ctx, True, SEC_RIGHTS_QUERY_VALUE,
+       nt_status = rpccli_lsa_open_policy2(pipe_hnd, mem_ctx, True, SEC_RIGHTS_QUERY_VALUE,
                                         &connect_hnd);
        if (NT_STATUS_IS_ERR(nt_status)) {
                DEBUG(0, ("Couldn't open policy handle. Error was %s\n",
                        nt_errstr(nt_status)));
+               cli_shutdown(cli);
                return -1;
        }
 
        /* Querying info level 5 */
        
-       nt_status = cli_lsa_query_info_policy(cli, mem_ctx, &connect_hnd,
-                                             5 /* info level */, &domain_name_pol,
-                                             &domain_sid);
+       nt_status = rpccli_lsa_query_info_policy(pipe_hnd, mem_ctx, &connect_hnd,
+                                             5 /* info level */,
+                                             &domain_name_pol, &domain_sid);
        if (NT_STATUS_IS_ERR(nt_status)) {
                DEBUG(0, ("LSA Query Info failed. Returned error was %s\n",
                        nt_errstr(nt_status)));
+               cli_shutdown(cli);
                return -1;
        }
 
-
-
+       if (push_ucs2_talloc(mem_ctx, &uni_domain_name, domain_name_pol) == (size_t)-1) {
+               DEBUG(0, ("Could not convert domain name %s to unicode\n",
+                         domain_name_pol));
+               cli_shutdown(cli);
+               return -1;
+       }
 
        /* There should be actually query info level 3 (following nt serv behaviour),
           but I still don't know if it's _really_ necessary */
@@ -2361,10 +5129,13 @@ static int rpc_trustdom_establish(int argc, const char **argv)
         * Store the password in secrets db
         */
 
-       if (!secrets_store_trusted_domain_password(domain_name, wks_info.uni_lan_grp.buffer,
-                                                  wks_info.uni_lan_grp.uni_str_len, opt_password,
+       if (!secrets_store_trusted_domain_password(domain_name,
+                                                  uni_domain_name,
+                                                  strlen_w(uni_domain_name)+1,
+                                                  opt_password,
                                                   *domain_sid)) {
                DEBUG(0, ("Storing password for trusted domain failed.\n"));
+               cli_shutdown(cli);
                return -1;
        }
        
@@ -2372,19 +5143,19 @@ static int rpc_trustdom_establish(int argc, const char **argv)
         * Close the pipes and clean up
         */
         
-       nt_status = cli_lsa_close(cli, mem_ctx, &connect_hnd);
+       nt_status = rpccli_lsa_close(pipe_hnd, mem_ctx, &connect_hnd);
        if (NT_STATUS_IS_ERR(nt_status)) {
                DEBUG(0, ("Couldn't close LSA pipe. Error was %s\n",
                        nt_errstr(nt_status)));
+               cli_shutdown(cli);
                return -1;
        }
 
-       if (cli->nt_pipe_fnum)
-               cli_nt_session_close(cli);
+       cli_shutdown(cli);
         
        talloc_destroy(mem_ctx);
         
-       DEBUG(0, ("Success!\n"));
+       d_printf("Trust to domain %s established\n", domain_name);
        return 0;
 }
 
@@ -2433,31 +5204,240 @@ static int rpc_trustdom_usage(int argc, const char **argv)
        d_printf("  net rpc trustdom establish \t establish relationship to trusted domain\n");
        d_printf("  net rpc trustdom revoke \t abandon relationship to trusted domain\n");
        d_printf("  net rpc trustdom list \t show current interdomain trust relationships\n");
+       d_printf("  net rpc trustdom vampire \t vampire interdomain trust relationships from remote server\n");
        return -1;
 }
 
 
-static NTSTATUS rpc_query_domain_sid(const DOM_SID *domain_sid, 
-                                    const char *domain_name, 
-                                    struct cli_state *cli, TALLOC_CTX *mem_ctx,
-                                    int argc, const char **argv)
-{
-       fstring str_sid;
-       sid_to_string(str_sid, domain_sid);
-       d_printf("%s\n", str_sid);
-       return NT_STATUS_OK;
+static NTSTATUS rpc_query_domain_sid(const DOM_SID *domain_sid, 
+                                       const char *domain_name, 
+                                       struct cli_state *cli,
+                                       struct rpc_pipe_client *pipe_hnd,
+                                       TALLOC_CTX *mem_ctx,
+                                       int argc,
+                                       const char **argv)
+{
+       fstring str_sid;
+       sid_to_string(str_sid, domain_sid);
+       d_printf("%s\n", str_sid);
+       return NT_STATUS_OK;
+}
+
+static void print_trusted_domain(DOM_SID *dom_sid, const char *trusted_dom_name)
+{
+       fstring ascii_sid, padding;
+       int pad_len, col_len = 20;
+
+       /* convert sid into ascii string */
+       sid_to_string(ascii_sid, dom_sid);
+
+       /* calculate padding space for d_printf to look nicer */
+       pad_len = col_len - strlen(trusted_dom_name);
+       padding[pad_len] = 0;
+       do padding[--pad_len] = ' '; while (pad_len);
+                       
+       d_printf("%s%s%s\n", trusted_dom_name, padding, ascii_sid);
+}
+
+static NTSTATUS vampire_trusted_domain(struct rpc_pipe_client *pipe_hnd,
+                                     TALLOC_CTX *mem_ctx, 
+                                     POLICY_HND *pol, 
+                                     DOM_SID dom_sid, 
+                                     const char *trusted_dom_name)
+{
+       NTSTATUS nt_status;
+       LSA_TRUSTED_DOMAIN_INFO *info;
+       char *cleartextpwd = NULL;
+       DATA_BLOB data;
+       smb_ucs2_t *uni_dom_name;
+
+       nt_status = rpccli_lsa_query_trusted_domain_info_by_sid(pipe_hnd, mem_ctx, pol, 4, &dom_sid, &info);
+       
+       if (NT_STATUS_IS_ERR(nt_status)) {
+               DEBUG(0,("Could not query trusted domain info. Error was %s\n",
+               nt_errstr(nt_status)));
+               goto done;
+       }
+
+       data = data_blob(NULL, info->password.password.length);
+
+       memcpy(data.data, info->password.password.data, info->password.password.length);
+       data.length     = info->password.password.length;
+                               
+       cleartextpwd = decrypt_trustdom_secret(pipe_hnd->cli->pwd.password, &data);
+
+       if (cleartextpwd == NULL) {
+               DEBUG(0,("retrieved NULL password\n"));
+               nt_status = NT_STATUS_UNSUCCESSFUL;
+               goto done;
+       }
+       
+       if (push_ucs2_talloc(mem_ctx, &uni_dom_name, trusted_dom_name) == (size_t)-1) {
+               DEBUG(0, ("Could not convert domain name %s to unicode\n",
+                         trusted_dom_name));
+               nt_status = NT_STATUS_UNSUCCESSFUL;
+               goto done;
+       }
+
+       if (!secrets_store_trusted_domain_password(trusted_dom_name,
+                                                  uni_dom_name,
+                                                  strlen_w(uni_dom_name)+1,
+                                                  cleartextpwd,
+                                                  dom_sid)) {
+               DEBUG(0, ("Storing password for trusted domain failed.\n"));
+               nt_status = NT_STATUS_UNSUCCESSFUL;
+               goto done;
+       }
+
+       DEBUG(100,("sucessfully vampired trusted domain [%s], sid: [%s], password: [%s]\n",  
+               trusted_dom_name, sid_string_static(&dom_sid), cleartextpwd));
+
+done:
+       SAFE_FREE(cleartextpwd);
+       data_blob_free(&data);
+
+       return nt_status;
+}
+
+static int rpc_trustdom_vampire(int argc, const char **argv)
+{
+       /* common variables */
+       TALLOC_CTX* mem_ctx;
+       struct cli_state *cli = NULL;
+       struct rpc_pipe_client *pipe_hnd = NULL;
+       NTSTATUS nt_status;
+       const char *domain_name = NULL;
+       DOM_SID *queried_dom_sid;
+       POLICY_HND connect_hnd;
+
+       /* trusted domains listing variables */
+       unsigned int num_domains, enum_ctx = 0;
+       int i;
+       DOM_SID *domain_sids;
+       char **trusted_dom_names;
+       fstring pdc_name;
+       char *dummy;
+
+       /*
+        * Listing trusted domains (stored in secrets.tdb, if local)
+        */
+
+       mem_ctx = talloc_init("trust relationships vampire");
+
+       /*
+        * set domain and pdc name to local samba server (default)
+        * or to remote one given in command line
+        */
+
+       if (StrCaseCmp(opt_workgroup, lp_workgroup())) {
+               domain_name = opt_workgroup;
+               opt_target_workgroup = opt_workgroup;
+       } else {
+               fstrcpy(pdc_name, global_myname());
+               domain_name = talloc_strdup(mem_ctx, lp_workgroup());
+               opt_target_workgroup = domain_name;
+       };
+
+       /* open \PIPE\lsarpc and open policy handle */
+       if (!(cli = net_make_ipc_connection(NET_FLAGS_PDC))) {
+               DEBUG(0, ("Couldn't connect to domain controller\n"));
+               return -1;
+       };
+
+       pipe_hnd = cli_rpc_pipe_open_noauth(cli, PI_LSARPC, &nt_status);
+       if (!pipe_hnd) {
+               DEBUG(0, ("Could not initialise lsa pipe. Error was %s\n",
+                       nt_errstr(nt_status) ));
+               cli_shutdown(cli);
+               return -1;
+       };
+
+       nt_status = rpccli_lsa_open_policy2(pipe_hnd, mem_ctx, False, SEC_RIGHTS_QUERY_VALUE,
+                                       &connect_hnd);
+       if (NT_STATUS_IS_ERR(nt_status)) {
+               DEBUG(0, ("Couldn't open policy handle. Error was %s\n",
+                       nt_errstr(nt_status)));
+               cli_shutdown(cli);
+               return -1;
+       };
+
+       /* query info level 5 to obtain sid of a domain being queried */
+       nt_status = rpccli_lsa_query_info_policy(
+               pipe_hnd, mem_ctx, &connect_hnd, 5 /* info level */, 
+               &dummy, &queried_dom_sid);
+
+       if (NT_STATUS_IS_ERR(nt_status)) {
+               DEBUG(0, ("LSA Query Info failed. Returned error was %s\n",
+                       nt_errstr(nt_status)));
+               cli_shutdown(cli);
+               return -1;
+       }
+
+       /*
+        * Keep calling LsaEnumTrustdom over opened pipe until
+        * the end of enumeration is reached
+        */
+
+       d_printf("Vampire trusted domains:\n\n");
+
+       do {
+               nt_status = rpccli_lsa_enum_trust_dom(pipe_hnd, mem_ctx, &connect_hnd, &enum_ctx,
+                                                  &num_domains,
+                                                  &trusted_dom_names, &domain_sids);
+               
+               if (NT_STATUS_IS_ERR(nt_status)) {
+                       DEBUG(0, ("Couldn't enumerate trusted domains. Error was %s\n",
+                               nt_errstr(nt_status)));
+                       cli_shutdown(cli);
+                       return -1;
+               };
+               
+               for (i = 0; i < num_domains; i++) {
+
+                       print_trusted_domain(&(domain_sids[i]), trusted_dom_names[i]);
+
+                       nt_status = vampire_trusted_domain(pipe_hnd, mem_ctx, &connect_hnd, 
+                                                          domain_sids[i], trusted_dom_names[i]);
+                       if (!NT_STATUS_IS_OK(nt_status)) {
+                               cli_shutdown(cli);
+                               return -1;
+                       }
+               };
+
+               /*
+                * in case of no trusted domains say something rather
+                * than just display blank line
+                */
+               if (!num_domains) d_printf("none\n");
+
+       } while (NT_STATUS_EQUAL(nt_status, STATUS_MORE_ENTRIES));
+
+       /* close this connection before doing next one */
+       nt_status = rpccli_lsa_close(pipe_hnd, mem_ctx, &connect_hnd);
+       if (NT_STATUS_IS_ERR(nt_status)) {
+               DEBUG(0, ("Couldn't properly close lsa policy handle. Error was %s\n",
+                       nt_errstr(nt_status)));
+               cli_shutdown(cli);
+               return -1;
+       };
+
+       /* close lsarpc pipe and connection to IPC$ */
+       cli_shutdown(cli);
+
+       talloc_destroy(mem_ctx);         
+       return 0;
 }
 
-
 static int rpc_trustdom_list(int argc, const char **argv)
 {
        /* common variables */
        TALLOC_CTX* mem_ctx;
-       struct cli_state *cli, *remote_cli;
+       struct cli_state *cli = NULL, *remote_cli = NULL;
+       struct rpc_pipe_client *pipe_hnd = NULL;
        NTSTATUS nt_status;
        const char *domain_name = NULL;
        DOM_SID *queried_dom_sid;
-       fstring ascii_sid, padding;
+       fstring padding;
        int ascii_dom_name_len;
        POLICY_HND connect_hnd;
        
@@ -2500,12 +5480,14 @@ static int rpc_trustdom_list(int argc, const char **argv)
                return -1;
        };
 
-       if (!cli_nt_session_open(cli, PI_LSARPC)) {
-               DEBUG(0, ("Could not initialise lsa pipe\n"));
+       pipe_hnd = cli_rpc_pipe_open_noauth(cli, PI_LSARPC, &nt_status);
+       if (!pipe_hnd) {
+               DEBUG(0, ("Could not initialise lsa pipe. Error was %s\n",
+                       nt_errstr(nt_status) ));
                return -1;
        };
 
-       nt_status = cli_lsa_open_policy2(cli, mem_ctx, False, SEC_RIGHTS_QUERY_VALUE,
+       nt_status = rpccli_lsa_open_policy2(pipe_hnd, mem_ctx, False, SEC_RIGHTS_QUERY_VALUE,
                                        &connect_hnd);
        if (NT_STATUS_IS_ERR(nt_status)) {
                DEBUG(0, ("Couldn't open policy handle. Error was %s\n",
@@ -2514,8 +5496,8 @@ static int rpc_trustdom_list(int argc, const char **argv)
        };
        
        /* query info level 5 to obtain sid of a domain being queried */
-       nt_status = cli_lsa_query_info_policy(
-               cli, mem_ctx, &connect_hnd, 5 /* info level */, 
+       nt_status = rpccli_lsa_query_info_policy(
+               pipe_hnd, mem_ctx, &connect_hnd, 5 /* info level */, 
                &dummy, &queried_dom_sid);
 
        if (NT_STATUS_IS_ERR(nt_status)) {
@@ -2532,7 +5514,7 @@ static int rpc_trustdom_list(int argc, const char **argv)
        d_printf("Trusted domains list:\n\n");
 
        do {
-               nt_status = cli_lsa_enum_trust_dom(cli, mem_ctx, &connect_hnd, &enum_ctx,
+               nt_status = rpccli_lsa_enum_trust_dom(pipe_hnd, mem_ctx, &connect_hnd, &enum_ctx,
                                                   &num_domains,
                                                   &trusted_dom_names, &domain_sids);
                
@@ -2543,15 +5525,7 @@ static int rpc_trustdom_list(int argc, const char **argv)
                };
                
                for (i = 0; i < num_domains; i++) {
-                       /* convert sid into ascii string */
-                       sid_to_string(ascii_sid, &(domain_sids[i]));
-               
-                       /* calculate padding space for d_printf to look nicer */
-                       pad_len = col_len - strlen(trusted_dom_names[i]);
-                       padding[pad_len] = 0;
-                       do padding[--pad_len] = ' '; while (pad_len);
-                       
-                       d_printf("%s%s%s\n", trusted_dom_names[i], padding, ascii_sid);
+                       print_trusted_domain(&(domain_sids[i]), trusted_dom_names[i]);
                };
                
                /*
@@ -2563,14 +5537,14 @@ static int rpc_trustdom_list(int argc, const char **argv)
        } while (NT_STATUS_EQUAL(nt_status, STATUS_MORE_ENTRIES));
 
        /* close this connection before doing next one */
-       nt_status = cli_lsa_close(cli, mem_ctx, &connect_hnd);
+       nt_status = rpccli_lsa_close(pipe_hnd, mem_ctx, &connect_hnd);
        if (NT_STATUS_IS_ERR(nt_status)) {
                DEBUG(0, ("Couldn't properly close lsa policy handle. Error was %s\n",
                        nt_errstr(nt_status)));
                return -1;
        };
        
-       cli_nt_session_close(cli);
+       cli_rpc_pipe_close(pipe_hnd);
 
        /*
         * Listing trusting domains (stored in passdb backend, if local)
@@ -2581,13 +5555,14 @@ static int rpc_trustdom_list(int argc, const char **argv)
        /*
         * Open \PIPE\samr and get needed policy handles
         */
-       if (!cli_nt_session_open(cli, PI_SAMR)) {
-               DEBUG(0, ("Could not initialise samr pipe\n"));
+       pipe_hnd = cli_rpc_pipe_open_noauth(cli, PI_SAMR, &nt_status);
+       if (!pipe_hnd) {
+               DEBUG(0, ("Could not initialise samr pipe. Error was %s\n", nt_errstr(nt_status)));
                return -1;
        };
        
        /* SamrConnect */
-       nt_status = cli_samr_connect(cli, mem_ctx, SA_RIGHT_SAM_OPEN_DOMAIN,
+       nt_status = rpccli_samr_connect(pipe_hnd, mem_ctx, SA_RIGHT_SAM_OPEN_DOMAIN,
                                                                 &connect_hnd);
        if (!NT_STATUS_IS_OK(nt_status)) {
                DEBUG(0, ("Couldn't open SAMR policy handle. Error was %s\n",
@@ -2597,7 +5572,7 @@ static int rpc_trustdom_list(int argc, const char **argv)
        
        /* SamrOpenDomain - we have to open domain policy handle in order to be
           able to enumerate accounts*/
-       nt_status = cli_samr_open_domain(cli, mem_ctx, &connect_hnd,
+       nt_status = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &connect_hnd,
                                         SA_RIGHT_DOMAIN_ENUM_ACCOUNTS,
                                         queried_dom_sid, &domain_hnd);                                                                  
        if (!NT_STATUS_IS_OK(nt_status)) {
@@ -2613,7 +5588,7 @@ static int rpc_trustdom_list(int argc, const char **argv)
        enum_ctx = 0;   /* reset enumeration context from last enumeration */
        do {
                        
-               nt_status = cli_samr_enum_dom_users(cli, mem_ctx, &domain_hnd,
+               nt_status = rpccli_samr_enum_dom_users(pipe_hnd, mem_ctx, &domain_hnd,
                                                    &enum_ctx, ACB_DOMTRUST, 0xffff,
                                                    &trusting_dom_names, &trusting_dom_rids,
                                                    &num_domains);
@@ -2667,18 +5642,17 @@ static int rpc_trustdom_list(int argc, const char **argv)
        } while (NT_STATUS_EQUAL(nt_status, STATUS_MORE_ENTRIES));
 
        /* close opened samr and domain policy handles */
-       nt_status = cli_samr_close(cli, mem_ctx, &domain_hnd);
+       nt_status = rpccli_samr_close(pipe_hnd, mem_ctx, &domain_hnd);
        if (!NT_STATUS_IS_OK(nt_status)) {
                DEBUG(0, ("Couldn't properly close domain policy handle for domain %s\n", domain_name));
        };
        
-       nt_status = cli_samr_close(cli, mem_ctx, &connect_hnd);
+       nt_status = rpccli_samr_close(pipe_hnd, mem_ctx, &connect_hnd);
        if (!NT_STATUS_IS_OK(nt_status)) {
                DEBUG(0, ("Couldn't properly close samr policy handle for domain %s\n", domain_name));
        };
        
        /* close samr pipe and connection to IPC$ */
-       cli_nt_session_close(cli);
        cli_shutdown(cli);
 
        talloc_destroy(mem_ctx);         
@@ -2703,6 +5677,7 @@ static int rpc_trustdom(int argc, const char **argv)
                {"revoke", rpc_trustdom_revoke},
                {"help", rpc_trustdom_usage},
                {"list", rpc_trustdom_list},
+               {"vampire", rpc_trustdom_vampire},
                {NULL, NULL}
        };
 
@@ -2753,7 +5728,7 @@ BOOL net_rpc_check(unsigned flags)
 
 /* dump sam database via samsync rpc calls */
 static int rpc_samdump(int argc, const char **argv) {
-       return run_rpc_command(NULL, PI_NETLOGON, NET_FLAGS_ANONYMOUS, rpc_samdump_internals,
+               return run_rpc_command(NULL, PI_NETLOGON, NET_FLAGS_ANONYMOUS, rpc_samdump_internals,
                               argc, argv);
 }
 
@@ -2762,6 +5737,353 @@ static int rpc_vampire(int argc, const char **argv) {
        return run_rpc_command(NULL, PI_NETLOGON, NET_FLAGS_ANONYMOUS, rpc_vampire_internals,
                               argc, argv);
 }
+
+/** 
+ * Migrate everything from a print-server
+ *
+ * @param argc  Standard main() style argc
+ * @param argv  Standard main() style argv.  Initial components are already
+ *              stripped
+ *
+ * @return A shell status integer (0 for success)
+ *
+ * The order is important !
+ * To successfully add drivers the print-queues have to exist !
+ * Applying ACLs should be the last step, because you're easily locked out
+ *
+ **/
+static int rpc_printer_migrate_all(int argc, const char **argv)
+{
+       int ret;
+
+       if (!opt_host) {
+               printf("no server to migrate\n");
+               return -1;
+       }
+
+       ret = run_rpc_command(NULL, PI_SPOOLSS, 0, rpc_printer_migrate_printers_internals, argc, argv);
+       if (ret)
+               return ret;
+
+       ret = run_rpc_command(NULL, PI_SPOOLSS, 0, rpc_printer_migrate_drivers_internals, argc, argv);
+       if (ret)
+               return ret;
+
+       ret = run_rpc_command(NULL, PI_SPOOLSS, 0, rpc_printer_migrate_forms_internals, argc, argv);
+       if (ret)
+               return ret;
+
+       ret = run_rpc_command(NULL, PI_SPOOLSS, 0, rpc_printer_migrate_settings_internals, argc, argv);
+       if (ret)
+               return ret;
+
+       return run_rpc_command(NULL, PI_SPOOLSS, 0, rpc_printer_migrate_security_internals, argc, argv);
+
+}
+
+/** 
+ * Migrate print-drivers from a print-server
+ *
+ * @param argc  Standard main() style argc
+ * @param argv  Standard main() style argv.  Initial components are already
+ *              stripped
+ *
+ * @return A shell status integer (0 for success)
+ **/
+static int rpc_printer_migrate_drivers(int argc, const char **argv)
+{
+       if (!opt_host) {
+               printf("no server to migrate\n");
+               return -1;
+       }
+
+       return run_rpc_command(NULL, PI_SPOOLSS, 0, 
+                              rpc_printer_migrate_drivers_internals,
+                              argc, argv);
+}
+
+/** 
+ * Migrate print-forms from a print-server
+ *
+ * @param argc  Standard main() style argc
+ * @param argv  Standard main() style argv.  Initial components are already
+ *              stripped
+ *
+ * @return A shell status integer (0 for success)
+ **/
+static int rpc_printer_migrate_forms(int argc, const char **argv)
+{
+       if (!opt_host) {
+               printf("no server to migrate\n");
+               return -1;
+       }
+
+       return run_rpc_command(NULL, PI_SPOOLSS, 0, 
+                              rpc_printer_migrate_forms_internals,
+                              argc, argv);
+}
+
+/** 
+ * Migrate printers from a print-server
+ *
+ * @param argc  Standard main() style argc
+ * @param argv  Standard main() style argv.  Initial components are already
+ *              stripped
+ *
+ * @return A shell status integer (0 for success)
+ **/
+static int rpc_printer_migrate_printers(int argc, const char **argv)
+{
+       if (!opt_host) {
+               printf("no server to migrate\n");
+               return -1;
+       }
+
+       return run_rpc_command(NULL, PI_SPOOLSS, 0, 
+                              rpc_printer_migrate_printers_internals,
+                              argc, argv);
+}
+
+/** 
+ * Migrate printer-ACLs from a print-server
+ *
+ * @param argc  Standard main() style argc
+ * @param argv  Standard main() style argv.  Initial components are already
+ *              stripped
+ *
+ * @return A shell status integer (0 for success)
+ **/
+static int rpc_printer_migrate_security(int argc, const char **argv)
+{
+       if (!opt_host) {
+               printf("no server to migrate\n");
+               return -1;
+       }
+
+       return run_rpc_command(NULL, PI_SPOOLSS, 0, 
+                              rpc_printer_migrate_security_internals,
+                              argc, argv);
+}
+
+/** 
+ * Migrate printer-settings from a print-server
+ *
+ * @param argc  Standard main() style argc
+ * @param argv  Standard main() style argv.  Initial components are already
+ *              stripped
+ *
+ * @return A shell status integer (0 for success)
+ **/
+static int rpc_printer_migrate_settings(int argc, const char **argv)
+{
+       if (!opt_host) {
+               printf("no server to migrate\n");
+               return -1;
+       }
+
+       return run_rpc_command(NULL, PI_SPOOLSS, 0, 
+                              rpc_printer_migrate_settings_internals,
+                              argc, argv);
+}
+
+/** 
+ * 'net rpc printer' entrypoint.
+ * @param argc  Standard main() style argc
+ * @param argv  Standard main() style argv.  Initial components are already
+ *              stripped
+ **/
+
+int rpc_printer_migrate(int argc, const char **argv) 
+{
+
+       /* ouch: when addriver and setdriver are called from within
+          rpc_printer_migrate_drivers_internals, the printer-queue already
+          *has* to exist */
+
+       struct functable func[] = {
+               {"all",         rpc_printer_migrate_all},
+               {"drivers",     rpc_printer_migrate_drivers},
+               {"forms",       rpc_printer_migrate_forms},
+               {"help",        rpc_printer_usage},
+               {"printers",    rpc_printer_migrate_printers},
+               {"security",    rpc_printer_migrate_security},
+               {"settings",    rpc_printer_migrate_settings},
+               {NULL, NULL}
+       };
+
+       return net_run_function(argc, argv, func, rpc_printer_usage);
+}
+
+
+/** 
+ * List printers on a remote RPC server
+ *
+ * @param argc  Standard main() style argc
+ * @param argv  Standard main() style argv.  Initial components are already
+ *              stripped
+ *
+ * @return A shell status integer (0 for success)
+ **/
+static int rpc_printer_list(int argc, const char **argv)
+{
+
+       return run_rpc_command(NULL, PI_SPOOLSS, 0, 
+                              rpc_printer_list_internals,
+                              argc, argv);
+}
+
+/** 
+ * List printer-drivers on a remote RPC server
+ *
+ * @param argc  Standard main() style argc
+ * @param argv  Standard main() style argv.  Initial components are already
+ *              stripped
+ *
+ * @return A shell status integer (0 for success)
+ **/
+static int rpc_printer_driver_list(int argc, const char **argv)
+{
+
+       return run_rpc_command(NULL, PI_SPOOLSS, 0, 
+                              rpc_printer_driver_list_internals,
+                              argc, argv);
+}
+
+/** 
+ * Publish printer in ADS via MSRPC
+ *
+ * @param argc  Standard main() style argc
+ * @param argv  Standard main() style argv.  Initial components are already
+ *              stripped
+ *
+ * @return A shell status integer (0 for success)
+ **/
+static int rpc_printer_publish_publish(int argc, const char **argv)
+{
+
+       return run_rpc_command(NULL, PI_SPOOLSS, 0, 
+                              rpc_printer_publish_publish_internals,
+                              argc, argv);
+}
+
+/** 
+ * Update printer in ADS via MSRPC
+ *
+ * @param argc  Standard main() style argc
+ * @param argv  Standard main() style argv.  Initial components are already
+ *              stripped
+ *
+ * @return A shell status integer (0 for success)
+ **/
+static int rpc_printer_publish_update(int argc, const char **argv)
+{
+
+       return run_rpc_command(NULL, PI_SPOOLSS, 0, 
+                              rpc_printer_publish_update_internals,
+                              argc, argv);
+}
+
+/** 
+ * UnPublish printer in ADS via MSRPC
+ *
+ * @param argc  Standard main() style argc
+ * @param argv  Standard main() style argv.  Initial components are already
+ *              stripped
+ *
+ * @return A shell status integer (0 for success)
+ **/
+static int rpc_printer_publish_unpublish(int argc, const char **argv)
+{
+
+       return run_rpc_command(NULL, PI_SPOOLSS, 0, 
+                              rpc_printer_publish_unpublish_internals,
+                              argc, argv);
+}
+
+/** 
+ * List published printers via MSRPC
+ *
+ * @param argc  Standard main() style argc
+ * @param argv  Standard main() style argv.  Initial components are already
+ *              stripped
+ *
+ * @return A shell status integer (0 for success)
+ **/
+static int rpc_printer_publish_list(int argc, const char **argv)
+{
+
+       return run_rpc_command(NULL, PI_SPOOLSS, 0, 
+                              rpc_printer_publish_list_internals,
+                              argc, argv);
+}
+
+
+/** 
+ * Publish printer in ADS
+ *
+ * @param argc  Standard main() style argc
+ * @param argv  Standard main() style argv.  Initial components are already
+ *              stripped
+ *
+ * @return A shell status integer (0 for success)
+ **/
+static int rpc_printer_publish(int argc, const char **argv)
+{
+
+       struct functable func[] = {
+               {"publish",     rpc_printer_publish_publish},
+               {"update",      rpc_printer_publish_update},
+               {"unpublish",   rpc_printer_publish_unpublish},
+               {"list",        rpc_printer_publish_list},
+               {"help",        rpc_printer_usage},
+               {NULL, NULL}
+       };
+
+       if (argc == 0)
+               return run_rpc_command(NULL, PI_SPOOLSS, 0, 
+                              rpc_printer_publish_list_internals,
+                              argc, argv);
+
+       return net_run_function(argc, argv, func, rpc_printer_usage);
+
+}
+
+
+/** 
+ * Display rpc printer help page.
+ * @param argc  Standard main() style argc
+ * @param argv  Standard main() style argv.  Initial components are already
+ *              stripped
+ **/
+int rpc_printer_usage(int argc, const char **argv)
+{
+        return net_help_printer(argc, argv);
+}
+
+/** 
+ * 'net rpc printer' entrypoint.
+ * @param argc  Standard main() style argc
+ * @param argv  Standard main() style argv.  Initial components are already
+ *              stripped
+ **/
+int net_rpc_printer(int argc, const char **argv) 
+{
+       struct functable func[] = {
+               {"list", rpc_printer_list},
+               {"migrate", rpc_printer_migrate},
+               {"driver", rpc_printer_driver_list},
+               {"publish", rpc_printer_publish},
+               {NULL, NULL}
+       };
+
+       if (argc == 0)
+               return run_rpc_command(NULL, PI_SPOOLSS, 0, 
+                              rpc_printer_list_internals,
+                              argc, argv);
+
+       return net_run_function(argc, argv, func, rpc_printer_usage);
+}
+
 /****************************************************************************/
 
 
@@ -2776,27 +6098,30 @@ int net_rpc_usage(int argc, const char **argv)
 {
        d_printf("  net rpc info \t\t\tshow basic info about a domain \n");
        d_printf("  net rpc join \t\t\tto join a domain \n");
-       d_printf("  net rpc oldjoin \t\t\tto join a domain created in server manager\n\n\n");
+       d_printf("  net rpc oldjoin \t\t\tto join a domain created in server manager\n");
        d_printf("  net rpc testjoin \t\ttests that a join is valid\n");
        d_printf("  net rpc user \t\t\tto add, delete and list users\n");
-        d_printf("  net rpc password <username> [<password>] -Uadmin_username%%admin_pass");
+       d_printf("  net rpc password <username> [<password>] -Uadmin_username%%admin_pass\n");
        d_printf("  net rpc group \t\tto list groups\n");
-       d_printf("  net rpc share \t\tto add, delete, and list shares\n");
+       d_printf("  net rpc share \t\tto add, delete, list and migrate shares\n");
+       d_printf("  net rpc printer \t\tto list and migrate printers\n");
        d_printf("  net rpc file \t\t\tto list open files\n");
        d_printf("  net rpc changetrustpw \tto change the trust account password\n");
        d_printf("  net rpc getsid \t\tfetch the domain sid into the local secrets.tdb\n");
        d_printf("  net rpc vampire \t\tsyncronise an NT PDC's users and groups into the local passdb\n");
        d_printf("  net rpc samdump \t\tdiplay an NT PDC's users, groups and other data\n");
-       d_printf("  net rpc trustdom \t\tto create trusting domain's account\n"
-                "\t\t\t\t\tor establish trust\n");
+       d_printf("  net rpc trustdom \t\tto create trusting domain's account or establish trust\n");
        d_printf("  net rpc abortshutdown \tto abort the shutdown of a remote server\n");
        d_printf("  net rpc shutdown \t\tto shutdown a remote server\n");
+       d_printf("  net rpc rights\t\tto manage privileges assigned to SIDs\n");
+       d_printf("  net rpc registry\t\tto manage registry hives\n");
+       d_printf("  net rpc service\t\tto start, stop and query services\n");
        d_printf("\n");
        d_printf("'net rpc shutdown' also accepts the following miscellaneous options:\n"); /* misc options */
        d_printf("\t-r or --reboot\trequest remote server reboot on shutdown\n");
        d_printf("\t-f or --force\trequest the remote server force its shutdown\n");
        d_printf("\t-t or --timeout=<timeout>\tnumber of seconds before shutdown\n");
-       d_printf("\t-c or --comment=<message>\ttext message to display on impending shutdown\n");
+       d_printf("\t-C or --comment=<message>\ttext message to display on impending shutdown\n");
        return -1;
 }
 
@@ -2820,6 +6145,7 @@ int net_rpc_help(int argc, const char **argv)
                {"trustdom", rpc_trustdom_usage},
                /*{"abortshutdown", rpc_shutdown_abort_usage},*/
                /*{"shutdown", rpc_shutdown_usage}, */
+               {"vampire", rpc_vampire_usage},
                {NULL, NULL}
        };
 
@@ -2851,6 +6177,7 @@ int net_rpc(int argc, const char **argv)
                {"group", net_rpc_group},
                {"share", net_rpc_share},
                {"file", net_rpc_file},
+               {"printer", net_rpc_printer},
                {"changetrustpw", net_rpc_changetrustpw},
                {"trustdom", rpc_trustdom},
                {"abortshutdown", rpc_shutdown_abort},
@@ -2858,6 +6185,9 @@ int net_rpc(int argc, const char **argv)
                {"samdump", rpc_samdump},
                {"vampire", rpc_vampire},
                {"getsid", net_rpc_getsid},
+               {"rights", net_rpc_rights},
+               {"service", net_rpc_service},
+               {"registry", net_rpc_registry},
                {"help", net_rpc_help},
                {NULL, NULL}
        };