diff options
| author | Volker Lendecke <vl@samba.org> | 2010-05-05 17:44:00 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-05-05 18:07:45 +0200 |
| commit | 5a56bc948ecf740591e898cdb45f0f0c2b0a4c84 (patch) | |
| tree | 71925ffb712e35559125ae8b050c992332493319 | |
| parent | 3f0562f4b4cfe770baf2e529a445404a7b8f1141 (diff) | |
| download | samba-5a56bc948ecf740591e898cdb45f0f0c2b0a4c84.tar.gz samba-5a56bc948ecf740591e898cdb45f0f0c2b0a4c84.tar.bz2 samba-5a56bc948ecf740591e898cdb45f0f0c2b0a4c84.zip | |
s3: Fix bug 5972 -- remove -L testparm parameter
Thanks to TAKAHASHI Motonobu <monyo@samba.gr.jp> to point out that this does
not work and to agree it's not worth fixing :-)
| -rw-r--r-- | docs-xml/manpages-3/testparm.1.xml | 8 | ||||
| -rw-r--r-- | source3/utils/testparm.c | 6 |
2 files changed, 0 insertions, 14 deletions
diff --git a/docs-xml/manpages-3/testparm.1.xml b/docs-xml/manpages-3/testparm.1.xml index d2ecc7b1cb..4cc4e270bb 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 <servername></arg> <arg choice="opt">-t <encoding></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 73e173e209..8ce0d58ce9 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, ¶meter_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; |