r4559: prevent the RPC-EPMAPPER test from looping forever against w2k3

diff --git a/source/torture/rpc/epmapper.c b/source/torture/rpc/epmapper.c
index 68a6f6ba62998981d03070f4d75b8c4d277f2c30..b649c6d377a95c2796abb04663c55bdda92c8e34 100644 (file)
--- a/source/torture/rpc/epmapper.c
+++ b/source/torture/rpc/epmapper.c
@@ -225,8 +225,6 @@ static BOOL test_Lookup(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
        struct rpc_if_id_t iface;
        struct policy_handle handle;
 
-       ZERO_STRUCT(uuid);
-       ZERO_STRUCT(iface);
        ZERO_STRUCT(handle);
 
        r.in.inquiry_type = 0;
@@ -239,10 +237,18 @@ static BOOL test_Lookup(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 
        do {
                int i;
+
+               ZERO_STRUCT(uuid);
+               ZERO_STRUCT(iface);
+
                status = dcerpc_epm_Lookup(p, mem_ctx, &r);
                if (!NT_STATUS_IS_OK(status) || r.out.result != 0) {
                        break;
                }
+
+               printf("epm_Lookup returned %d events GUID %s\n", 
+                      r.out.num_ents, GUID_string(mem_ctx, &handle.uuid));
+
                for (i=0;i<r.out.num_ents;i++) {
                        printf("\nFound '%s'\n", r.out.entries[i].annotation);
                        display_tower(mem_ctx, &r.out.entries[i].tower->tower);
@@ -252,7 +258,8 @@ static BOOL test_Lookup(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
                }
        } while (NT_STATUS_IS_OK(status) && 
                 r.out.result == 0 && 
-                r.out.num_ents == r.in.max_ents);
+                r.out.num_ents == r.in.max_ents &&
+                !policy_handle_empty(&handle));
 
        if (!NT_STATUS_IS_OK(status)) {
                printf("Lookup failed - %s\n", nt_errstr(status));
@@ -307,7 +314,7 @@ BOOL torture_rpc_epmapper(void)
 
        talloc_destroy(mem_ctx);
 
-    torture_rpc_close(p);
+       torture_rpc_close(p);
 
        return ret;
 }