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

[vlendec at samba.org]

Author: vlendec
Date: 2006-10-06 19:02:02 +0000 (Fri, 06 Oct 2006)
New Revision: 19153

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

Log:
Simple consistency check for enumprinters level 2 as well
Modified:
   branches/SAMBA_4_0/source/torture/rpc/samba3rpc.c


Changeset:
Modified: branches/SAMBA_4_0/source/torture/rpc/samba3rpc.c
===================================================================
--- branches/SAMBA_4_0/source/torture/rpc/samba3rpc.c	2006-10-06 18:50:48 UTC (rev 19152)
+++ branches/SAMBA_4_0/source/torture/rpc/samba3rpc.c	2006-10-06 19:02:02 UTC (rev 19153)
@@ -2238,7 +2238,7 @@
 
 	r.in.flags = PRINTER_ENUM_LOCAL;
 	r.in.server = "\\\\localhost";
-	r.in.level = 1;
+	r.in.level = level;
 	r.in.buffer = NULL;
 	r.in.offered = 0;
 
@@ -2517,13 +2517,29 @@
 		}
 		if (num_printers != num_enumerated) {
 			d_printf("(%s) netshareenum gave %d printers, "
-				 "enumprinters gave %d\n", __location__,
+				 "enumprinters lvl 1 gave %d\n", __location__,
 				 num_printers, num_enumerated);
 			talloc_free(mem_ctx);
 			return False;
 		}
 	}
 
+	{
+		int num_enumerated;
+		if (!enumprinters(mem_ctx, p, 2, &num_enumerated)) {
+			d_printf("(%s) enumprinters failed\n", __location__);
+			talloc_free(mem_ctx);
+			return False;
+		}
+		if (num_printers != num_enumerated) {
+			d_printf("(%s) netshareenum gave %d printers, "
+				 "enumprinters lvl 2 gave %d\n", __location__,
+				 num_printers, num_enumerated);
+			talloc_free(mem_ctx);
+			return False;
+		}
+	}
+
 	talloc_free(mem_ctx);
 
 	return ret;