summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs-xml/smbdotconf/misc/nmbdbindexplicitbroadcast.xml11
-rw-r--r--source3/nmbd/nmbd_packets.c2
-rw-r--r--source3/param/loadparm.c5
3 files changed, 12 insertions, 6 deletions
diff --git a/docs-xml/smbdotconf/misc/nmbdbindexplicitbroadcast.xml b/docs-xml/smbdotconf/misc/nmbdbindexplicitbroadcast.xml
index f3285944d5..3a44a69d54 100644
--- a/docs-xml/smbdotconf/misc/nmbdbindexplicitbroadcast.xml
+++ b/docs-xml/smbdotconf/misc/nmbdbindexplicitbroadcast.xml
@@ -5,12 +5,13 @@
xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
<description>
<para>
- This option allows you to setup <citerefentry><refentrytitle>nmbd</refentrytitle>
- <manvolnum>8</manvolnum></citerefentry> to explicit bind to the
- broadcast address of the local subnets. This is only useful in
- combination with the <smbconfoption name="socket address"/> option.
+ 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
+ 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/nmbd/nmbd_packets.c b/source3/nmbd/nmbd_packets.c
index 013ebf6589..55fd24dc35 100644
--- a/source3/nmbd/nmbd_packets.c
+++ b/source3/nmbd/nmbd_packets.c
@@ -1863,7 +1863,7 @@ bool listen_for_packets(bool run_election)
client_fd = ClientNMB;
client_port = global_nmb_port;
} else {
- /* Port 137 */
+ /* Port 138 */
packet_type = DGRAM_PACKET;
packet_name = "dgram";
client_fd = ClientDGRAM;
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index d2da10687f..8308e99566 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -4968,6 +4968,11 @@ static void init_globals(bool first_time_only)
string_set(&Globals.szCacheDir, get_dyn_CACHEDIR());
string_set(&Globals.szPidDir, get_dyn_PIDDIR());
string_set(&Globals.szSocketAddress, "0.0.0.0");
+ /*
+ * By default support explicit binding to broadcast
+ * addresses.
+ */
+ Globals.bNmbdBindExplicitBroadcast = true;
if (asprintf(&s, "Samba %s", samba_version_string()) < 0) {
smb_panic("init_globals: ENOMEM");