diff options
| author | Günther Deschner <gd@samba.org> | 2010-12-24 01:25:04 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2011-01-04 10:33:56 +0100 |
| commit | 69174fea5b2c580356693d33b2ab980a44a34259 (patch) | |
| tree | e54eea43736df5b227e0c87e432cdf6bd661969c /source4 | |
| parent | 19a295dee8b9b9b9844c564fb5b856c7268f650a (diff) | |
| download | samba-69174fea5b2c580356693d33b2ab980a44a34259.tar.gz samba-69174fea5b2c580356693d33b2ab980a44a34259.tar.bz2 samba-69174fea5b2c580356693d33b2ab980a44a34259.zip | |
s4-smbtorture: in test_GetDriverInfo_winreg() always test level 6 for samba3 as
well.
Guenther
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/torture/rpc/spoolss.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c index 750783b3cb..a6b84c4012 100644 --- 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), |