svn commit: samba r4559 - in branches/SAMBA_4_0/source/torture/rpc: .

[tridge at samba.org]

Author: tridge
Date: 2005-01-06 09:24:41 +0000 (Thu, 06 Jan 2005)
New Revision: 4559

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=4559

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

Modified:
   branches/SAMBA_4_0/source/torture/rpc/epmapper.c


Changeset:
Modified: branches/SAMBA_4_0/source/torture/rpc/epmapper.c
===================================================================
--- branches/SAMBA_4_0/source/torture/rpc/epmapper.c	2005-01-06 07:34:14 UTC (rev 4558)
+++ branches/SAMBA_4_0/source/torture/rpc/epmapper.c	2005-01-06 09:24:41 UTC (rev 4559)
@@ -225,8 +225,6 @@
 	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 @@
 
 	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 @@
 		}
 	} 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 @@
 
 	talloc_destroy(mem_ctx);
 
-    torture_rpc_close(p);
+	torture_rpc_close(p);
 
 	return ret;
 }