[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-835-g7f2421f

[Andrew Tridgell]

The branch, v4-0-test has been updated
       via  7f2421f17cae313d7dbf5c35c73b5410cb1d5db0 (commit)
       via  eea486d8942fdda769684fa6e825c0f899cf3304 (commit)
      from  716345fd38dfd8c6e610fbd6ba84c4f33e3edbb9 (commit)

http://gitweb.samba.org/?samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 7f2421f17cae313d7dbf5c35c73b5410cb1d5db0
Author: Andrew Tridgell <tridge at samba.org>
Date:   Fri Feb 15 16:53:10 2008 +1100

    remove redundent code

commit eea486d8942fdda769684fa6e825c0f899cf3304
Author: Andrew Tridgell <tridge at samba.org>
Date:   Fri Feb 15 16:52:57 2008 +1100

    fixed some options that could not be overridden on the command line

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

Summary of changes:
 source/torture/gentest.c  |   13 +++----------
 source/torture/locktest.c |    3 ---
 2 files changed, 3 insertions(+), 13 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/torture/gentest.c b/source/torture/gentest.c
index 28cac81..d5fc855 100644
--- a/source/torture/gentest.c
+++ b/source/torture/gentest.c
@@ -2200,6 +2200,9 @@ static bool split_unc_name(const char *unc, char **server, char **share)
 
 	setlinebuf(stdout);
 	options.seed = time(NULL);
+	options.numops = 1000;
+	options.max_open_handles = 20;
+	options.seeds_file = "gentest_seeds.dat";
 
 	pc = poptGetContext("gentest", argc, (const char **) argv, long_options, 
 			    POPT_CONTEXT_KEEP_FIRST);
@@ -2265,16 +2268,6 @@ static bool split_unc_name(const char *unc, char **server, char **share)
 		}
 	}
 
-	argc -= NSERVERS;
-	argv += NSERVERS;
-
-	lp_load(lp_ctx, dyn_CONFIGFILE);
-
-	options.seed = time(NULL);
-	options.numops = 1000;
-	options.max_open_handles = 20;
-	options.seeds_file = "gentest_seeds.dat";
-
 	if (username_count == 0) {
 		usage(pc);
 		return -1;
diff --git a/source/torture/locktest.c b/source/torture/locktest.c
index 039484a..618568a 100644
--- a/source/torture/locktest.c
+++ b/source/torture/locktest.c
@@ -633,9 +633,6 @@ static void usage(poptContext pc)
 
 	gensec_init(lp_ctx);
 
-	argc -= optind;
-	argv += optind;
-
 	DEBUG(0,("seed=%u base=%d range=%d min_length=%d\n", 
 		 seed, lock_base, lock_range, min_length));
 	srandom(seed);


-- 
Samba Shared Repository