don't force debug in the RPC-MGMT test

[samba.git] / source4 / torture / rpc / mgmt.c

diff --git a/source4/torture/rpc/mgmt.c b/source4/torture/rpc/mgmt.c
index e3a8146e644a0b0ce624c9d5b0dbb8c2d54b5206..2c4863be9052cad037fbbeba4d34c7d1f60f839d 100644 (file)
--- a/source4/torture/rpc/mgmt.c
+++ b/source4/torture/rpc/mgmt.c
@@ -22,6 +22,9 @@
 #include "includes.h"
 
 
+/*
+  ask the server what interface IDs are available on this endpoint
+*/
 static BOOL test_inq_if_ids(struct dcerpc_pipe *p, 
                            TALLOC_CTX *mem_ctx)
 {
@@ -46,11 +49,15 @@ static BOOL test_inq_if_ids(struct dcerpc_pipe *p,
        }
 
        for (i=0;i<r.out.if_id_vector->count;i++) {
+               const char *uuid;
                struct dcerpc_syntax_id *id = r.out.if_id_vector->if_id[i].id;
                if (!id) continue;
-               printf("\tuuid %s  version 0x%04x:0x%04x\n",
-                      GUID_string(mem_ctx, &id->uuid),
-                      id->major_version, id->minor_version);
+
+               uuid = GUID_string(mem_ctx, &id->uuid);
+
+               printf("\tuuid %s  version 0x%08x  '%s'\n",
+                      uuid,
+                      id->if_version, idl_pipe_name(uuid, id->if_version));
        }
 
        return True;
@@ -93,7 +100,7 @@ static BOOL test_inq_princ_name(struct dcerpc_pipe *p,
        int i;
        BOOL ret = False;
 
-       for (i=0;i<30;i++) {
+       for (i=0;i<100;i++) {
                r.in.authn_proto = i;  /* DCERPC_AUTH_TYPE_* */
                r.in.princ_name_size = 100;
 
@@ -166,11 +173,29 @@ BOOL torture_rpc_mgmt(int dummy)
        TALLOC_CTX *mem_ctx;
        BOOL ret = True;
        int i;
+       char *binding = lp_parm_string(-1, "torture", "binding");
+       struct dcerpc_binding b;
 
        mem_ctx = talloc_init("torture_rpc_mgmt");
 
-       for (i=0;dcerpc_pipes[i];i++) {
-               
+       if (!binding) {
+               printf("You must supply a ncacn binding string\n");
+               return False;
+       }
+       
+       status = dcerpc_parse_binding(mem_ctx, binding, &b);
+       if (!NT_STATUS_IS_OK(status)) {
+               printf("Failed to parse binding '%s'\n", binding);
+               return False;
+       }
+
+       b.options = talloc_array_p(mem_ctx, const char *, 2);
+       if (!b.options) {
+               return False;
+       }
+
+
+       for (i=0;dcerpc_pipes[i];i++) {         
                /* some interfaces are not mappable */
                if (dcerpc_pipes[i]->num_calls == 0 ||
                    strcmp(dcerpc_pipes[i]->name, "mgmt") == 0) {
@@ -179,6 +204,24 @@ BOOL torture_rpc_mgmt(int dummy)
 
                printf("\nTesting pipe '%s'\n", dcerpc_pipes[i]->name);
 
+               if (b.transport == NCACN_IP_TCP) {
+                       uint32 port;
+                       status = dcerpc_epm_map_tcp_port(b.host, 
+                                                        dcerpc_pipes[i]->uuid,
+                                                        dcerpc_pipes[i]->if_version,
+                                                        &port);
+                       if (!NT_STATUS_IS_OK(status)) {
+                               printf("Failed to map port for uuid %s\n", dcerpc_pipes[i]->uuid);
+                               continue;
+                       }
+                       b.options[0] = talloc_asprintf(mem_ctx, "%u", port);
+               } else {
+                       b.options[0] = dcerpc_pipes[i]->name;
+               }
+               b.options[1] = NULL;
+
+               lp_set_cmdline("torture:binding", dcerpc_binding_string(mem_ctx, &b));
+
                status = torture_rpc_connection(&p, 
                                                dcerpc_pipes[i]->name,
                                                DCERPC_MGMT_UUID,
@@ -188,8 +231,6 @@ BOOL torture_rpc_mgmt(int dummy)
                        continue;
                }
        
-               p->flags |= DCERPC_DEBUG_PRINT_BOTH;
-
                if (!test_is_server_listening(p, mem_ctx)) {
                        ret = False;
                }