s4-smbtorture: w2k8r2 allows to add printers w/o defining printprocessor.

Guenther

diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index e233a2752de79f39328f78ae4994bf7eb0b79a44..5303c942ce557f7eb65f17372432b5c426ea22f3 100644 (file)
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -3815,17 +3815,22 @@ static bool test_AddPrinter_normal(struct torture_context *tctx,
                                              dcerpc_spoolss_AddPrinter(p, tctx, &r),
                "failed to add printer");
        result = ex ? rex.out.result : r.out.result;
-       torture_assert_werr_equal(tctx, result, WERR_UNKNOWN_PRINTPROCESSOR,
-               "unexpected result code");
 
-       info2.printprocessor = "winprint";
+       /* w2k8r2 allows to add printer w/o defining printprocessor */
 
-       torture_assert_ntstatus_ok(tctx, ex ? dcerpc_spoolss_AddPrinterEx(p, tctx, &rex) :
-                                             dcerpc_spoolss_AddPrinter(p, tctx, &r),
-               "failed to add printer");
-       result = ex ? rex.out.result : r.out.result;
-       torture_assert_werr_ok(tctx, result,
-               "failed to add printer");
+       if (!W_ERROR_IS_OK(result)) {
+               torture_assert_werr_equal(tctx, result, WERR_UNKNOWN_PRINTPROCESSOR,
+                       "unexpected result code");
+
+               info2.printprocessor = "winprint";
+
+               torture_assert_ntstatus_ok(tctx, ex ? dcerpc_spoolss_AddPrinterEx(p, tctx, &rex) :
+                                                     dcerpc_spoolss_AddPrinter(p, tctx, &r),
+                       "failed to add printer");
+               result = ex ? rex.out.result : r.out.result;
+               torture_assert_werr_ok(tctx, result,
+                       "failed to add printer");
+       }
 
        *handle_p = handle;