added description of new "dns proxy" option, which defaults to yes.

added warning of consequences of using dns proxying.

lkcl

1 files changed, 22 insertions, 1 deletions

diff --git a/docs/manpages/smb.conf.5 b/docs/manpages/smb.conf.5
index 6cd888577fb..c83828a3724 100644
--- a/docs/manpages/smb.conf.5
+++ b/docs/manpages/smb.conf.5
@@ -341,6 +341,8 @@ default service
 
 dfree command
 
+dns proxy
+
 domain controller
 
 domain master
@@ -1079,13 +1081,32 @@ files.
 .SS directory mode (S)
 See
 .B directory mask.
+
+.SS dns proxy (G)
+
+Specifies that nmbd should (as a WINS server), on finding that a NetBIOS
+name has not been registered, treat the NetBIOS name word-for-word as
+a DNS name.
+
+Note that the maximum length for a NetBIOS name is 15
+characters, so the DNS name (or DNS alias) can likewise only be 15
+characters, maximum.
+
+Note also that nmbd will block completely until the DNS name is resolved.
+This will result in temporary loss of browsing and WINS services.
+Enable this option only if you are certain that DNS resolution is fast,
+or you can live with the consequences of periodic outages.
+
+.B Default:
+	 dns proxy = yes
+
 .SS domain controller (G)
 
 Specifies the DNS name or IP address of the machine to refer domain 
 logons from Win95 machines to. You should never need to set this parameter.
 
 .B Default:
-	domain controller =
+	 domain controller = no
 
 .SS domain master (G)