Add some more new common options

(This used to be commit f27e696cd38501754fb996ca3ffbe48b28e861ae)

1 files changed, 25 insertions, 14 deletions

diff --git a/examples/smb.conf.default b/examples/smb.conf.default
index 0603623c28..e7fac80884 100644
--- a/examples/smb.conf.default
+++ b/examples/smb.conf.default
@@ -23,6 +23,11 @@
 # server string is the equivalent of the NT Description field
    server string = Samba Server
 
+# Security mode. Defines in which mode Samba will operate. Possible 
+# values are share, user, server, domain and ads. Most people will want 
+# user level security. See the HOWTO Collection for details.
+   security = user
+
 # This option is important for security. It allows you to restrict
 # connections to machines which are on your local network. The
 # following example restricts access to two C class networks and
@@ -44,8 +49,8 @@
 
 # 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, cups
-;   printing = bsd
+# bsd, cups, sysv, plp, lprng, aix, hpux, qnx
+;   printing = cups
 
 # Uncomment this if you want a guest account, you must add this to /etc/passwd
 # otherwise the user "nobody" is used
@@ -58,10 +63,6 @@
 # Put a capping on the size of the log files (in Kb).
    max log size = 50
 
-# 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]
@@ -69,13 +70,14 @@
 #   password server = *
 ;   password server = <NT-Server-Name>
 
-# Note: Do NOT use the now deprecated option of "domain controller"
-# This option is no longer implemented.
+# Use the realm option only with security = ads
+# Specifies the Active Directory realm the host is part of
+;   realm = MY_REALM
 
-# You may wish to use password encryption. Please read
-# the 'User database' chapter in the Samba HOWTO Collection
-# Do not enable this option unless you have read those documents
-;  encrypt passwords = yes
+# Backend to store user information in. New installations should 
+# use either tdbsam or ldapsam. smbpasswd is available for backwards 
+# compatibility. tdbsam requires no further configuration.
+;   passdb backend = tdbsam
 
 # Using the following line enables you to customise your configuration
 # on a per machine basis. The %m gets replaced with the netbios name
@@ -144,10 +146,19 @@
 ;   wins proxy = yes
 
 # DNS Proxy - tells Samba whether or not to try to resolve NetBIOS names
-# via DNS nslookups. The built-in default for versions 1.9.17 is yes,
-# this has been changed in version 1.9.18 to no.
+# via DNS nslookups. The default is NO.
    dns proxy = no 
 
+# These scripts are used on a domain controller or stand-alone 
+# machine to add or delete corresponding unix accounts
+;  add user script = /usr/sbin/useradd %u
+;  add group script = /usr/sbin/groupadd %g
+;  add machine script = /usr/sbin/adduser -n -g machines -c Machine -d /dev/null -s /bin/false %u
+;  delete user script = /usr/sbin/userdle %u
+;  delete user from group script = /usr/sbin/deluser %u %g
+;  delete group script = /usr/sbin/groupdel %g
+
+
 #============================ Share Definitions ==============================
 [homes]
    comment = Home Directories