This commit was manufactured by cvs2svn to create branch 'SAMBA_3_0'.(This used to...

[samba.git] / examples / smb.conf.default

diff --git a/examples/smb.conf.default b/examples/smb.conf.default
index f0c86cc6eedd523361220166bbd81c76cb7bcb81..d299f0171400a9b24f070c2b881952ebb9ffe2bf 100644 (file)
--- a/examples/smb.conf.default
+++ b/examples/smb.conf.default
@@ -41,7 +41,7 @@
 
 # It should not be necessary to specify the print system type unless
 # it is non-standard. Currently supported print systems include:
-# bsd, sysv, plp, lprng, aix, hpux, qnx
+# bsd, sysv, plp, lprng, aix, hpux, qnx, cups
 ;   printing = bsd
 
 # Uncomment this if you want a guest account, you must add this to /etc/passwd
@@ -58,9 +58,17 @@
 # Security mode. Most people will want user level security. See
 # security_level.txt for details.
    security = user
+
 # Use password server option only with security = server
+# The argument list may include:
+#   password server = My_PDC_Name [My_BDC_Name] [My_Next_BDC_Name]
+# or to auto-locate the domain controller/s
+#   password server = *
 ;   password server = <NT-Server-Name>
 
+# Note: Do NOT use the now deprecated option of "domain controller"
+# This option is no longer implemented.
+
 # You may wish to use password encryption. Please read
 # ENCRYPTION.txt, Win95.txt and WinNT.txt in the Samba documentation.
 # Do not enable this option unless you have read those documents
@@ -102,10 +110,6 @@
 # and gives it a slightly higher chance of winning the election
 ;   preferred master = yes
 
-# Use only if you have an NT server on your network that has been
-# configured at install time to be a primary domain controller.
-;   domain controller = <NT-Domain-Controller-SMBName>
-
 # Enable this if you want Samba to be a domain logon server for 
 # Windows95 workstations. 
 ;   domain logons = yes