add a few more tidy ups. Now onto winbindd

(This used to be commit f8abdd23e1d4aed56c263c3228e702b191af4c64)

diff --git a/source3/rpc_client/cli_ds.c b/source3/rpc_client/cli_ds.c
index e73a0b795a110e0f671e28e5acab7934ea9c8683..2f2111e9635b04468e1624a673f5c1adfaaabbe3 100644 (file)
--- a/source3/rpc_client/cli_ds.c
+++ b/source3/rpc_client/cli_ds.c
@@ -114,6 +114,14 @@ NTSTATUS cli_ds_enum_domain_trusts(struct cli_state *cli, TALLOC_CTX *mem_ctx,
        
        result = r.status;
        
+       if ( NT_STATUS_IS_OK(result) ) {
+       
+               *num_domains = r.num_domains;
+               *trusts = (DS_DOMAIN_TRUSTS*)smb_xmalloc(r.num_domains*sizeof(DS_DOMAIN_TRUSTS));
+               
+               memcpy( *trusts, r.domains.trusts, r.num_domains*sizeof(DS_DOMAIN_TRUSTS) );
+       }
+       
 done:
        prs_mem_free(&qbuf);
        prs_mem_free(&rbuf);

diff --git a/source3/rpcclient/cmd_ds.c b/source3/rpcclient/cmd_ds.c
index be677519c462022ea4c67f5fcf1aca543c6c72ec..721bd59ba0ccf15dfd3906b3ac08e39b99ae751a 100644 (file)
--- a/source3/rpcclient/cmd_ds.c
+++ b/source3/rpcclient/cmd_ds.c
@@ -59,6 +59,10 @@ static NTSTATUS cmd_ds_enum_domain_trusts(struct cli_state *cli,
        result = cli_ds_enum_domain_trusts( cli, mem_ctx, cli->desthost, flags, 
                &trusts, &num_domains );
        
+       printf( "%d domains returned\n", num_domains );
+       
+       SAFE_FREE( trusts );
+       
        return result;
 }