param: Remove remaining references to announce as and announce version

diff --git a/docs-xml/using_samba/appc.xml b/docs-xml/using_samba/appc.xml
index f4b4666bca72beb7325accad1ce2b9712fe69e61..30f5045c0153183138386de0e4d7881ee08c2704 100644 (file)
--- a/docs-xml/using_samba/appc.xml
+++ b/docs-xml/using_samba/appc.xml
@@ -66,34 +66,6 @@ options.</para>
 </refsynopsisdiv>
 </refentry>
 
-<refentry id="appc-refentry-4">
-<refmeta>
-<refmiscinfo class="allowable values">NT, Win95, WfW</refmiscinfo>
-<refmiscinfo class="default">NT</refmiscinfo>
-</refmeta>
-<refnamediv>
-<refname>[global] announce as = system type</refname>
-</refnamediv>
-<refsynopsisdiv>
-<para>Have Samba announce itself as something other than an NT server. Discouraged because it interferes with serving browse lists.</para>
-
-</refsynopsisdiv>
-</refentry>
-
-<refentry id="appc-refentry-5">
-<refmeta>
-<refmiscinfo class="allowable values">any</refmiscinfo>
-<refmiscinfo class="default">4.2</refmiscinfo>
-</refmeta>
-<refnamediv>
-<refname>[global] announce version = number.number</refname>
-</refnamediv>
-<refsynopsisdiv>
-<para>Instructs Samba to announce itself as an older version SMB server. Discouraged.</para>
-
-</refsynopsisdiv>
-</refentry>
-
 <refentry id="appc-refentry-6">
 <refmeta>
 <refmiscinfo class="allowable values">any shares</refmiscinfo>

diff --git a/docs-xml/using_samba/ch05.xml b/docs-xml/using_samba/ch05.xml
index 8bf541cd2f73b051cb074a71a8a015f8daf7fb52..2e8bc328b079dd24b3a9191ab96d0d50ebd142dd 100644 (file)
--- a/docs-xml/using_samba/ch05.xml
+++ b/docs-xml/using_samba/ch05.xml
@@ -523,35 +523,6 @@ remote browse sync = 192.168.221.130 192.168.222.120</programlisting>
 <tbody>
 <row>
 
-<entry colname="col1"><para><literal>announce as</literal></para></entry>
-
-<entry colname="col2"><para><literal>NT</literal>
-<indexterm id="ch05-idx-969670-0"><primary>browsing</primary><secondary>options for, list of</secondary></indexterm> or <literal>Win95</literal> or <literal>Wf W</literal></para></entry>
-
-<entry colname="col3"><para>Sets the operating system that Samba will announce itself as.</para></entry>
-
-<entry colname="col4"><para><literal>N T</literal></para></entry>
-
-<entry colname="col5"><para>Global</para></entry>
-
-</row>
-
-<row>
-
-<entry colname="col1"><para><literal>announce version</literal></para></entry>
-
-<entry colname="col2"><para>numerical</para></entry>
-
-<entry colname="col3"><para>Sets the version of the operating system that Samba will announce itself as.</para></entry>
-
-<entry colname="col4"><para><literal>4.2</literal></para></entry>
-
-<entry colname="col5"><para>Global</para></entry>
-
-</row>
-
-<row>
-
 <entry colname="col1"><para><literal>browseable (browsable)</literal></para></entry>
 
 <entry colname="col2"><para>boolean</para></entry>

diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index 14285be017121ff3eaf7aca85387a961d0bf678b..b95a400b34db49a431e3519d05cb74e9d0d9cfae 100644 (file)
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -2352,10 +2352,6 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
        lpcfg_do_global_parameter_var(lp_ctx, "server string",
                                   "Samba %s", SAMBA_VERSION_STRING);
 
-       lpcfg_do_global_parameter_var(lp_ctx, "announce version", "%d.%d",
-                        DEFAULT_MAJOR_VERSION,
-                        DEFAULT_MINOR_VERSION);
-
        lpcfg_do_global_parameter(lp_ctx, "password server", "*");
 
        lpcfg_do_global_parameter(lp_ctx, "max mux", "50");
@@ -2373,7 +2369,6 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
        lpcfg_do_global_parameter(lp_ctx, "WriteRaw", "True");
        lpcfg_do_global_parameter(lp_ctx, "NullPasswords", "False");
        lpcfg_do_global_parameter(lp_ctx, "ObeyPamRestrictions", "False");
-       lpcfg_do_global_parameter(lp_ctx, "announce as", "NT SERVER");
 
        lpcfg_do_global_parameter(lp_ctx, "TimeServer", "False");
        lpcfg_do_global_parameter(lp_ctx, "BindInterfacesOnly", "False");

diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
index 5bcc4294ba94ccf4a0ee0079bd2ea95983163356..0f7511aa179f768c17f2f6aec1b94a8541149637 100644 (file)
--- a/source4/scripting/python/samba/upgrade.py
+++ b/source4/scripting/python/samba/upgrade.py
@@ -279,8 +279,6 @@ smbconf_keep = [
     "write raw",
     "disable netbios",
     "nt status support",
-    "announce version",
-    "announce as",
     "max mux",
     "max xmit",
     "name resolve order",