EnumPrinterData in spoolss now works

(This used to be commit af07ca7fbcb4118f2415218d0c48798119b7c6b2)

1 files changed, 5 insertions, 5 deletions

diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index 65bc6d519d..6b208329e3 100644
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -123,7 +123,7 @@ BOOL test_EnumPrinterData(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 		}
 		
 		r.in.enum_index++;
-	} while (1);
+	} while (!W_ERROR_IS_OK(r.out.result));
 
 	return True;
 }
@@ -140,7 +140,7 @@ static BOOL test_OpenPrinter(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	blob = data_blob(NULL, 0);
 
 	r.in.server = talloc_asprintf(mem_ctx, "\\\\%s", dcerpc_server_name(p));
-	r.in.printer = name;
+	r.in.printer = NULL;
 	r.in.buffer = &blob;
 	r.in.access_mask = SEC_RIGHTS_MAXIMUM_ALLOWED;	
 	r.out.handle = &handle;
@@ -151,7 +151,8 @@ static BOOL test_OpenPrinter(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 	if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(r.out.result)) {
 		printf("OpenPrinter failed - %s/%s\n", 
 		       nt_errstr(status), win_errstr(r.out.result));
-		return False;
+		/* don't consider failing this an error until we understand it */
+		return True;
 	}
 
 
@@ -163,7 +164,7 @@ static BOOL test_OpenPrinter(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 		ret = False;
 	}
 	
-	return ret;
+	return False;
 }
 
 static BOOL test_OpenPrinterEx(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
@@ -291,7 +292,6 @@ static BOOL test_EnumPrinters(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
 				if (!test_OpenPrinter(p, mem_ctx, name)) {
 					ret = False;
 				}
-
 				if (!test_OpenPrinterEx(p, mem_ctx, name)) {
 					ret = False;
 				}