diff options
author | Jeremy Allison <jra@samba.org> | 2010-02-10 12:42:27 -0800 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2010-02-10 12:42:27 -0800 |
commit | f2d7d9774e3dafc643567605dd1eef908b6ded1a (patch) | |
tree | 05e3db806215ee7e397f5f998568ca71b36c94da | |
parent | c2f3ed48c5ac253bb17387800579f94d933b71e1 (diff) | |
download | samba-f2d7d9774e3dafc643567605dd1eef908b6ded1a.tar.gz samba-f2d7d9774e3dafc643567605dd1eef908b6ded1a.tar.bz2 samba-f2d7d9774e3dafc643567605dd1eef908b6ded1a.zip |
Revert "Change the default of "nmbd bind explicit broadcast" to "no""
This reverts commit 84fba3c1bc962804259f201d465acfdf0cd3c6a8.
Now we have a "processed packet queue" in nmbd we can go back
to doing this by default.
Jeremy.
-rw-r--r-- | docs-xml/smbdotconf/misc/nmbdbindexplicitbroadcast.xml | 5 | ||||
-rw-r--r-- | source3/param/loadparm.c | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/docs-xml/smbdotconf/misc/nmbdbindexplicitbroadcast.xml b/docs-xml/smbdotconf/misc/nmbdbindexplicitbroadcast.xml index 8d2135b3ff..3a44a69d54 100644 --- a/docs-xml/smbdotconf/misc/nmbdbindexplicitbroadcast.xml +++ b/docs-xml/smbdotconf/misc/nmbdbindexplicitbroadcast.xml @@ -7,10 +7,11 @@ <para> This option causes <citerefentry><refentrytitle>nmbd</refentrytitle> <manvolnum>8</manvolnum></citerefentry> to explicitly bind to the - broadcast address of the local subnets. This can be used to make nmbd + broadcast address of the local subnets. This is needed 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">no</value> +<value type="default">yes</value> </samba:parameter> diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 3ada45e2ca..8308e99566 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 don't support explicit binding to broadcast - * addresses (until the nmbd "process twice" bug is fixed). + * By default support explicit binding to broadcast + * addresses. */ - Globals.bNmbdBindExplicitBroadcast = false; + Globals.bNmbdBindExplicitBroadcast = true; if (asprintf(&s, "Samba %s", samba_version_string()) < 0) { smb_panic("init_globals: ENOMEM"); |