[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  3fd5ac6... s4-smbtorture: only look at DATA_BLOB pointer when einfo[0].data_length > 0.
      from  20d85d5... Added regression test for bug #7234 -  Symlink delete fails but incorrectly reports success.

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


- Log -----------------------------------------------------------------
commit 3fd5ac63443717fd596546602d2e5477923f8f3d
Author: Günther Deschner <gd at samba.org>
Date:   Thu Mar 11 00:07:00 2010 +0100

    s4-smbtorture: only look at DATA_BLOB pointer when einfo[0].data_length > 0.
    
    Guenther

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

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


Changeset truncated at 500 lines:

diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index 4ff79f2..c66ca84 100644
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -3491,7 +3491,9 @@ static bool test_SetPrinterDataEx_matrix(struct torture_context *tctx,
 		torture_assert_int_equal(tctx, einfo[0].value_name_len, strlen_m_term(value_name)*2, "unexpected value_name_len");
 		torture_assert_int_equal(tctx, einfo[0].type, types[t], "type mismatch");
 		torture_assert_int_equal(tctx, einfo[0].data_length, offered, "size mismatch");
-		torture_assert_mem_equal(tctx, einfo[0].data->data, data.data, offered, "buffer mismatch");
+		if (einfo[0].data_length > 0) {
+			torture_assert_mem_equal(tctx, einfo[0].data->data, data.data, offered, "buffer mismatch");
+		}
 
 		if (winreg_pipe && hive_handle) {
 			const char *printer_key;


-- 
Samba Shared Repository