[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  3f2415c... Make "nmbd bind explicit broadcast" on by default.
      from  e425162... Fix bug #6876 for acl_tdb module.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 3f2415c9bf9342aeb5a70901018527ed1f109754
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Feb 8 14:35:02 2010 -0800

    Make "nmbd bind explicit broadcast" on by default.
    
    Fix a comment typo.
    
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 .../smbdotconf/misc/nmbdbindexplicitbroadcast.xml  |   11 ++++++-----
 source3/nmbd/nmbd_packets.c                        |    2 +-
 source3/param/loadparm.c                           |    5 +++++
 3 files changed, 12 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/smbdotconf/misc/nmbdbindexplicitbroadcast.xml b/docs-xml/smbdotconf/misc/nmbdbindexplicitbroadcast.xml
index f328594..3a44a69 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 013ebf6..55fd24d 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 d2da106..8308e99 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");


-- 
Samba Shared Repository