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

[metze at samba.org]

Author: metze
Date: 2005-06-16 16:46:42 +0000 (Thu, 16 Jun 2005)
New Revision: 7642

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

Log:
- test NULL server_name in GetPrinterDriverDirectory() too, (same result as "")
- test EnumForms() on the PrintServer (NT4 returns WERR_BADFID)
  (jerry: how do it get the lists of forms in the printserver gui)

metze
Modified:
   branches/SAMBA_4_0/source/torture/rpc/spoolss.c


Changeset:
Modified: branches/SAMBA_4_0/source/torture/rpc/spoolss.c
===================================================================
--- branches/SAMBA_4_0/source/torture/rpc/spoolss.c	2005-06-16 16:43:23 UTC (rev 7641)
+++ branches/SAMBA_4_0/source/torture/rpc/spoolss.c	2005-06-16 16:46:42 UTC (rev 7642)
@@ -220,6 +220,9 @@
 		const char *server;
 	} levels[] = {{
 			.level	= 1,
+			.server	= NULL
+		},{
+			.level	= 1,
 			.server	= ""
 		},{
 			.level	= 78,
@@ -846,7 +849,7 @@
 }
 
 static BOOL test_EnumForms(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
-		    struct policy_handle *handle)
+		    struct policy_handle *handle, BOOL print_server)
 {
 	NTSTATUS status;
 	struct spoolss_EnumForms r;
@@ -864,6 +867,11 @@
 		return False;
 	}
 
+	if (print_server && W_ERROR_EQUAL(r.out.result,WERR_BADFID)) {
+		printf("EnumForms on the PrintServer isn't supported by test server (NT4)\n");
+		return True;
+	}
+
 	if (W_ERROR_EQUAL(r.out.result, WERR_INSUFFICIENT_BUFFER)) {
 		union spoolss_FormInfo *info;
 		int j;
@@ -1809,7 +1817,7 @@
 		ret = False;
 	}
 
-	if (!test_EnumForms(p, mem_ctx, &handle)) {
+	if (!test_EnumForms(p, mem_ctx, &handle, False)) {
 		ret = False;
 	}
 
@@ -2064,6 +2072,8 @@
 	ret &= test_GetPrinterData(ctx->p, ctx, &ctx->server_handle, "Architecture");
 	ret &= test_GetPrinterData(ctx->p, ctx, &ctx->server_handle, "DsPresent");
 
+	ret &= test_EnumForms(ctx->p, ctx, &ctx->server_handle, True);
+
 	ret &= test_EnumPorts(ctx);
 
 	ret &= test_GetPrinterDriverDirectory(ctx);