spoolss-iremotewinspool-tests: Use more recent client OS version

Set torture test client info build, major, and minor
version numbers to Windows 7 and Windows Server 2008 R2 values

 buildnum: 7007
 major: 6
 minor: 1

Build number taken from
 [MS-RPRN] <168> Section 2.2.3.10.1

Major/Minor numbers taken from
 https://docs.microsoft.com/en-us/windows/desktop/sysinfo/operating-system-version

Signed-off-by: Justin Stephenson <jstephen@redhat.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Sat Sep  8 04:35:56 CEST 2018 on sn-devel-144

diff --git a/source4/torture/rpc/iremotewinspool.c b/source4/torture/rpc/iremotewinspool.c
index 805f46c8b89bcfff9d1b2d046df49c7f4df343f8..b4dbe71160e555ca53082c44226b26e08c6b042b 100644 (file)
--- a/source4/torture/rpc/iremotewinspool.c
+++ b/source4/torture/rpc/iremotewinspool.c
@@ -263,7 +263,7 @@ static bool torture_rpc_iremotewinspool_setup_common(struct torture_context *tct
 
        printer_name = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(t->iremotewinspool_pipe));
 
-       client_info = test_get_client_info(tctx, WIN_2000, 3, SPOOLSS_MINOR_VERSION_0);
+       client_info = test_get_client_info(tctx, WIN_7, 6, 1);
 
        torture_assert(tctx,
                test_AsyncOpenPrinter_byprinter(tctx, t,
@@ -323,7 +323,7 @@ static bool test_AsyncClosePrinter(struct torture_context *tctx,
 
        printer_name = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
 
-       client_info = test_get_client_info(tctx, WIN_2000, 3, SPOOLSS_MINOR_VERSION_0);
+       client_info = test_get_client_info(tctx, WIN_7, 6, 1);
 
        torture_assert(tctx,
                test_AsyncOpenPrinter_byprinter(tctx, ctx, p, printer_name, client_info, &handle),
@@ -349,7 +349,7 @@ static bool test_AsyncOpenPrinter(struct torture_context *tctx,
 
        printer_name = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
 
-       client_info = test_get_client_info(tctx, WIN_2000, 3, SPOOLSS_MINOR_VERSION_0);
+       client_info = test_get_client_info(tctx, WIN_7, 6, 1);
 
        torture_assert(tctx,
                test_AsyncOpenPrinter_byprinter(tctx, ctx, p, printer_name, client_info, &handle),
@@ -408,7 +408,7 @@ static bool test_AsyncOpenPrinterValidateBuildNumber(struct torture_context *tct
                "AsyncOpenPrinter should have failed");
 
        /* succeed with Windows 7 build number */
-       client_info = test_get_client_info(tctx, WIN_7, 3, SPOOLSS_MINOR_VERSION_0);
+       client_info = test_get_client_info(tctx, WIN_7, 6, 1);
        client_info_ctr.user_info.level1 = &client_info;
        r.in.pClientInfo        = &client_info_ctr;
 
@@ -1011,7 +1011,7 @@ static bool test_OpenPrinter(struct torture_context *tctx,
 
        printer_name = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
 
-       client_info = test_get_client_info(tctx, WIN_2000, 3, SPOOLSS_MINOR_VERSION_0);
+       client_info = test_get_client_info(tctx, WIN_7, 6, 1);
 
        torture_assert(tctx,
                test_AsyncOpenPrinter_byprinter(tctx, ctx, p, printer_name, client_info, &handle),

diff --git a/source4/torture/rpc/spoolss_access.c b/source4/torture/rpc/spoolss_access.c
index 28cecf08b149feb2a5464a64105e0af1dddb00fe..946b420b60a6ee74e0275328d4b552b3ec85093e 100644 (file)
--- a/source4/torture/rpc/spoolss_access.c
+++ b/source4/torture/rpc/spoolss_access.c
@@ -74,9 +74,10 @@ static bool test_openprinter_handle(struct torture_context *tctx,
        level1.size     = 28;
        level1.client   = talloc_asprintf(tctx, "\\\\%s", "smbtorture");
        level1.user     = username;
-       level1.build    = 1381;
-       level1.major    = 3;
-       level1.minor    = 0;
+       /* Windows 7 and Windows Server 2008 R2 */
+       level1.build    = 7007;
+       level1.major    = 6;
+       level1.minor    = 1;
        level1.processor= 0;
 
        r.in.printername        = printername;