[SCM] Samba Shared Repository - branch master updated

James Peach jpeach at samba.org
Fri Jul 16 12:24:33 MDT 2010

The branch, master has been updated
       via  ec25a00... smbtorture shell: Allow any config option to be set.
      from  e058de3... Make the "map to guest" parameter work correctly with NTLMSSP (spnego and raw) under SMB2. Still need to investigate fixing this with krb5 auth (does this make sense ?).


- Log -----------------------------------------------------------------
commit ec25a000317f863df7af0d97f1fd8948b2f8959d
Author: James Peach <jpeach at samba.org>
Date:   Fri Jul 16 11:07:31 2010 -0700

    smbtorture shell: Allow any config option to be set.
    Not sure what I was thinking by restricting the shell to "torture:"
    parametric options. It's really extemely useful to be able to set
    arbitrary options.


Summary of changes:
 source4/torture/shell.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

Changeset truncated at 500 lines:

diff --git a/source4/torture/shell.c b/source4/torture/shell.c
index 7c313af..03c670a 100644
--- a/source4/torture/shell.c
+++ b/source4/torture/shell.c
@@ -175,8 +175,6 @@ static void shell_help(const struct shell_command * command,
 static void shell_set(const struct shell_command *command,
 	struct torture_context *tctx, int argc, const char **argv)
-	char * name;
 	switch (argc) {
 	case 0:
 	    lpcfg_dump(tctx->lp_ctx, stdout,
@@ -185,9 +183,12 @@ static void shell_set(const struct shell_command *command,
 	case 2:
-	    name = talloc_asprintf(NULL, "torture:%s", argv[0]);
-	    lpcfg_set_cmdline(tctx->lp_ctx, name, argv[1]);
-	    talloc_free(name);
+	    /* We want to allow users to set any config option. Top level
+	     * options will get checked against their static definition, but
+	     * parametric options can't be checked and will just get stashed
+	     * as they are provided.
+	     */
+	    lpcfg_set_cmdline(tctx->lp_ctx, argv[0], argv[1]);

Samba Shared Repository

More information about the samba-cvs mailing list