summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-06-24 12:57:47 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-06-24 13:08:04 +1000
commit3d08e844fc2870387449850342091ae621bd938d (patch)
tree68db5b054cf4715ad3c20c65e8fdb01e70a4cdeb /source4
parent877de9fee773b3f6b5a95afe1d01001e0b1b4ff2 (diff)
downloadsamba-3d08e844fc2870387449850342091ae621bd938d.tar.gz
samba-3d08e844fc2870387449850342091ae621bd938d.tar.bz2
samba-3d08e844fc2870387449850342091ae621bd938d.zip
param: Remove remaining references to announce as and announce version
Diffstat (limited to 'source4')
-rw-r--r--source4/param/loadparm.c5
-rw-r--r--source4/scripting/python/samba/upgrade.py2
2 files changed, 0 insertions, 7 deletions
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index 14285be017..b95a400b34 100644
--- 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 5bcc4294ba..0f7511aa17 100644
--- 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",