git.samba.org / samba.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
[GLUE] Rsync SAMBA_3_2_0 SVN r25598 in order to create the v3-2-test branch.
[samba.git] / source / utils / net_rpc.c
diff --git a/source/utils/net_rpc.c b/source/utils/net_rpc.c
index c22ffb9878f7ef8a9a3746747d6fdd8afa22417f..cbccc95b476a92c820a0d5534f5fd7114054b7e0 100644 (file)
--- a/source/utils/net_rpc.c
+++ b/source/utils/net_rpc.c
@@ -9,7 +9,7 @@
 
    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
 
    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
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -18,8 +18,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
  
 #include "includes.h"
 #include "utils/net.h"
  
 #include "includes.h"
 #include "utils/net.h"
@@ -116,7 +115,12 @@ int run_rpc_command(struct cli_state *cli_arg,
 
        /* make use of cli_state handed over as an argument, if possible */
        if (!cli_arg) {
 
        /* make use of cli_state handed over as an argument, if possible */
        if (!cli_arg) {
-               cli = net_make_ipc_connection(conn_flags);
+               nt_status = net_make_ipc_connection(conn_flags, &cli);
+               if (!NT_STATUS_IS_OK(nt_status)) {
+                       DEBUG(1, ("failed to make ipc connection: %s\n",
+                                 nt_errstr(nt_status)));
+                       return -1;
+               }
        } else {
                cli = cli_arg;
        }
        } else {
                cli = cli_arg;
        }
@@ -1253,9 +1257,9 @@ static NTSTATUS rpc_user_list_internals(const DOM_SID *domain_sid,
                loop_count++;
 
                for (i = 0; i < num_entries; i++) {
                loop_count++;
 
                for (i = 0; i < num_entries; i++) {
-                       unistr2_to_ascii(user, &(&ctr.sam.info1->str[i])->uni_acct_name, sizeof(user)-1);
+                       unistr2_to_ascii(user, &(&ctr.sam.info1->str[i])->uni_acct_name, sizeof(user));
                        if (opt_long_list_entries) 
                        if (opt_long_list_entries) 
-                               unistr2_to_ascii(desc, &(&ctr.sam.info1->str[i])->uni_acct_desc, sizeof(desc)-1);
+                               unistr2_to_ascii(desc, &(&ctr.sam.info1->str[i])->uni_acct_desc, sizeof(desc));
                        
                        if (opt_long_list_entries)
                                printf("%-21.21s %s\n", user, desc);
                        
                        if (opt_long_list_entries)
                                printf("%-21.21s %s\n", user, desc);
@@ -1804,7 +1808,7 @@ static NTSTATUS rpc_group_delete_internals(const DOM_SID *domain_sid,
        
                        if (user_ctr->info.id21->group_rid == group_rid) {
                                unistr2_to_ascii(temp, &(user_ctr->info.id21)->uni_user_name, 
        
                        if (user_ctr->info.id21->group_rid == group_rid) {
                                unistr2_to_ascii(temp, &(user_ctr->info.id21)->uni_user_name, 
-                                               sizeof(temp)-1);
+                                               sizeof(temp));
                                if (opt_verbose) 
                                        d_printf("Group is primary group of %s\n",temp);
                                group_is_primary = True;
                                if (opt_verbose) 
                                        d_printf("Group is primary group of %s\n",temp);
                                group_is_primary = True;
@@ -2030,7 +2034,7 @@ static NTSTATUS get_sid_from_name(struct cli_state *cli,
        }
 
        result = rpccli_lsa_lookup_names(pipe_hnd, mem_ctx, &lsa_pol, 1,
        }
 
        result = rpccli_lsa_lookup_names(pipe_hnd, mem_ctx, &lsa_pol, 1,
-                                     &name, NULL, &sids, &types);
+                                     &name, NULL, 1, &sids, &types);
 
        if (NT_STATUS_IS_OK(result)) {
                sid_copy(sid, &sids[0]);
 
        if (NT_STATUS_IS_OK(result)) {
                sid_copy(sid, &sids[0]);
@@ -2511,8 +2515,8 @@ static NTSTATUS rpc_group_list_internals(const DOM_SID *domain_sid,
 
                        fstring group, desc;
 
 
                        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);
+                       unistr2_to_ascii(group, &(&ctr.sam.info3->str[i])->uni_grp_name, sizeof(group));
+                       unistr2_to_ascii(desc, &(&ctr.sam.info3->str[i])->uni_grp_desc, sizeof(desc));
                        
                        if (opt_long_list_entries)
                                printf("%-21.21s %-50.50s\n",
                        
                        if (opt_long_list_entries)
                                printf("%-21.21s %-50.50s\n",
@@ -3014,16 +3018,13 @@ static NTSTATUS rpc_share_add_internals(const DOM_SID *domain_sid,
                                        TALLOC_CTX *mem_ctx,int argc,
                                        const char **argv)
 {
                                        TALLOC_CTX *mem_ctx,int argc,
                                        const char **argv)
 {
-       NTSTATUS result;
+       WERROR result;
        char *sharename;
        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 */
        char *sharename;
        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; 
-       uint32 parm_error;
-       union srvsvc_NetShareInfo info;
-       struct srvsvc_NetShareInfo2 info2;
+       uint32 level = 2;
 
        if ((sharename = talloc_strdup(mem_ctx, argv[0])) == NULL) {
                return NT_STATUS_NO_MEMORY;
 
        if ((sharename = talloc_strdup(mem_ctx, argv[0])) == NULL) {
                return NT_STATUS_NO_MEMORY;
@@ -3034,20 +3035,11 @@ static NTSTATUS rpc_share_add_internals(const DOM_SID *domain_sid,
                return NT_STATUS_UNSUCCESSFUL;
        *path++ = '\0';
 
                return NT_STATUS_UNSUCCESSFUL;
        *path++ = '\0';
 
-       info.info2 = &info2;
-
-       info2.type = type;
-       info2.comment = opt_comment;
-       info2.permissions = perms;
-       info2.max_users = opt_maxusers;
-       info2.current_users = num_users;
-       info2.path = path;
-       info2.password = password;
-       info2.name = sharename;
-
-       result = rpccli_srvsvc_NetShareAdd(pipe_hnd, mem_ctx, NULL, level, 
-                                                                          info, &parm_error);
-       return result;
+       result = rpccli_srvsvc_net_share_add(pipe_hnd, mem_ctx, sharename, type,
+                                         opt_comment, perms, opt_maxusers,
+                                         num_users, path, password, 
+                                         level, NULL);
+       return werror_to_ntstatus(result);
 }
 
 static int rpc_share_add(int argc, const char **argv)
 }
 
 static int rpc_share_add(int argc, const char **argv)
@@ -3084,10 +3076,10 @@ static NTSTATUS rpc_share_del_internals(const DOM_SID *domain_sid,
                                        int argc,
                                        const char **argv)
 {
                                        int argc,
                                        const char **argv)
 {
-       NTSTATUS result;
+       WERROR result;
 
 
-       result = rpccli_srvsvc_NetShareDel(pipe_hnd, mem_ctx, NULL, argv[0], 0);
-       return NT_STATUS_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+       result = rpccli_srvsvc_net_share_del(pipe_hnd, mem_ctx, argv[0]);
+       return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
 }
 
 /** 
 }
 
 /** 
@@ -3114,40 +3106,169 @@ static int rpc_share_delete(int argc, const char **argv)
 /**
  * Formatted print of share info
  *
 /**
  * Formatted print of share info
  *
- * @param info1  pointer to struct srvsvc_NetShareInfo1 to format
+ * @param info1  pointer to SRV_SHARE_INFO_1 to format
  **/
  
  **/
  
-static void display_share_info_1(struct srvsvc_NetShareInfo1 *info1)
+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",
        if (opt_long_list_entries) {
                d_printf("%-12s %-8.8s %-50s\n",
-                        info1->name, share_type[info1->type], info1->comment);
+                        netname, share_type[info1->info_1.type & ~(STYPE_TEMPORARY|STYPE_HIDDEN)], remark);
        } else {
        } else {
-               d_printf("%s\n", info1->name);
+               d_printf("%s\n", netname);
        }
 
 }
 
        }
 
 }
 
-static NTSTATUS get_share_info(struct rpc_pipe_client *pipe_hnd,
+static WERROR get_share_info(struct rpc_pipe_client *pipe_hnd,
                                TALLOC_CTX *mem_ctx, 
                                uint32 level,
                                int argc,
                                const char **argv, 
                                TALLOC_CTX *mem_ctx, 
                                uint32 level,
                                int argc,
                                const char **argv, 
-                               union srvsvc_NetShareCtr *ctr, 
-                               uint32 *numentries)
+                               SRV_SHARE_INFO_CTR *ctr)
 {
 {
-       union srvsvc_NetShareInfo info;
+       WERROR result;
+       SRV_SHARE_INFO info;
 
        /* no specific share requested, enumerate all */
        if (argc == 0) {
 
        /* no specific share requested, enumerate all */
        if (argc == 0) {
-               uint32 hnd = 0;
 
 
-               return rpccli_srvsvc_NetShareEnum(pipe_hnd, mem_ctx, NULL, &level, ctr, 
-                                                0xffffffff, numentries, &hnd);
+               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 */
        }
 
        /* request just one share */
-       return rpccli_srvsvc_NetShareGetInfo(pipe_hnd, mem_ctx, NULL, argv[0], level, &info);
+       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);
+               if (ctr->share.info1 == NULL) {
+                       result = WERR_NOMEM;
+                       goto done;
+               }
+               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);
+               if (ctr->share.info2 == NULL) {
+                       result = WERR_NOMEM;
+                       goto done;
+               }
+               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);
+               if (ctr->share.info502 == NULL) {
+                       result = WERR_NOMEM;
+                       goto done;
+               }
+               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;
 }
 
 /** 
 }
 
 /** 
@@ -3174,14 +3295,12 @@ static NTSTATUS rpc_share_list_internals(const DOM_SID *domain_sid,
                                        int argc,
                                        const char **argv)
 {
                                        int argc,
                                        const char **argv)
 {
-       union srvsvc_NetShareCtr ctr;
-       NTSTATUS result;
+       SRV_SHARE_INFO_CTR ctr;
+       WERROR result;
        uint32 i, level = 1;
        uint32 i, level = 1;
-       uint32 numentries;
 
 
-       result = get_share_info(pipe_hnd, mem_ctx, level, argc, argv, &ctr, 
-                                                       &numentries);
-       if (!NT_STATUS_IS_OK(result))
+       result = get_share_info(pipe_hnd, mem_ctx, level, argc, argv, &ctr);
+       if (!W_ERROR_IS_OK(result))
                goto done;
 
        /* Display results */
                goto done;
 
        /* Display results */
@@ -3192,10 +3311,10 @@ static NTSTATUS rpc_share_list_internals(const DOM_SID *domain_sid,
        "\nShare name   Type     Description\n"\
        "----------   ----     -----------\n");
        }
        "\nShare name   Type     Description\n"\
        "----------   ----     -----------\n");
        }
-       for (i = 0; i < numentries; i++)
-               display_share_info_1(&ctr.ctr1->array[i]);
+       for (i = 0; i < ctr.num_entries; i++)
+               display_share_info_1(&ctr.share.info1[i]);
  done:
  done:
-       return NT_STATUS_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+       return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
 }
 
 /*** 
 }
 
 /*** 
@@ -3222,7 +3341,7 @@ static BOOL check_share_availability(struct cli_state *cli, const char *netname)
        return True;
 }
 
        return True;
 }
 
-static BOOL check_share_sanity(struct cli_state *cli, const char *netname, uint32 type)
+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)) ) {
 {
        /* only support disk shares */
        if (! ( type == STYPE_DISKTREE || type == (STYPE_DISKTREE | STYPE_HIDDEN)) ) {
@@ -3268,18 +3387,18 @@ static NTSTATUS rpc_share_migrate_shares_internals(const DOM_SID *domain_sid,
                                                int argc,
                                                const char **argv)
 {
                                                int argc,
                                                const char **argv)
 {
-       NTSTATUS result;
+       WERROR result;
        NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
        NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
-       union srvsvc_NetShareCtr ctr_src;
+       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 */
        uint32 i;
        struct rpc_pipe_client *srvsvc_pipe = NULL;
        struct cli_state *cli_dst = NULL;
        uint32 level = 502; /* includes secdesc */
-       uint32 numentries;
 
 
-       result = get_share_info(pipe_hnd, mem_ctx, level, argc, argv, &ctr_src, 
-                                                       &numentries);
-       if (!NT_STATUS_IS_OK(result))
+       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 */
                goto done;
 
        /* connect destination PI_SRVSVC */
@@ -3288,37 +3407,41 @@ static NTSTATUS rpc_share_migrate_shares_internals(const DOM_SID *domain_sid,
                 return nt_status;
 
 
                 return nt_status;
 
 
-       for (i = 0; i < numentries; i++) {
-               uint32 parm_error;
-               union srvsvc_NetShareInfo info;
+       for (i = 0; i < ctr_src.num_entries; i++) {
 
 
+               fstring netname = "", remark = "", path = "";
                /* reset error-code */
                nt_status = NT_STATUS_UNSUCCESSFUL;
 
                /* reset error-code */
                nt_status = NT_STATUS_UNSUCCESSFUL;
 
-               if (!check_share_sanity(cli, ctr_src.ctr502->array[i].name, 
-                                                               ctr_src.ctr502->array[i].type))
-                                                               
+               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", 
                        continue;
 
                /* finally add the share on the dst server */ 
 
                printf("migrating: [%s], path: %s, comment: %s, without share-ACLs\n", 
-                       ctr_src.ctr502->array[i].name, 
-                       ctr_src.ctr502->array[i].path, 
-                       ctr_src.ctr502->array[i].comment);
-
-               info.info502 = &ctr_src.ctr502->array[i];
-
-               result = rpccli_srvsvc_NetShareAdd(srvsvc_pipe, mem_ctx, NULL, 
-                                                                                  502, info, &parm_error);
+                       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 (NT_STATUS_EQUAL(result, NT_STATUS_OBJECT_NAME_COLLISION)) {
-                       printf("           [%s] does already exist\n", ctr_src.ctr502->array[i].name);
+                if (W_ERROR_V(result) == W_ERROR_V(WERR_ALREADY_EXISTS)) {
+                       printf("           [%s] does already exist\n", netname);
                        continue;
                }
 
                        continue;
                }
 
-               if (!NT_STATUS_IS_OK(result)) {
-                       printf("cannot add share: %s\n", nt_errstr(result));
+               if (!W_ERROR_IS_OK(result)) {
+                       printf("cannot add share: %s\n", dos_errstr(result));
                        goto done;
                }
 
                        goto done;
                }
 
@@ -3467,15 +3590,23 @@ static void copy_fn(const char *mnt, file_info *f, const char *mask, void *state
  **/
 BOOL sync_files(struct copy_clistate *cp_clistate, pstring mask)
 {
  **/
 BOOL sync_files(struct copy_clistate *cp_clistate, pstring mask)
 {
+       struct cli_state *targetcli;
+       pstring targetpath;
 
        DEBUG(3,("calling cli_list with mask: %s\n", 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_fprintf(stderr, "listing %s failed with error: %s\n", 
+       if ( !cli_resolve_path( "", cp_clistate->cli_share_src, mask, &targetcli, targetpath ) ) {
+               d_fprintf(stderr, "cli_resolve_path %s failed with error: %s\n", 
                        mask, cli_errstr(cp_clistate->cli_share_src));
                return False;
        }
 
                        mask, cli_errstr(cp_clistate->cli_share_src));
                return False;
        }
 
+       if (cli_list(targetcli, targetpath, cp_clistate->attribute, copy_fn, cp_clistate) == -1) {
+               d_fprintf(stderr, "listing %s failed with error: %s\n", 
+                       mask, cli_errstr(targetcli));
+               return False;
+       }
+
        return True;
 }
 
        return True;
 }
 
@@ -3540,9 +3671,9 @@ static NTSTATUS rpc_share_migrate_files_internals(const DOM_SID *domain_sid,
                                                int argc,
                                                const char **argv)
 {
                                                int argc,
                                                const char **argv)
 {
-       NTSTATUS result;
+       WERROR result;
        NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
        NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
-       union srvsvc_NetShareCtr ctr_src;
+       SRV_SHARE_INFO_CTR ctr_src;
        uint32 i;
        uint32 level = 502;
        struct copy_clistate cp_clistate;
        uint32 i;
        uint32 level = 502;
        struct copy_clistate cp_clistate;
@@ -3550,24 +3681,27 @@ static NTSTATUS rpc_share_migrate_files_internals(const DOM_SID *domain_sid,
        BOOL got_dst_share = False;
        pstring mask = "\\*";
        char *dst = NULL;
        BOOL got_dst_share = False;
        pstring mask = "\\*";
        char *dst = NULL;
-       uint32 numentries;
 
        dst = SMB_STRDUP(opt_destination?opt_destination:"127.0.0.1");
 
 
        dst = SMB_STRDUP(opt_destination?opt_destination:"127.0.0.1");
 
-       result = get_share_info(pipe_hnd, mem_ctx, level, argc, argv, &ctr_src, 
-                                                       &numentries);
+       result = get_share_info(pipe_hnd, mem_ctx, level, argc, argv, &ctr_src);
 
 
-       if (!NT_STATUS_IS_OK(result))
+       if (!W_ERROR_IS_OK(result))
                goto done;
 
                goto done;
 
-       for (i = 0; i < numentries; i++) {
-               if (!check_share_sanity(cli, ctr_src.ctr502->array[i].name,
-                                                       ctr_src.ctr502->array[i].type))
+       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 :) */
                        continue;
 
                /* one might not want to mirror whole discs :) */
-               if (strequal(ctr_src.ctr502->array[i].name, "print$") || ctr_src.ctr502->array[i].name[1] == '$') {
-                       d_printf("skipping   [%s]: builtin/hidden share\n", ctr_src.ctr502->array[i].name);
+               if (strequal(netname, "print$") || netname[1] == '$') {
+                       d_printf("skipping   [%s]: builtin/hidden share\n", netname);
                        continue;
                }
 
                        continue;
                }
 
@@ -3581,7 +3715,7 @@ static NTSTATUS rpc_share_migrate_files_internals(const DOM_SID *domain_sid,
                        break;
                }
                printf("    [%s] files and directories %s ACLs, %s DOS Attributes %s\n", 
                        break;
                }
                printf("    [%s] files and directories %s ACLs, %s DOS Attributes %s\n", 
-                       ctr_src.ctr502->array[i].name, 
+                       netname, 
                        opt_acls ? "including" : "without", 
                        opt_attrs ? "including" : "without",
                        opt_timestamps ? "(preserving timestamps)" : "");
                        opt_acls ? "including" : "without", 
                        opt_attrs ? "including" : "without",
                        opt_timestamps ? "(preserving timestamps)" : "");
@@ -3595,7 +3729,7 @@ static NTSTATUS rpc_share_migrate_files_internals(const DOM_SID *domain_sid,
                /* open share source */
                nt_status = connect_to_service(&cp_clistate.cli_share_src,
                                               &cli->dest_ip, cli->desthost,
                /* open share source */
                nt_status = connect_to_service(&cp_clistate.cli_share_src,
                                               &cli->dest_ip, cli->desthost,
-                                                  ctr_src.ctr502->array[i].name, "A:");
+                                              netname, "A:");
                if (!NT_STATUS_IS_OK(nt_status))
                        goto done;
 
                if (!NT_STATUS_IS_OK(nt_status))
                        goto done;
 
@@ -3604,22 +3738,21 @@ static NTSTATUS rpc_share_migrate_files_internals(const DOM_SID *domain_sid,
                if (net_mode_share == NET_MODE_SHARE_MIGRATE) {
                        /* open share destination */
                        nt_status = connect_to_service(&cp_clistate.cli_share_dst,
                if (net_mode_share == NET_MODE_SHARE_MIGRATE) {
                        /* open share destination */
                        nt_status = connect_to_service(&cp_clistate.cli_share_dst,
-                                                      NULL, dst, ctr_src.ctr502->array[i].name, "A:");
+                                                      NULL, dst, netname, "A:");
                        if (!NT_STATUS_IS_OK(nt_status))
                                goto done;
 
                        got_dst_share = True;
                }
 
                        if (!NT_STATUS_IS_OK(nt_status))
                                goto done;
 
                        got_dst_share = True;
                }
 
-               if (!copy_top_level_perms(&cp_clistate, ctr_src.ctr502->array[i].name)) {
-                       d_fprintf(stderr, "Could not handle the top level directory permissions for the share: %s\n", ctr_src.ctr502->array[i].name);
+               if (!copy_top_level_perms(&cp_clistate, netname)) {
+                       d_fprintf(stderr, "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)) {
                        nt_status = NT_STATUS_UNSUCCESSFUL;
                        goto done;
                }
 
                if (!sync_files(&cp_clistate, mask)) {
-                       d_fprintf(stderr, "could not handle files for share: %s\n", 
-                                         ctr_src.ctr502->array[i].name);
+                       d_fprintf(stderr, "could not handle files for share: %s\n", netname);
                        nt_status = NT_STATUS_UNSUCCESSFUL;
                        goto done;
                }
                        nt_status = NT_STATUS_UNSUCCESSFUL;
                        goto done;
                }
@@ -3676,21 +3809,18 @@ static NTSTATUS rpc_share_migrate_security_internals(const DOM_SID *domain_sid,
                                                int argc,
                                                const char **argv)
 {
                                                int argc,
                                                const char **argv)
 {
-       NTSTATUS result;
+       WERROR result;
        NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
        NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
-       union srvsvc_NetShareCtr ctr_src;
-       union srvsvc_NetShareInfo info;
+       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 */
        uint32 i;
        struct rpc_pipe_client *srvsvc_pipe = NULL;
        struct cli_state *cli_dst = NULL;
        uint32 level = 502; /* includes secdesc */
-       uint32 numentries;
-       uint32 parm_error;
 
 
-       result = get_share_info(pipe_hnd, mem_ctx, level, argc, argv, &ctr_src,
-                                                       &numentries);
+       result = get_share_info(pipe_hnd, mem_ctx, level, argc, argv, &ctr_src);
 
 
-       if (!NT_STATUS_IS_OK(result))
+       if (!W_ERROR_IS_OK(result))
                goto done;
 
        /* connect destination PI_SRVSVC */
                goto done;
 
        /* connect destination PI_SRVSVC */
@@ -3699,31 +3829,42 @@ static NTSTATUS rpc_share_migrate_security_internals(const DOM_SID *domain_sid,
                 return nt_status;
 
 
                 return nt_status;
 
 
-       for (i = 0; i < numentries; i++) {
+       for (i = 0; i < ctr_src.num_entries; i++) {
+
+               fstring netname = "", remark = "", path = "";
                /* reset error-code */
                nt_status = NT_STATUS_UNSUCCESSFUL;
 
                /* reset error-code */
                nt_status = NT_STATUS_UNSUCCESSFUL;
 
-               if (!check_share_sanity(cli, ctr_src.ctr502->array[i].name, ctr_src.ctr502->array[i].type))
+               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", 
                        continue;
 
                printf("migrating: [%s], path: %s, comment: %s, including share-ACLs\n", 
-                       ctr_src.ctr502->array[i].name, 
-                       ctr_src.ctr502->array[i].path, 
-                       ctr_src.ctr502->array[i].comment);
+                       netname, path, remark);
 
                if (opt_verbose)
 
                if (opt_verbose)
-                       display_sec_desc(ctr_src.ctr502->array[i].sd);
+                       display_sec_desc(ctr_src.share.info502[i].info_502_str.sd);
 
                /* init info */
                ZERO_STRUCT(info);
 
 
                /* 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 */
                /* finally modify the share on the dst server */
-               result = rpccli_srvsvc_NetShareSetInfo(srvsvc_pipe, mem_ctx, NULL,
-                                                                                          argv[0], level, info,
-                                                                                          &parm_error);
+               result = rpccli_srvsvc_net_share_set_info(srvsvc_pipe, mem_ctx, netname, level, &info);
        
        
-               if (!NT_STATUS_IS_OK(result)) {
-                       printf("cannot set share-acl: %s\n", nt_errstr(result));
+               if (!W_ERROR_IS_OK(result)) {
+                       printf("cannot set share-acl: %s\n", dos_errstr(result));
                        goto done;
                }
 
                        goto done;
                }
 
@@ -4026,7 +4167,11 @@ static void init_user_token(NT_USER_TOKEN *token, DOM_SID *user_sid)
 {
        token->num_sids = 4;
 
 {
        token->num_sids = 4;
 
-       token->user_sids = SMB_MALLOC_ARRAY(DOM_SID, 4);
+       if (!(token->user_sids = SMB_MALLOC_ARRAY(DOM_SID, 4))) {
+               d_fprintf(stderr, "malloc failed\n");
+               token->num_sids = 0;
+               return;
+       }
 
        token->user_sids[0] = *user_sid;
        sid_copy(&token->user_sids[1], &global_sid_World);
 
        token->user_sids[0] = *user_sid;
        sid_copy(&token->user_sids[1], &global_sid_World);
@@ -4353,20 +4498,20 @@ static void show_userlist(struct rpc_pipe_client *pipe_hnd,
        SEC_DESC *root_sd = NULL;
        struct cli_state *cli = pipe_hnd->cli;
        int i;
        SEC_DESC *root_sd = NULL;
        struct cli_state *cli = pipe_hnd->cli;
        int i;
-       union srvsvc_NetShareInfo info;
-       NTSTATUS result;
+       SRV_SHARE_INFO info;
+       WERROR result;
        uint16 cnum;
 
        uint16 cnum;
 
-       result = rpccli_srvsvc_NetShareGetInfo(pipe_hnd, mem_ctx, NULL, netname,
+       result = rpccli_srvsvc_net_share_get_info(pipe_hnd, mem_ctx, netname,
                                               502, &info);
 
                                               502, &info);
 
-       if (!NT_STATUS_IS_OK(result)) {
+       if (!W_ERROR_IS_OK(result)) {
                DEBUG(1, ("Coult not query secdesc for share %s\n",
                          netname));
                return;
        }
 
                DEBUG(1, ("Coult not query secdesc for share %s\n",
                          netname));
                return;
        }
 
-       share_sd = info.info502->sd;
+       share_sd = info.share.info502.info_502_str.sd;
        if (share_sd == NULL) {
                DEBUG(1, ("Got no secdesc for share %s\n",
                          netname));
        if (share_sd == NULL) {
                DEBUG(1, ("Got no secdesc for share %s\n",
                          netname));
@@ -4480,7 +4625,7 @@ static NTSTATUS rpc_share_allowedusers_internals(const DOM_SID *domain_sid,
 {
        int ret;
        BOOL r;
 {
        int ret;
        BOOL r;
-       uint32 hnd;
+       ENUM_HND hnd;
        uint32 i;
        FILE *f;
 
        uint32 i;
        FILE *f;
 
@@ -4518,7 +4663,8 @@ static NTSTATUS rpc_share_allowedusers_internals(const DOM_SID *domain_sid,
        for (i=0; i<num_tokens; i++)
                collect_alias_memberships(&tokens[i].token);
 
        for (i=0; i<num_tokens; i++)
                collect_alias_memberships(&tokens[i].token);
 
-       hnd = 0;
+       init_enum_hnd(&hnd, 0);
+
        share_list.num_shares = 0;
        share_list.shares = NULL;
 
        share_list.num_shares = 0;
        share_list.shares = NULL;
 
@@ -4649,10 +4795,7 @@ static NTSTATUS rpc_sh_share_add(TALLOC_CTX *mem_ctx,
                                 struct rpc_pipe_client *pipe_hnd,
                                 int argc, const char **argv)
 {
                                 struct rpc_pipe_client *pipe_hnd,
                                 int argc, const char **argv)
 {
-       union srvsvc_NetShareInfo info;
-       struct srvsvc_NetShareInfo2 info2;
-       NTSTATUS result;
-       uint32 parm_error;
+       WERROR result;
 
        if ((argc < 2) || (argc > 3)) {
                d_fprintf(stderr, "usage: %s <share> <path> [comment]\n",
 
        if ((argc < 2) || (argc > 3)) {
                d_fprintf(stderr, "usage: %s <share> <path> [comment]\n",
@@ -4660,15 +4803,12 @@ static NTSTATUS rpc_sh_share_add(TALLOC_CTX *mem_ctx,
                return NT_STATUS_INVALID_PARAMETER;
        }
 
                return NT_STATUS_INVALID_PARAMETER;
        }
 
-       info.info2 = &info2;
-       info2.name = argv[0];
-       info2.type = STYPE_DISKTREE;
-       info2.comment = (argc == 3) ? argv[2] : "";
-
-       result = rpccli_srvsvc_NetShareAdd(
-               pipe_hnd, mem_ctx, NULL, 2, info, &parm_error); 
+       result = rpccli_srvsvc_net_share_add(
+               pipe_hnd, mem_ctx, argv[0], STYPE_DISKTREE,
+               (argc == 3) ? argv[2] : "",
+               0, 0, 0, argv[1], NULL, 2, NULL);
                                             
                                             
-       return result;
+       return werror_to_ntstatus(result);
 }
 
 static NTSTATUS rpc_sh_share_delete(TALLOC_CTX *mem_ctx,
 }
 
 static NTSTATUS rpc_sh_share_delete(TALLOC_CTX *mem_ctx,
@@ -4676,15 +4816,15 @@ static NTSTATUS rpc_sh_share_delete(TALLOC_CTX *mem_ctx,
                                    struct rpc_pipe_client *pipe_hnd,
                                    int argc, const char **argv)
 {
                                    struct rpc_pipe_client *pipe_hnd,
                                    int argc, const char **argv)
 {
-       NTSTATUS result;
+       WERROR result;
 
        if (argc != 1) {
                d_fprintf(stderr, "usage: %s <share>\n", ctx->whoami);
                return NT_STATUS_INVALID_PARAMETER;
        }
 
 
        if (argc != 1) {
                d_fprintf(stderr, "usage: %s <share>\n", ctx->whoami);
                return NT_STATUS_INVALID_PARAMETER;
        }
 
-       result = rpccli_srvsvc_NetShareDel(pipe_hnd, mem_ctx, NULL, argv[0], 0);
-       return result;
+       result = rpccli_srvsvc_net_share_del(pipe_hnd, mem_ctx, argv[0]);
+       return werror_to_ntstatus(result);
 }
 
 static NTSTATUS rpc_sh_share_info(TALLOC_CTX *mem_ctx,
 }
 
 static NTSTATUS rpc_sh_share_info(TALLOC_CTX *mem_ctx,
@@ -4692,27 +4832,37 @@ static NTSTATUS rpc_sh_share_info(TALLOC_CTX *mem_ctx,
                                  struct rpc_pipe_client *pipe_hnd,
                                  int argc, const char **argv)
 {
                                  struct rpc_pipe_client *pipe_hnd,
                                  int argc, const char **argv)
 {
-       union srvsvc_NetShareInfo info;
-       NTSTATUS result;
+       SRV_SHARE_INFO info;
+       SRV_SHARE_INFO_2 *info2 = &info.share.info2;
+       WERROR result;
 
        if (argc != 1) {
                d_fprintf(stderr, "usage: %s <share>\n", ctx->whoami);
                return NT_STATUS_INVALID_PARAMETER;
        }
 
 
        if (argc != 1) {
                d_fprintf(stderr, "usage: %s <share>\n", ctx->whoami);
                return NT_STATUS_INVALID_PARAMETER;
        }
 
-       result = rpccli_srvsvc_NetShareGetInfo(
-               pipe_hnd, mem_ctx, NULL, argv[0], 2, &info);
-       if (!NT_STATUS_IS_OK(result)) {
+       result = rpccli_srvsvc_net_share_get_info(
+               pipe_hnd, mem_ctx, argv[0], 2, &info);
+       if (!W_ERROR_IS_OK(result)) {
                goto done;
        }
 
                goto done;
        }
 
-       d_printf("Name:     %s\n", info.info2->name);
-       d_printf("Comment:  %s\n", info.info2->comment);
-       d_printf("Path:     %s\n", info.info2->path);
-       d_printf("Password: %s\n", info.info2->password);
+       d_printf("Name:     %s\n",
+                rpcstr_pull_unistr2_talloc(mem_ctx,
+                                           &info2->info_2_str.uni_netname));
+       d_printf("Comment:  %s\n",
+                rpcstr_pull_unistr2_talloc(mem_ctx,
+                                           &info2->info_2_str.uni_remark));
+       
+       d_printf("Path:     %s\n",
+                rpcstr_pull_unistr2_talloc(mem_ctx,
+                                           &info2->info_2_str.uni_path));
+       d_printf("Password: %s\n",
+                rpcstr_pull_unistr2_talloc(mem_ctx,
+                                           &info2->info_2_str.uni_passwd));
 
  done:
 
  done:
-       return result;
+       return werror_to_ntstatus(result);
 }
 
 struct rpc_sh_cmd *net_rpc_share_cmds(TALLOC_CTX *mem_ctx,
 }
 
 struct rpc_sh_cmd *net_rpc_share_cmds(TALLOC_CTX *mem_ctx,
@@ -4768,9 +4918,9 @@ static NTSTATUS rpc_file_close_internals(const DOM_SID *domain_sid,
                                        int argc,
                                        const char **argv)
 {
                                        int argc,
                                        const char **argv)
 {
-       NTSTATUS result;
-       result = rpccli_srvsvc_NetFileClose(pipe_hnd, mem_ctx, NULL, atoi(argv[0]));
-       return NT_STATUS_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+       return rpccli_srvsvc_NetFileClose(pipe_hnd, mem_ctx, 
+                                           pipe_hnd->cli->desthost, 
+                                           atoi(argv[0]));
 }
 
 /** 
 }
 
 /** 
@@ -4801,10 +4951,15 @@ static int rpc_file_close(int argc, const char **argv)
  * @param str3   strings for FILE_INFO_3
  **/
 
  * @param str3   strings for FILE_INFO_3
  **/
 
-static void display_file_info_3( struct srvsvc_NetFileInfo3 *info3 )
+static void display_file_info_3( FILE_INFO_3 *info3 )
 {
 {
+       fstring user = "", path = "";
+
+       rpcstr_pull_unistr2_fstring(user, info3->user);
+       rpcstr_pull_unistr2_fstring(path, info3->path);
+
        d_printf("%-7.1d %-20.20s 0x%-4.2x %-6.1d %s\n",
        d_printf("%-7.1d %-20.20s 0x%-4.2x %-6.1d %s\n",
-                info3->fid, info3->user, info3->permissions, info3->num_locks, info3->path);
+                info3->id, user, info3->perms, info3->num_locks, path);
 }
 
 /** 
 }
 
 /** 
@@ -4831,24 +4986,22 @@ static NTSTATUS rpc_file_list_internals(const DOM_SID *domain_sid,
                                        int argc,
                                        const char **argv)
 {
                                        int argc,
                                        const char **argv)
 {
-       union srvsvc_NetFileCtr ctr;
-       NTSTATUS result;
-       uint32 hnd;
+       SRV_FILE_INFO_CTR ctr;
+       WERROR result;
+       ENUM_HND hnd;
        uint32 preferred_len = 0xffffffff, i;
        const char *username=NULL;
        uint32 preferred_len = 0xffffffff, i;
        const char *username=NULL;
-       uint32 level = 3;
-       uint32 numentries;
 
 
-       hnd = 0;
+       init_enum_hnd(&hnd, 0);
 
        /* if argc > 0, must be user command */
        if (argc > 0)
                username = smb_xstrdup(argv[0]);
                
 
        /* if argc > 0, must be user command */
        if (argc > 0)
                username = smb_xstrdup(argv[0]);
                
-       result = rpccli_srvsvc_NetFileEnum(pipe_hnd,
-                                       mem_ctx, NULL, NULL, username, &level, &ctr, preferred_len, &numentries, &hnd);
+       result = rpccli_srvsvc_net_file_enum(pipe_hnd,
+                                       mem_ctx, 3, username, &ctr, preferred_len, &hnd);
 
 
-       if (!NT_STATUS_IS_OK(result))
+       if (!W_ERROR_IS_OK(result))
                goto done;
 
        /* Display results */
                goto done;
 
        /* Display results */
@@ -4857,10 +5010,10 @@ static NTSTATUS rpc_file_list_internals(const DOM_SID *domain_sid,
                 "\nEnumerating open files on remote server:\n\n"\
                 "\nFileId  Opened by            Perms  Locks  Path"\
                 "\n------  ---------            -----  -----  ---- \n");
                 "\nEnumerating open files on remote server:\n\n"\
                 "\nFileId  Opened by            Perms  Locks  Path"\
                 "\n------  ---------            -----  -----  ---- \n");
-       for (i = 0; i < numentries; i++)
-               display_file_info_3(&ctr.ctr3->array[i]);
+       for (i = 0; i < ctr.num_entries; i++)
+               display_file_info_3(&ctr.file.info3[i]);
  done:
  done:
-       return NT_STATUS_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
+       return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL;
 }
 
 /** 
 }
 
 /** 
@@ -5504,6 +5657,7 @@ static int rpc_trustdom_establish(int argc, const char **argv)
        if (NT_STATUS_IS_ERR(nt_status)) {
                DEBUG(0, ("Couldn't connect to domain %s controller. Error was %s.\n",
                        domain_name, nt_errstr(nt_status)));
        if (NT_STATUS_IS_ERR(nt_status)) {
                DEBUG(0, ("Couldn't connect to domain %s controller. Error was %s.\n",
                        domain_name, nt_errstr(nt_status)));
+               return -1;
        }
 
        /*
        }
 
        /*
@@ -5513,6 +5667,8 @@ static int rpc_trustdom_establish(int argc, const char **argv)
        if (!cli_get_pdc_name(cli, domain_name, (char*)pdc_name)) {
                DEBUG(0, ("NetServerEnum2 error: Couldn't find primary domain controller\
                         for domain %s\n", domain_name));
        if (!cli_get_pdc_name(cli, domain_name, (char*)pdc_name)) {
                DEBUG(0, ("NetServerEnum2 error: Couldn't find primary domain controller\
                         for domain %s\n", domain_name));
+               cli_shutdown(cli);
+               return -1;
        }
         
        if (!(mem_ctx = talloc_init("establishing trust relationship to "
        }
         
        if (!(mem_ctx = talloc_init("establishing trust relationship to "
@@ -5530,6 +5686,7 @@ static int rpc_trustdom_establish(int argc, const char **argv)
        if (!pipe_hnd) {
                DEBUG(0, ("Could not initialise lsa pipe. Error was %s\n", nt_errstr(nt_status) ));
                cli_shutdown(cli);
        if (!pipe_hnd) {
                DEBUG(0, ("Could not initialise lsa pipe. Error was %s\n", nt_errstr(nt_status) ));
                cli_shutdown(cli);
+               talloc_destroy(mem_ctx);
                return -1;
        }
 
                return -1;
        }
 
@@ -5539,6 +5696,7 @@ static int rpc_trustdom_establish(int argc, const char **argv)
                DEBUG(0, ("Couldn't open policy handle. Error was %s\n",
                        nt_errstr(nt_status)));
                cli_shutdown(cli);
                DEBUG(0, ("Couldn't open policy handle. Error was %s\n",
                        nt_errstr(nt_status)));
                cli_shutdown(cli);
+               talloc_destroy(mem_ctx);
                return -1;
        }
 
                return -1;
        }
 
@@ -5551,6 +5709,7 @@ static int rpc_trustdom_establish(int argc, const char **argv)
                DEBUG(0, ("LSA Query Info failed. Returned error was %s\n",
                        nt_errstr(nt_status)));
                cli_shutdown(cli);
                DEBUG(0, ("LSA Query Info failed. Returned error was %s\n",
                        nt_errstr(nt_status)));
                cli_shutdown(cli);
+               talloc_destroy(mem_ctx);
                return -1;
        }
 
                return -1;
        }
 
@@ -5561,11 +5720,10 @@ static int rpc_trustdom_establish(int argc, const char **argv)
         * Store the password in secrets db
         */
 
         * Store the password in secrets db
         */
 
-       if (!secrets_store_trusted_domain_password(domain_name,
-                                                  opt_password,
-                                                  domain_sid)) {
+       if (!pdb_set_trusteddom_pw(domain_name, opt_password, domain_sid)) {
                DEBUG(0, ("Storing password for trusted domain failed.\n"));
                cli_shutdown(cli);
                DEBUG(0, ("Storing password for trusted domain failed.\n"));
                cli_shutdown(cli);
+               talloc_destroy(mem_ctx);
                return -1;
        }
        
                return -1;
        }
        
@@ -5578,6 +5736,7 @@ static int rpc_trustdom_establish(int argc, const char **argv)
                DEBUG(0, ("Couldn't close LSA pipe. Error was %s\n",
                        nt_errstr(nt_status)));
                cli_shutdown(cli);
                DEBUG(0, ("Couldn't close LSA pipe. Error was %s\n",
                        nt_errstr(nt_status)));
                cli_shutdown(cli);
+               talloc_destroy(mem_ctx);
                return -1;
        }
 
                return -1;
        }
 
@@ -5601,6 +5760,7 @@ static int rpc_trustdom_establish(int argc, const char **argv)
 static int rpc_trustdom_revoke(int argc, const char **argv)
 {
        char* domain_name;
 static int rpc_trustdom_revoke(int argc, const char **argv)
 {
        char* domain_name;
+       int rc = -1;
 
        if (argc < 1) return -1;
        
 
        if (argc < 1) return -1;
        
@@ -5609,13 +5769,16 @@ static int rpc_trustdom_revoke(int argc, const char **argv)
        strupper_m(domain_name);
 
        /* delete password of the trust */
        strupper_m(domain_name);
 
        /* delete password of the trust */
-       if (!trusted_domain_password_delete(domain_name)) {
+       if (!pdb_del_trusteddom_pw(domain_name)) {
                DEBUG(0, ("Failed to revoke relationship to the trusted domain %s\n",
                          domain_name));
                DEBUG(0, ("Failed to revoke relationship to the trusted domain %s\n",
                          domain_name));
-               return -1;
+               goto done;
        };
        
        };
        
-       return 0;
+       rc = 0;
+done:
+       SAFE_FREE(domain_name);
+       return rc;
 }
 
 /**
 }
 
 /**
@@ -5701,9 +5864,7 @@ static NTSTATUS vampire_trusted_domain(struct rpc_pipe_client *pipe_hnd,
                goto done;
        }
        
                goto done;
        }
        
-       if (!secrets_store_trusted_domain_password(trusted_dom_name,
-                                                  cleartextpwd,
-                                                  &dom_sid)) {
+       if (!pdb_set_trusteddom_pw(trusted_dom_name, cleartextpwd, &dom_sid)) {
                DEBUG(0, ("Storing password for trusted domain failed.\n"));
                nt_status = NT_STATUS_UNSUCCESSFUL;
                goto done;
                DEBUG(0, ("Storing password for trusted domain failed.\n"));
                nt_status = NT_STATUS_UNSUCCESSFUL;
                goto done;
@@ -5761,8 +5922,11 @@ static int rpc_trustdom_vampire(int argc, const char **argv)
        };
 
        /* open \PIPE\lsarpc and open policy handle */
        };
 
        /* 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"));
+       nt_status = net_make_ipc_connection(NET_FLAGS_PDC, &cli);
+       if (!NT_STATUS_IS_OK(nt_status)) {
+               DEBUG(0, ("Couldn't connect to domain controller: %s\n",
+                         nt_errstr(nt_status)));
+               talloc_destroy(mem_ctx);
                return -1;
        };
 
                return -1;
        };
 
@@ -5771,6 +5935,7 @@ static int rpc_trustdom_vampire(int argc, const char **argv)
                DEBUG(0, ("Could not initialise lsa pipe. Error was %s\n",
                        nt_errstr(nt_status) ));
                cli_shutdown(cli);
                DEBUG(0, ("Could not initialise lsa pipe. Error was %s\n",
                        nt_errstr(nt_status) ));
                cli_shutdown(cli);
+               talloc_destroy(mem_ctx);
                return -1;
        };
 
                return -1;
        };
 
@@ -5780,6 +5945,7 @@ static int rpc_trustdom_vampire(int argc, const char **argv)
                DEBUG(0, ("Couldn't open policy handle. Error was %s\n",
                        nt_errstr(nt_status)));
                cli_shutdown(cli);
                DEBUG(0, ("Couldn't open policy handle. Error was %s\n",
                        nt_errstr(nt_status)));
                cli_shutdown(cli);
+               talloc_destroy(mem_ctx);
                return -1;
        };
 
                return -1;
        };
 
@@ -5792,6 +5958,7 @@ static int rpc_trustdom_vampire(int argc, const char **argv)
                DEBUG(0, ("LSA Query Info failed. Returned error was %s\n",
                        nt_errstr(nt_status)));
                cli_shutdown(cli);
                DEBUG(0, ("LSA Query Info failed. Returned error was %s\n",
                        nt_errstr(nt_status)));
                cli_shutdown(cli);
+               talloc_destroy(mem_ctx);
                return -1;
        }
 
                return -1;
        }
 
@@ -5811,6 +5978,7 @@ static int rpc_trustdom_vampire(int argc, const char **argv)
                        DEBUG(0, ("Couldn't enumerate trusted domains. Error was %s\n",
                                nt_errstr(nt_status)));
                        cli_shutdown(cli);
                        DEBUG(0, ("Couldn't enumerate trusted domains. Error was %s\n",
                                nt_errstr(nt_status)));
                        cli_shutdown(cli);
+                       talloc_destroy(mem_ctx);
                        return -1;
                };
                
                        return -1;
                };
                
@@ -5822,6 +5990,7 @@ static int rpc_trustdom_vampire(int argc, const char **argv)
                                                           domain_sids[i], trusted_dom_names[i]);
                        if (!NT_STATUS_IS_OK(nt_status)) {
                                cli_shutdown(cli);
                                                           domain_sids[i], trusted_dom_names[i]);
                        if (!NT_STATUS_IS_OK(nt_status)) {
                                cli_shutdown(cli);
+                               talloc_destroy(mem_ctx);
                                return -1;
                        }
                };
                                return -1;
                        }
                };
@@ -5840,6 +6009,7 @@ static int rpc_trustdom_vampire(int argc, const char **argv)
                DEBUG(0, ("Couldn't properly close lsa policy handle. Error was %s\n",
                        nt_errstr(nt_status)));
                cli_shutdown(cli);
                DEBUG(0, ("Couldn't properly close lsa policy handle. Error was %s\n",
                        nt_errstr(nt_status)));
                cli_shutdown(cli);
+               talloc_destroy(mem_ctx);
                return -1;
        };
 
                return -1;
        };
 
@@ -5897,8 +6067,11 @@ static int rpc_trustdom_list(int argc, const char **argv)
        };
 
        /* open \PIPE\lsarpc and open policy handle */
        };
 
        /* 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"));
+       nt_status = net_make_ipc_connection(NET_FLAGS_PDC, &cli);
+       if (!NT_STATUS_IS_OK(nt_status)) {
+               DEBUG(0, ("Couldn't connect to domain controller: %s\n",
+                         nt_errstr(nt_status)));
+               talloc_destroy(mem_ctx);
                return -1;
        };
 
                return -1;
        };
 
@@ -5906,6 +6079,8 @@ static int rpc_trustdom_list(int argc, const char **argv)
        if (!pipe_hnd) {
                DEBUG(0, ("Could not initialise lsa pipe. Error was %s\n",
                        nt_errstr(nt_status) ));
        if (!pipe_hnd) {
                DEBUG(0, ("Could not initialise lsa pipe. Error was %s\n",
                        nt_errstr(nt_status) ));
+               cli_shutdown(cli);
+               talloc_destroy(mem_ctx);
                return -1;
        };
 
                return -1;
        };
 
@@ -5914,6 +6089,8 @@ static int rpc_trustdom_list(int argc, const char **argv)
        if (NT_STATUS_IS_ERR(nt_status)) {
                DEBUG(0, ("Couldn't open policy handle. Error was %s\n",
                        nt_errstr(nt_status)));
        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);
+               talloc_destroy(mem_ctx);
                return -1;
        };
        
                return -1;
        };
        
@@ -5925,6 +6102,8 @@ static int rpc_trustdom_list(int argc, const char **argv)
        if (NT_STATUS_IS_ERR(nt_status)) {
                DEBUG(0, ("LSA Query Info failed. Returned error was %s\n",
                        nt_errstr(nt_status)));
        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);
+               talloc_destroy(mem_ctx);
                return -1;
        }
                
                return -1;
        }
                
@@ -5943,6 +6122,8 @@ static int rpc_trustdom_list(int argc, const char **argv)
                if (NT_STATUS_IS_ERR(nt_status)) {
                        DEBUG(0, ("Couldn't enumerate trusted domains. Error was %s\n",
                                nt_errstr(nt_status)));
                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);
+                       talloc_destroy(mem_ctx);
                        return -1;
                };
                
                        return -1;
                };
                
@@ -5963,6 +6144,8 @@ static int rpc_trustdom_list(int argc, const char **argv)
        if (NT_STATUS_IS_ERR(nt_status)) {
                DEBUG(0, ("Couldn't properly close lsa policy handle. Error was %s\n",
                        nt_errstr(nt_status)));
        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);
+               talloc_destroy(mem_ctx);
                return -1;
        };
        
                return -1;
        };
        
@@ -5980,6 +6163,8 @@ static int rpc_trustdom_list(int argc, const char **argv)
        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)));
        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)));
+               cli_shutdown(cli);
+               talloc_destroy(mem_ctx);
                return -1;
        };
        
                return -1;
        };
        
@@ -5989,6 +6174,8 @@ static int rpc_trustdom_list(int argc, const char **argv)
        if (!NT_STATUS_IS_OK(nt_status)) {
                DEBUG(0, ("Couldn't open SAMR policy handle. Error was %s\n",
                        nt_errstr(nt_status)));
        if (!NT_STATUS_IS_OK(nt_status)) {
                DEBUG(0, ("Couldn't open SAMR policy handle. Error was %s\n",
                        nt_errstr(nt_status)));
+               cli_shutdown(cli);
+               talloc_destroy(mem_ctx);
                return -1;
        };
        
                return -1;
        };
        
@@ -6000,6 +6187,8 @@ static int rpc_trustdom_list(int argc, const char **argv)
        if (!NT_STATUS_IS_OK(nt_status)) {
                DEBUG(0, ("Couldn't open domain object. Error was %s\n",
                        nt_errstr(nt_status)));
        if (!NT_STATUS_IS_OK(nt_status)) {
                DEBUG(0, ("Couldn't open domain object. Error was %s\n",
                        nt_errstr(nt_status)));
+               cli_shutdown(cli);
+               talloc_destroy(mem_ctx);
                return -1;
        };
        
                return -1;
        };
        
@@ -6017,6 +6206,8 @@ static int rpc_trustdom_list(int argc, const char **argv)
                if (NT_STATUS_IS_ERR(nt_status)) {
                        DEBUG(0, ("Couldn't enumerate accounts. Error was: %s\n",
                                nt_errstr(nt_status)));
                if (NT_STATUS_IS_ERR(nt_status)) {
                        DEBUG(0, ("Couldn't enumerate accounts. Error was: %s\n",
                                nt_errstr(nt_status)));
+                       cli_shutdown(cli);
+                       talloc_destroy(mem_ctx);
                        return -1;
                };
                
                        return -1;
                };
                
@@ -6046,8 +6237,10 @@ static int rpc_trustdom_list(int argc, const char **argv)
                        d_printf("%s%s", trusting_dom_names[i], padding);
                        
                        /* connect to remote domain controller */
                        d_printf("%s%s", trusting_dom_names[i], padding);
                        
                        /* connect to remote domain controller */
-                       remote_cli = net_make_ipc_connection(NET_FLAGS_PDC | NET_FLAGS_ANONYMOUS);
-                       if (remote_cli) {                       
+                       nt_status = net_make_ipc_connection(
+                                       NET_FLAGS_PDC | NET_FLAGS_ANONYMOUS,
+                                       &remote_cli);
+                       if (NT_STATUS_IS_OK(nt_status)) {
                                /* query for domain's sid */
                                if (run_rpc_command(remote_cli, PI_LSARPC, 0, rpc_query_domain_sid, argc, argv))
                                        d_fprintf(stderr, "couldn't get domain's sid\n");
                                /* query for domain's sid */
                                if (run_rpc_command(remote_cli, PI_LSARPC, 0, rpc_query_domain_sid, argc, argv))
                                        d_fprintf(stderr, "couldn't get domain's sid\n");
@@ -6055,7 +6248,9 @@ static int rpc_trustdom_list(int argc, const char **argv)
                                cli_shutdown(remote_cli);
                        
                        } else {
                                cli_shutdown(remote_cli);
                        
                        } else {
-                               d_fprintf(stderr, "domain controller is not responding\n");
+                               d_fprintf(stderr, "domain controller is not "
+                                         "responding: %s\n",
+                                         nt_errstr(nt_status));
                        };
                };
                
                        };
                };
                
@@ -6123,6 +6318,7 @@ BOOL net_rpc_check(unsigned flags)
        BOOL ret = False;
        struct in_addr server_ip;
        char *server_name = NULL;
        BOOL ret = False;
        struct in_addr server_ip;
        char *server_name = NULL;
+       NTSTATUS status;
 
        /* flags (i.e. server type) may depend on command */
        if (!net_find_server(NULL, flags, &server_ip, &server_name))
 
        /* flags (i.e. server type) may depend on command */
        if (!net_find_server(NULL, flags, &server_ip, &server_name))
@@ -6132,7 +6328,8 @@ BOOL net_rpc_check(unsigned flags)
                return False;
        }
 
                return False;
        }
 
-       if (!cli_connect(cli, server_name, &server_ip))
+       status = cli_connect(cli, server_name, &server_ip);
+       if (!NT_STATUS_IS_OK(status))
                goto done;
        if (!attempt_netbios_session_request(&cli, global_myname(), 
                                             server_name, &server_ip))
                goto done;
        if (!attempt_netbios_session_request(&cli, global_myname(), 
                                             server_name, &server_ip))
@@ -6520,7 +6717,7 @@ 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 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");
+       d_printf("  net rpc oldjoin \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\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\n");
@@ -6531,7 +6728,7 @@ int net_rpc_usage(int argc, const char **argv)
        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 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 samdump \t\tdisplay an NT PDC's users, groups and other data\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 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");
Samba Shared Repository