added some notes on the new "interfaces" option

3 files changed, 41 insertions, 7 deletions

diff --git a/docs/INSTALL.txt b/docs/INSTALL.txt
index b91367cd59a..6455a0fe187 100644
--- a/docs/INSTALL.txt
+++ b/docs/INSTALL.txt
@@ -113,11 +113,12 @@ NOTE: Some unixes already have entries like netbios_ns (note the
 underscore) in /etc/services. You must either edit /etc/services or
 /etc/inetd.conf to make them consistant.
 
-NOTE: On many systems you may need to give the nmbd a -B parameter to
-specify the broadcast address of your interface. Run ifconfig as root
-if you don't know what the broadcast is for your net. nmbd tries to
-determine it at run time, but fails on some unixes. See the section on
-"testing nmbd" for a method of finding if you need to do this.
+NOTE: On many systems you may need to use the "interfaces" option in
+smb.conf to specify the IP address and netmask of your interfaces. Run
+ifconfig as root if you don't know what the broadcast is for your
+net. nmbd tries to determine it at run time, but fails on some
+unixes. See the section on "testing nmbd" for a method of finding if
+you need to do this.
 
 !!!WARNING!!! Many unixes only accept around 5 parameters on the
 command line in inetd. This means you shouldn't use spaces between the
diff --git a/docs/manpages/smb.conf.5 b/docs/manpages/smb.conf.5
index 7149be6a473..d5100181de1 100644
--- a/docs/manpages/smb.conf.5
+++ b/docs/manpages/smb.conf.5
@@ -1048,6 +1048,31 @@ or perhaps on a home network where you trust your wife and kids :-)
 .B Example
 	hosts equiv = /etc/hosts.equiv
 
+.SS interfaces (G)
+
+This option allows you to setup multiple network interfaces, so that
+Samba can properly handle browsing on all interfaces.
+
+The option takes a list of ip/netmask pairs. The netmask may either be
+a bitmask, or a bitlength. 
+
+For example, the following line:
+
+interfaces = 192.168.2.10/24 192.168.3.10/24
+
+would configure two network interfaces with IP addresses 192.168.2.10
+and 192.168.3.10. The netmasks of both interfaces would be set to
+255.255.255.0. 
+
+You could produce an equivalent result by using:
+
+interfaces = 192.168.2.10/255.255.255.0 192.168.3.10/255.255.255.0
+
+if you prefer that format.
+
+If this option is not set then Samba will attempt to find a primary
+interface, but won't attempt to configure more than one interface.
+
 .SS invalid users (S)
 This is a list of users that should not be allowed to login to this
 service. This is really a "paranoid" check to absolutely ensure an
diff --git a/docs/textdocs/BROWSING.txt b/docs/textdocs/BROWSING.txt
index 8a09d2274fb..c63e0f7febd 100644
--- a/docs/textdocs/BROWSING.txt
+++ b/docs/textdocs/BROWSING.txt
@@ -30,7 +30,7 @@ A simple lmhosts file might be:
 #
 # first put ourselves in workgroup MYGROUP using
 # our own net address
-0.0.0.0 MYGROUP G
+0.0.0.0 MYGROUP 255.255.255.0 G
 
 Note in the above that I overrode what workgroup Samba is in using the
 G flag. Also note that the 0.0.0.0 address is used, which will be
@@ -48,7 +48,7 @@ the network which has a broadcast of 192.0.3.255 then this entry would
 do the trick:
 
 # put ourselves in the STAFF workgroup on the other subnet
-192.0.3.255 STAFF G
+192.0.3.255 STAFF 255.255.255.0 G
 
 Notice the G at the end! It is very important you include this as this
 entry without the G could cause a broadcast storm! 
@@ -142,4 +142,12 @@ the -B option. This only works if your network setup listens on both
 0s and 1s based broadcasts. The -B option can only control what
 address it sends to, not what it listens on.
 
+MULTIPLE INTERFACES
+===================
+
+Samba now supports machines with multiple network interfaces. If you
+have multiple interfaces then you will need to use the "interfaces"
+option in smb.conf to configure them. See smb.conf(5) for details.
+
+