Change the default of "nmbd bind explicit broadcast" to "no"

until the double processing problem in bug #7118 is fixed.

Jeremy.

diff --git a/docs-xml/smbdotconf/misc/nmbdbindexplicitbroadcast.xml b/docs-xml/smbdotconf/misc/nmbdbindexplicitbroadcast.xml
index 3a44a69d5438b8678203d1f4c2352c369fded3f4..8d2135b3ff7f759d0f901f2d607930b880433631 100644 (file)
--- 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
        <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.
        work correctly in combination with the <smbconfoption name="socket address"/> option.

-       You should not need to unset this option.

        </para>
 </description>
 
        </para>
 </description>
 

-<value type="default">yes</value>
+<value type="default">no</value>

 </samba:parameter>
 </samba:parameter>

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 8308e995660629a2684e624da794f264705e171e..3ada45e2ca7ddc3cbbbde105d206b494652b1357 100644 (file)
--- 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");
        /*
        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");
 
        if (asprintf(&s, "Samba %s", samba_version_string()) < 0) {
                smb_panic("init_globals: ENOMEM");