summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2010-02-10 08:39:37 -0800
committerJeremy Allison <jra@samba.org>2010-02-10 08:39:37 -0800
commit84fba3c1bc962804259f201d465acfdf0cd3c6a8 (patch)
tree42edf2cb88556972594d4e8fa1228c64e9d53597
parent1cd9df8da2a1ef0e2a45ea67ea7766cbbe9984f0 (diff)
downloadsamba-84fba3c1bc962804259f201d465acfdf0cd3c6a8.tar.gz
samba-84fba3c1bc962804259f201d465acfdf0cd3c6a8.tar.bz2
samba-84fba3c1bc962804259f201d465acfdf0cd3c6a8.zip
Change the default of "nmbd bind explicit broadcast" to "no"
until the double processing problem in bug #7118 is fixed. Jeremy.
-rw-r--r--docs-xml/smbdotconf/misc/nmbdbindexplicitbroadcast.xml5
-rw-r--r--source3/param/loadparm.c6
2 files changed, 5 insertions, 6 deletions
diff --git a/docs-xml/smbdotconf/misc/nmbdbindexplicitbroadcast.xml b/docs-xml/smbdotconf/misc/nmbdbindexplicitbroadcast.xml
index 3a44a69d54..8d2135b3ff 100644
--- a/docs-xml/smbdotconf/misc/nmbdbindexplicitbroadcast.xml
+++ b/docs-xml/smbdotconf/misc/nmbdbindexplicitbroadcast.xml
@@ -7,11 +7,10 @@
<para>
This option causes <citerefentry><refentrytitle>nmbd</refentrytitle>
<manvolnum>8</manvolnum></citerefentry> to explicitly bind to the
- broadcast address of the local subnets. This is needed to make nmbd
+ broadcast address of the local subnets. This can be used to make nmbd
work correctly in combination with the <smbconfoption name="socket address"/> option.
- You should not need to unset this option.
</para>
</description>
-<value type="default">yes</value>
+<value type="default">no</value>
</samba:parameter>
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 8308e99566..3ada45e2ca 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -4969,10 +4969,10 @@ static void init_globals(bool first_time_only)
string_set(&Globals.szPidDir, get_dyn_PIDDIR());
string_set(&Globals.szSocketAddress, "0.0.0.0");
/*
- * By default support explicit binding to broadcast
- * addresses.
+ * By default don't support explicit binding to broadcast
+ * addresses (until the nmbd "process twice" bug is fixed).
*/
- Globals.bNmbdBindExplicitBroadcast = true;
+ Globals.bNmbdBindExplicitBroadcast = false;
if (asprintf(&s, "Samba %s", samba_version_string()) < 0) {
smb_panic("init_globals: ENOMEM");