[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-1097-g0356f0e

[Jeremy Allison]

The branch, v3-2-test has been updated
       via  0356f0efc4a18230ce7a9c0a17dc98c4242ad38d (commit)
       via  3a45f62310faf63cd6864d2cb10f941492eda818 (commit)
       via  656c9d0844e3d9d87ae768fe5a5538759b94d953 (commit)
      from  54ee718957b768a06e41857b96f0b5e18b3ca6a4 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 0356f0efc4a18230ce7a9c0a17dc98c4242ad38d
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Jan 4 19:09:46 2008 -0800

    Try and fix the buildfarm. There's a scripting error and
    I'm hoping this is it...
    Jeremy.

commit 3a45f62310faf63cd6864d2cb10f941492eda818
Merge: 656c9d0844e3d9d87ae768fe5a5538759b94d953 54ee718957b768a06e41857b96f0b5e18b3ca6a4
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Jan 4 19:06:37 2008 -0800

    Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test

commit 656c9d0844e3d9d87ae768fe5a5538759b94d953
Author: Jeremy Allison <jra at samba.org>
Date:   Sun Dec 30 18:05:33 2007 -0800

    We may use 127k read/write for encrypted connections.
    Jeremy.

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

Summary of changes:
 source/client/client.c                   |    4 ++--
 source/script/tests/test_smbclient_s3.sh |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/client/client.c b/source/client/client.c
index d10e632..a5e4a38 100644
--- a/source/client/client.c
+++ b/source/client/client.c
@@ -3798,7 +3798,7 @@ int cmd_iosize(void)
 			d_printf("iosize <n> or iosize 0x<n>. "
 				"(Encrypted connection) ,"
 				"Minimum is 16384 (0x4000), "
-				"max is 64512 (0xFC00)\n");
+				"max is 130048 (0x1FC00)\n");
 		}
 		return 1;
 	}
@@ -3807,7 +3807,7 @@ int cmd_iosize(void)
 	if (smb_encrypt && (iosize < 0x4000 || iosize > 0xFC00)) {
 		d_printf("iosize out of range for encrypted "
 			"connection (min = 16384 (0x4000), "
-			"max = 64512 (0xFC00)");
+			"max = 130048 (0x1FC00)");
 		return 1;
 	} else if (!smb_encrypt && (iosize < 0x4000 || iosize > 0xFFFF00)) {
 		d_printf("iosize out of range (min = 16384 (0x4000), "
diff --git a/source/script/tests/test_smbclient_s3.sh b/source/script/tests/test_smbclient_s3.sh
index 8bf9cd1..c10aed0 100755
--- a/source/script/tests/test_smbclient_s3.sh
+++ b/source/script/tests/test_smbclient_s3.sh
@@ -12,7 +12,7 @@ fi
 SERVER="$1"
 SERVER_IP="$2"
 SMBCLIENT="$VALGRIND ${SMBCLIENT:-$BINDIR/smbclient} $CONFIGURATION"
-shift 3
+shift 2
 ADDARGS="$*"
 
 incdir=`dirname $0`


-- 
Samba Shared Repository