[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-801-g8bba340

[Andrew Tridgell]

The branch, master has been updated
       via  8bba340e65e84ee09a7da4d97bc7838d3eefbb15 (commit)
       via  15a6a93d35e5be0ed24377006060ff66802d6844 (commit)
      from  46bd2271b24b2b6b68541e867c3e87f7d217267c (commit)

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


- Log -----------------------------------------------------------------
commit 8bba340e65e84ee09a7da4d97bc7838d3eefbb15
Author: Andrew Tridgell <tridge at samba.org>
Date:   Wed Aug 5 12:07:21 2009 +1000

    s4 now supports the large readx extension

commit 15a6a93d35e5be0ed24377006060ff66802d6844
Author: Andrew Tridgell <tridge at samba.org>
Date:   Wed Aug 5 12:07:08 2009 +1000

    fixed the sense of the pvfs_acl uwrap check

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

Summary of changes:
 source4/ntvfs/posix/pvfs_acl.c |    2 +-
 source4/torture/raw/read.c     |   17 +++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/ntvfs/posix/pvfs_acl.c b/source4/ntvfs/posix/pvfs_acl.c
index 2328839..203b6b1 100644
--- a/source4/ntvfs/posix/pvfs_acl.c
+++ b/source4/ntvfs/posix/pvfs_acl.c
@@ -473,7 +473,7 @@ NTSTATUS pvfs_access_check_unix(struct pvfs_state *pvfs,
 		max_bits |= SEC_STD_ALL;
 	}
 
-	if (!uwrap_enabled()) {
+	if (uwrap_enabled()) {
 		/* when running with the uid wrapper, files will be created
 		   owned by the ruid, but we may have a different simulated 
 		   euid. We need to force the permission bits as though the 
diff --git a/source4/torture/raw/read.c b/source4/torture/raw/read.c
index 4fd2cf5..f99da8f 100644
--- a/source4/torture/raw/read.c
+++ b/source4/torture/raw/read.c
@@ -499,8 +499,9 @@ static bool test_readx(struct torture_context *tctx, struct smbcli_state *cli)
 	CHECK_STATUS(status, NT_STATUS_OK);
 	CHECK_VALUE(io.readx.out.remaining, 0xFFFF);
 	CHECK_VALUE(io.readx.out.compaction_mode, 0);
-	if (torture_setting_bool(tctx, "samba3", false)) {
-		printf("SAMBA3: large read extension\n");
+	if (torture_setting_bool(tctx, "samba3", false) ||
+	    torture_setting_bool(tctx, "samba4", false)) {
+		printf("SAMBA: large read extension\n");
 		CHECK_VALUE(io.readx.out.nread, 80000);
 	} else {
 		CHECK_VALUE(io.readx.out.nread, 0);
@@ -543,8 +544,9 @@ static bool test_readx(struct torture_context *tctx, struct smbcli_state *cli)
 		io.readx.in.maxcnt = 0x10000;
 		status = smb_raw_read(cli->tree, &io);
 		CHECK_STATUS(status, NT_STATUS_OK);
-		if (torture_setting_bool(tctx, "samba3", false)) {
-			printf("SAMBA3: large read extension\n");
+		if (torture_setting_bool(tctx, "samba3", false) || 
+		    torture_setting_bool(tctx, "samba4", false)) {
+			printf("SAMBA: large read extension\n");
 			CHECK_VALUE(io.readx.out.nread, 0x10000);
 		} else {
 			CHECK_VALUE(io.readx.out.nread, 0);
@@ -553,12 +555,15 @@ static bool test_readx(struct torture_context *tctx, struct smbcli_state *cli)
 		io.readx.in.maxcnt = 0x10001;
 		status = smb_raw_read(cli->tree, &io);
 		CHECK_STATUS(status, NT_STATUS_OK);
-		if (torture_setting_bool(tctx, "samba3", false)) {
-			printf("SAMBA3: large read extension\n");
+		if (torture_setting_bool(tctx, "samba3", false) ||
+		    torture_setting_bool(tctx, "samba4", false)) {
+			printf("SAMBA: large read extension\n");
 			CHECK_VALUE(io.readx.out.nread, 0x10001);
 		} else {
 			CHECK_VALUE(io.readx.out.nread, 0);
 		}
+	} else {
+		printf("Server does not support the CAP_LARGE_READX extension\n");
 	}
 
 	printf("Trying locked region\n");


-- 
Samba Shared Repository