[SCM] Samba Shared Repository - branch master updated

[James Peach]

The branch, master has been updated
       via  44de839... smbtorture: Don't crash RAW-QFILEINFO if there's no alternate name.
       via  88d48a7... smbtorture: Make BASE-OPENATTR report a failure if it fails.
      from  c43e832... s3-waf: fix the waf build with more recent MIT krb5 libs.

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


- Log -----------------------------------------------------------------
commit 44de839dabb6062d524ddc0001ca23fb8505e643
Author: James Peach <jpeach at samba.org>
Date:   Fri Aug 6 15:21:31 2010 -0700

    smbtorture: Don't crash RAW-QFILEINFO if there's no alternate name.

commit 88d48a7d92ca7dedc5357a1e7caab544e586bafb
Author: James Peach <jpeach at samba.org>
Date:   Fri Aug 6 15:25:12 2010 -0700

    smbtorture: Make BASE-OPENATTR report a failure if it fails.

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

Summary of changes:
 source4/torture/basic/attr.c    |    6 ++++--
 source4/torture/raw/qfileinfo.c |    5 +++++
 2 files changed, 9 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/torture/basic/attr.c b/source4/torture/basic/attr.c
index 49e8a59..66d17b4 100644
--- a/source4/torture/basic/attr.c
+++ b/source4/torture/basic/attr.c
@@ -121,7 +121,8 @@ bool torture_openattrtest(struct torture_context *tctx,
 			if (fnum1 == -1) {
 				for (l = 0; l < ARRAY_SIZE(attr_results); l++) {
 					if (attr_results[l].num == k) {
-						torture_comment(tctx, "[%d] trunc open 0x%x -> 0x%x of %s failed - should have succeeded !(%s)\n",
+						torture_result(tctx, TORTURE_FAIL,
+								"[%d] trunc open 0x%x -> 0x%x of %s failed - should have succeeded !(%s)",
 								k, open_attrs_table[i],
 								open_attrs_table[j],
 								fname, smbcli_errstr(cli1->tree));
@@ -160,7 +161,8 @@ bool torture_openattrtest(struct torture_context *tctx,
 					if (attr != attr_results[l].result_attr ||
 					    open_attrs_table[i] != attr_results[l].init_attr ||
 					    open_attrs_table[j] != attr_results[l].trunc_attr) {
-						torture_comment(tctx, "[%d] getatr check failed. [0x%x] trunc [0x%x] got attr 0x%x, should be 0x%x\n",
+						torture_result(tctx, TORTURE_FAIL,
+							"[%d] getatr check failed. [0x%x] trunc [0x%x] got attr 0x%x, should be 0x%x",
 						       k, open_attrs_table[i],
 						       open_attrs_table[j],
 						       (unsigned int)attr,
diff --git a/source4/torture/raw/qfileinfo.c b/source4/torture/raw/qfileinfo.c
index 54f1d12..2a5a2e7 100644
--- a/source4/torture/raw/qfileinfo.c
+++ b/source4/torture/raw/qfileinfo.c
@@ -667,6 +667,11 @@ static bool torture_raw_qfileinfo_internals(struct torture_context *torture,
 	s1 = fnum_find("ALT_NAME_INFO");
 	if (s1) {
 		correct_name = s1->alt_name_info.out.fname.s;
+	}
+
+	if (!correct_name) {
+		torture_comment(torture, "no alternate name information\n");
+	} else {
 		torture_comment(torture, "alt_name: %s\n", correct_name);
 		
 		NAME_CHECK("ALT_NAME_INFO",        alt_name_info, fname, STR_UNICODE);


-- 
Samba Shared Repository