[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  5eedaae... s4-smbtorture: skip winreg symlink test against Samba in RPC-SPOOLSS.
       via  bc2e675... s4-smbtorture: make sure to check for result of spoolss_GetJob tests.
      from  357006b... s3-spoolss: Fix two uninitialized vars in spoolss util code.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 5eedaaea43a7f141960cfffc62116655f1117de8
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 9 19:54:31 2010 +0200

    s4-smbtorture: skip winreg symlink test against Samba in RPC-SPOOLSS.
    
    Guenther

commit bc2e675c3a5272953fb5b4f2e39ab2c164868fab
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 9 19:53:31 2010 +0200

    s4-smbtorture: make sure to check for result of spoolss_GetJob tests.
    
    This avoids returning potentially uninitialised data. Thanks Andreas for
    pointing this out.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source4/torture/rpc/spoolss.c |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index 1517b4d..4f4e732 100644
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -2784,12 +2784,13 @@ static bool test_GetJob_args(struct torture_context *tctx,
 
 		status = dcerpc_spoolss_GetJob_r(b, tctx, &r);
 		torture_assert_ntstatus_ok(tctx, status, "GetJob failed");
-		torture_assert_werr_ok(tctx, r.out.result, "GetJob failed");
-		torture_assert(tctx, r.out.info, "No job info returned");
-
-		CHECK_NEEDED_SIZE_LEVEL(spoolss_JobInfo, r.out.info, r.in.level, lp_iconv_convenience(tctx->lp_ctx), needed, 4);
 	}
 
+	torture_assert_werr_ok(tctx, r.out.result, "GetJob failed");
+	torture_assert(tctx, r.out.info, "No job info returned");
+
+	CHECK_NEEDED_SIZE_LEVEL(spoolss_JobInfo, r.out.info, r.in.level, lp_iconv_convenience(tctx->lp_ctx), needed, 4);
+
 	if (info_p) {
 		*info_p = *r.out.info;
 	}
@@ -3870,6 +3871,10 @@ static bool test_winreg_symbolic_link(struct torture_context *tctx,
 	DATA_BLOB blob;
 	const char *str;
 
+	if (torture_setting_bool(tctx, "samba3", false)) {
+		torture_skip(tctx, "skip winreg symlink test against samba");
+	}
+
 	torture_assert(tctx,
 		test_winreg_OpenKey_opts(tctx, b, handle, symlink_keyname, REG_OPTION_OPEN_LINK, &key_handle),
 			"failed to open key link");


-- 
Samba Shared Repository