[SCM] Samba Shared Repository - branch master updated

[Tim Prouty]

The branch, master has been updated
       via  7e49a58... s4 torture: Warn on NOT_IMPLEMENTED in addition to NOT_SUPPORTED for RAW-QFILEINFO
      from  2a0340b... s3:registry: remove unused function normalize_dbkey()

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


- Log -----------------------------------------------------------------
commit 7e49a58ab9a66a709ee2a15d40db7c59bf55cbac
Author: Aravind Srinivasan <aravind.srinivasan at isilon.com>
Date:   Tue Jun 22 10:42:20 2010 -0700

    s4 torture: Warn on NOT_IMPLEMENTED in addition to NOT_SUPPORTED for RAW-QFILEINFO
    
    Signed-off-by: Tim Prouty <tprouty at samba.org>

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

Summary of changes:
 source4/torture/raw/qfileinfo.c |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/torture/raw/qfileinfo.c b/source4/torture/raw/qfileinfo.c
index 12897ef..54f1d12 100644
--- a/source4/torture/raw/qfileinfo.c
+++ b/source4/torture/raw/qfileinfo.c
@@ -278,8 +278,10 @@ static bool torture_raw_qfileinfo_internals(struct torture_context *torture,
 				count++;
 			}
 			if (!levels[i].only_paths &&
+			   (NT_STATUS_EQUAL(levels[i].fnum_status,
+			    NT_STATUS_NOT_SUPPORTED) ||
 			    NT_STATUS_EQUAL(levels[i].fnum_status,
-			    NT_STATUS_NOT_SUPPORTED)) {
+			    NT_STATUS_NOT_IMPLEMENTED))) {
 				torture_warning(torture, "fnum level %s %s",
 					levels[i].name,
 					nt_errstr(levels[i].fnum_status));
@@ -293,8 +295,10 @@ static bool torture_raw_qfileinfo_internals(struct torture_context *torture,
 			}
 		} else {
 			if (!levels[i].only_paths &&
+			   (NT_STATUS_EQUAL(levels[i].fnum_status,
+			    NT_STATUS_NOT_SUPPORTED) ||
 			    NT_STATUS_EQUAL(levels[i].fnum_status,
-			    NT_STATUS_NOT_SUPPORTED)) {
+			    NT_STATUS_NOT_IMPLEMENTED))) {
 				torture_warning(torture, "fnum level %s %s",
 					levels[i].name,
 					nt_errstr(levels[i].fnum_status));
@@ -302,8 +306,10 @@ static bool torture_raw_qfileinfo_internals(struct torture_context *torture,
 			}
 
 			if (!levels[i].only_handles &&
+			   (NT_STATUS_EQUAL(levels[i].fname_status,
+			    NT_STATUS_NOT_SUPPORTED) ||
 			    NT_STATUS_EQUAL(levels[i].fname_status,
-			    NT_STATUS_NOT_SUPPORTED)) {
+			    NT_STATUS_NOT_IMPLEMENTED))) {
                                 torture_warning(torture, "fname level %s %s",
 					levels[i].name,
 					nt_errstr(levels[i].fname_status));


-- 
Samba Shared Repository