[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  e25f830 selftest: samba3.smbtorture_s3.LOCAL-TALLOC-DICT works now
       via  100b92b s3:torture: fix segfault in LOCAL-TALLOC-DICT
       via  57ddd38 s3:torture: talloc_dict_traverse() returns the number of entries
      from  8af7dad selftest.run: Use subunit version of iso8601.

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


- Log -----------------------------------------------------------------
commit e25f830f1df323607999179e00a5a39197bf02ea
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Mar 13 08:25:58 2012 +0100

    selftest: samba3.smbtorture_s3.LOCAL-TALLOC-DICT works now
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Tue Mar 13 10:38:20 CET 2012 on sn-devel-104

commit 100b92b2cc09d291daf8d6074e915dbad084f907
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Mar 13 08:22:03 2012 +0100

    s3:torture: fix segfault in LOCAL-TALLOC-DICT
    
    talloc_dict_set() expects a pointer to an talloc'ed pointer.
    
    metze

commit 57ddd38c1a7791093531217a3adb15484c74f18c
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Mar 13 08:21:15 2012 +0100

    s3:torture: talloc_dict_traverse() returns the number of entries
    
    metze

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

Summary of changes:
 selftest/knownfail        |    1 -
 source3/torture/torture.c |   13 ++++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/knownfail b/selftest/knownfail
index e61e4f4..959e3d2 100644
--- a/selftest/knownfail
+++ b/selftest/knownfail
@@ -6,7 +6,6 @@
 
 ^samba3.blackbox.failure.failure # this is designed to fail, for testing our test infrastructure
 .*driver.add_driver_timestamps # we only can store dates, not timestamps
-^samba3.smbtorture_s3.LOCAL-TALLOC-DICT #fails
 ^samba3.smbtorture_s3.plain\(dc\).LOCK9 # Fails against the s4 ntvfs server
 ^samba3.smbtorture_s3.plain\(dc\).OPLOCK2 # Fails against the s4 ntvfs server
 ^samba3.smbtorture_s3.plain\(dc\).STREAMERROR # Fails against the s4 ntvfs server
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 99896ec..e2a2744 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -7970,7 +7970,8 @@ static bool run_local_talloc_dict(int dummy)
 {
 	struct talloc_dict *dict;
 	struct talloc_dict_test *t;
-	int key, count;
+	int key, count, res;
+	bool ok;
 
 	dict = talloc_dict_init(talloc_tos());
 	if (dict == NULL) {
@@ -7984,12 +7985,14 @@ static bool run_local_talloc_dict(int dummy)
 
 	key = 1;
 	t->content = 1;
-	if (!talloc_dict_set(dict, data_blob_const(&key, sizeof(key)), t)) {
+	ok = talloc_dict_set(dict, data_blob_const(&key, sizeof(key)), &t);
+	if (!ok) {
 		return false;
 	}
 
 	count = 0;
-	if (talloc_dict_traverse(dict, talloc_dict_traverse_fn, &count) != 0) {
+	res = talloc_dict_traverse(dict, talloc_dict_traverse_fn, &count);
+	if (res == -1) {
 		return false;
 	}
 
@@ -7997,6 +8000,10 @@ static bool run_local_talloc_dict(int dummy)
 		return false;
 	}
 
+	if (count != res) {
+		return false;
+	}
+
 	TALLOC_FREE(dict);
 
 	return true;


-- 
Samba Shared Repository