[SCM] Samba Shared Repository - branch master updated

[Michael Adam]

The branch, master has been updated
       via  6148c94 s3:smbtorture: align explanations for parameters
       via  48c12a2 s3:smbtorture: mention "-e" in the help text
       via  febde16 selftst: run the smbtorture3 local tests in the "none" environment
      from  68e5fa5 WHATSNEW: Mention combined CTDB

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


- Log -----------------------------------------------------------------
commit 6148c948d194c7e4bffc6407a5948b286f0b725c
Author: Michael Adam <obnox at samba.org>
Date:   Mon Sep 22 01:28:19 2014 +0200

    s3:smbtorture: align explanations for parameters
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    
    Autobuild-User(master): Michael Adam <obnox at samba.org>
    Autobuild-Date(master): Mon Sep 22 10:31:55 CEST 2014 on sn-devel-104

commit 48c12a2ce04b8c08eea4f59213512eb0b2f95443
Author: Michael Adam <obnox at samba.org>
Date:   Mon Sep 22 01:27:33 2014 +0200

    s3:smbtorture: mention "-e" in the help text
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>

commit febde1653a8ddf4ae61271a75f8b915d127989aa
Author: Michael Adam <obnox at samba.org>
Date:   Mon Sep 22 01:24:49 2014 +0200

    selftst: run the smbtorture3 local tests in the "none" environment
    
    Signed-off-by: Michael Adam <obnox at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>

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

Summary of changes:
 source3/selftest/tests.py |    2 +-
 source3/torture/torture.c |    7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 126c26c..f3ecdff 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -114,7 +114,7 @@ local_tests = [
     "LOCAL-remove_duplicate_addrs2"]
 
 for t in local_tests:
-    plantestsuite("samba3.smbtorture_s3.%s" % t, "s3dc", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/tmp', '$USERNAME', '$PASSWORD', smbtorture3, "-e"])
+    plantestsuite("samba3.smbtorture_s3.%s" % t, "none", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//foo/bar', '""', '""', smbtorture3, ""])
 
 plantestsuite("samba.vfstest.stream_depot", "s3dc:local", [os.path.join(samba3srcdir, "script/tests/stream-depot/run.sh"), binpath("vfstest"), "$PREFIX", configuration])
 plantestsuite("samba.vfstest.xattr-tdb-1", "s3dc:local", [os.path.join(samba3srcdir, "script/tests/xattr-tdb-1/run.sh"), binpath("vfstest"), "$PREFIX", configuration])
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 987b23c..799afc7 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -9701,7 +9701,7 @@ static void usage(void)
 
 	printf("\t-d debuglevel\n");
 	printf("\t-U user%%pass\n");
-	printf("\t-k               use kerberos\n");
+	printf("\t-k                    use kerberos\n");
 	printf("\t-N numprocs\n");
 	printf("\t-n my_netbios_name\n");
 	printf("\t-W workgroup\n");
@@ -9709,12 +9709,13 @@ static void usage(void)
 	printf("\t-O socket_options\n");
 	printf("\t-m maximum protocol\n");
 	printf("\t-L use oplocks\n");
-	printf("\t-c CLIENT.TXT   specify client load file for NBENCH\n");
+	printf("\t-c CLIENT.TXT         specify client load file for NBENCH\n");
 	printf("\t-A showall\n");
 	printf("\t-p port\n");
 	printf("\t-s seed\n");
 	printf("\t-b unclist_filename   specify multiple shares for multiple connections\n");
-	printf("\t-f filename   filename to test\n");
+	printf("\t-f filename           filename to test\n");
+	printf("\t-e                    encrypt\n");
 	printf("\n\n");
 
 	printf("tests are:");


-- 
Samba Shared Repository