s4-smbtorture: in test_GetDriverInfo_winreg() always test level 6 for samba3 as

well.

Guenther

diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index 750783b3cb9f787b31dc1392fdc7b382e6e18917..a6b84c401295898bd2a11e72c4909b24a5a1f220 100644 (file)
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -4654,11 +4654,8 @@ static bool test_GetDriverInfo_winreg(struct torture_context *tctx,
                test_winreg_OpenKey(tctx, winreg_handle, hive_handle, driver_key, &key_handle),
                "failed to open driver key");
 
-       if (torture_setting_bool(tctx, "samba3", false)) {
-               goto try_level3;
-       }
-
-       if (torture_setting_bool(tctx, "w2k3", false)) {
+       if (torture_setting_bool(tctx, "samba3", false) ||
+           torture_setting_bool(tctx, "w2k3", false)) {
                goto try_level6;
        }
 
@@ -4762,8 +4759,6 @@ static bool test_GetDriverInfo_winreg(struct torture_context *tctx,
        test_dword("Version",                   info.info6.version);
 /*     test_dword("TempDir",                   ?); */
 
- try_level3:
-
        if (handle) {
                torture_assert(tctx,
                        test_GetPrinterDriver2_level(tctx, b, handle, driver_name, environment, 3, version, 0, &info, &result),