[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  5a56bc9... s3: Fix bug 5972 -- remove -L testparm parameter
      from  3f0562f... s3-spoolss: Fixed memory error in winreg_get_driver.

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


- Log -----------------------------------------------------------------
commit 5a56bc948ecf740591e898cdb45f0f0c2b0a4c84
Author: Volker Lendecke <vl at samba.org>
Date:   Wed May 5 17:44:00 2010 +0200

    s3: Fix bug 5972 -- remove -L testparm parameter
    
    Thanks to TAKAHASHI Motonobu <monyo at samba.gr.jp> to point out that this does
    not work and to agree it's not worth fixing :-)

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

Summary of changes:
 docs-xml/manpages-3/testparm.1.xml |    8 --------
 source3/utils/testparm.c           |    6 ------
 2 files changed, 0 insertions(+), 14 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages-3/testparm.1.xml b/docs-xml/manpages-3/testparm.1.xml
index d2ecc7b..4cc4e27 100644
--- a/docs-xml/manpages-3/testparm.1.xml
+++ b/docs-xml/manpages-3/testparm.1.xml
@@ -23,7 +23,6 @@
 		<arg choice="opt">-s</arg>
 		<arg choice="opt">-h</arg>
 		<arg choice="opt">-v</arg>
-		<arg choice="opt">-L &lt;servername&gt;</arg>
 		<arg choice="opt">-t &lt;encoding&gt;</arg>
 		<arg choice="req">config filename</arg>
 		<arg choice="opt">hostname hostIP</arg>
@@ -74,13 +73,6 @@
 		&stdarg.version;
 		
 		<varlistentry>
-		<term>-L servername</term>
-		<listitem><para>Sets the value of the %L macro to <replaceable>servername</replaceable>.
-		This is useful for testing include files specified with the 
-		%L macro. </para></listitem>
-		</varlistentry>
-
-		<varlistentry>
 		<term>-v</term>
 		<listitem><para>If this option is specified, testparm 
 		will also output all options that were not used in <citerefentry>
diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
index 73e173e..8ce0d58 100644
--- a/source3/utils/testparm.c
+++ b/source3/utils/testparm.c
@@ -325,7 +325,6 @@ rameter is ignored when using CUPS libraries.\n",
 	poptContext pc;
 	static char *parameter_name = NULL;
 	static const char *section_name = NULL;
-	static char *new_local_machine = NULL;
 	const char *cname;
 	const char *caddr;
 	static int show_defaults;
@@ -335,7 +334,6 @@ rameter is ignored when using CUPS libraries.\n",
 		POPT_AUTOHELP
 		{"suppress-prompt", 's', POPT_ARG_VAL, &silent_mode, 1, "Suppress prompt for enter"},
 		{"verbose", 'v', POPT_ARG_NONE, &show_defaults, 1, "Show default options too"},
-		{"server", 'L',POPT_ARG_STRING, &new_local_machine, 0, "Set %%L macro to servername\n"},
 		{"skip-logic-checks", 'l', POPT_ARG_NONE, &skip_logic_checks, 1, "Skip the global checks"},
 		{"show-all-parameters", '\0', POPT_ARG_VAL, &show_all_parameters, True, "Show the parameters, type, possible values" },
 		{"parameter-name", '\0', POPT_ARG_STRING, &parameter_name, 0, "Limit testparm to a named parameter" },
@@ -382,10 +380,6 @@ rameter is ignored when using CUPS libraries.\n",
 		goto done;
 	}
 
-	if (new_local_machine) {
-		set_local_machine_name(new_local_machine, True);
-	}
-
 	dbf = x_stderr;
 	/* Don't let the debuglevel be changed by smb.conf. */
 	AllowDebugChange = False;


-- 
Samba Shared Repository