diff options
| author | Jeremy Allison <jra@samba.org> | 2010-02-08 14:35:02 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2010-02-08 14:35:02 -0800 |
| commit | 3f2415c9bf9342aeb5a70901018527ed1f109754 (patch) | |
| tree | 2aac4a39210746541db725e5d63ec0eae9c3d366 | |
| parent | e425162933cd7a589e224da057b390d3d7e9b47a (diff) | |
| download | samba-3f2415c9bf9342aeb5a70901018527ed1f109754.tar.gz samba-3f2415c9bf9342aeb5a70901018527ed1f109754.tar.bz2 samba-3f2415c9bf9342aeb5a70901018527ed1f109754.zip | |
Make "nmbd bind explicit broadcast" on by default.
Fix a comment typo.
Jeremy.
| -rw-r--r-- | docs-xml/smbdotconf/misc/nmbdbindexplicitbroadcast.xml | 11 | ||||
| -rw-r--r-- | source3/nmbd/nmbd_packets.c | 2 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 5 |
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"); |