r10656: BIG merge from trunk. Features not copied over

[sfrench/samba-autobuild/.git] / source3 / rpcclient / cmd_ds.c

diff --git a/source3/rpcclient/cmd_ds.c b/source3/rpcclient/cmd_ds.c
index 9a2114e07e08cffdbb283d8c89c2b59e4e223d8e..951d18a710e3c3497c4b653b05dcd31a2db2ec56 100644 (file)
--- a/source3/rpcclient/cmd_ds.c
+++ b/source3/rpcclient/cmd_ds.c
@@ -24,21 +24,21 @@
 
 /* Look up domain related information on a remote host */
 
-static NTSTATUS cmd_ds_dsrole_getprimarydominfo(struct cli_state *cli, 
+static NTSTATUS cmd_ds_dsrole_getprimarydominfo(struct rpc_pipe_client *cli, 
                                     TALLOC_CTX *mem_ctx, int argc, 
-                                    char **argv) 
+                                    const char **argv) 
 {
        NTSTATUS result;
        DS_DOMINFO_CTR  ctr;
        
-       result = cli_ds_getprimarydominfo( cli, mem_ctx, DsRolePrimaryDomainInfoBasic, &ctr );
+       result = rpccli_ds_getprimarydominfo( cli, mem_ctx, DsRolePrimaryDomainInfoBasic, &ctr );
        if ( NT_STATUS_IS_OK(result) )
        {
                printf ("Machine Role = [%d]\n", ctr.basic->machine_role);
                
                if ( ctr.basic->flags & DSROLE_PRIMARY_DS_RUNNING )     {
                        printf( "Directory Service is running.\n");
-                       printf( "Domain is in %s mode.\n", (ctr.basic->flags & DSROLE_PRIMARY_DS_MIXED_MODE) ? "mized" : "native" );
+                       printf( "Domain is in %s mode.\n", (ctr.basic->flags & DSROLE_PRIMARY_DS_MIXED_MODE) ? "mixed" : "native" );
                }
                else
                        printf( "Directory Service not running on server\n");
@@ -47,13 +47,35 @@ static NTSTATUS cmd_ds_dsrole_getprimarydominfo(struct cli_state *cli,
        return result;
 }
 
+static NTSTATUS cmd_ds_enum_domain_trusts(struct rpc_pipe_client *cli,
+                                    TALLOC_CTX *mem_ctx, int argc, 
+                                    const char **argv) 
+{
+       NTSTATUS                result;
+       uint32                  flags = 0x1;
+       struct ds_domain_trust   *trusts = NULL;
+       unsigned int                    num_domains = 0;
+       int i;
+       
+       result = rpccli_ds_enum_domain_trusts( cli, mem_ctx, cli->cli->desthost, flags, 
+               &trusts, &num_domains );
+       
+       printf( "%d domains returned\n", num_domains );
+
+       for (i=0; i<num_domains; i++ ) 
+               printf("%s (%s)\n", trusts[i].dns_domain, trusts[i].netbios_domain);
+       
+       return result;
+}
+
 /* List of commands exported by this module */
 
 struct cmd_set ds_commands[] = {
 
        { "LSARPC-DS" },
 
-       { "dsroledominfo",      cmd_ds_dsrole_getprimarydominfo,       PI_LSARPC_DS, "Get Primary Domain Information", "" },
+       { "dsroledominfo",   RPC_RTYPE_NTSTATUS, cmd_ds_dsrole_getprimarydominfo, NULL, PI_LSARPC_DS, NULL, "Get Primary Domain Information", "" },
+       { "dsenumdomtrusts", RPC_RTYPE_NTSTATUS, cmd_ds_enum_domain_trusts,       NULL, PI_NETLOGON,  NULL, "Enumerate all trusted domains in an AD forest", "" },
 
-       { NULL }
+{ NULL }
 };