[Pkg-samba-maint] [SCM] Debian packaging for Samba branch, samba_4.0_bubulle, updated. upstream/4.0.5+dfsg1-806-gfdbe5f7

[Andrew Bartlett]

The following commit has been merged in the samba_4.0_bubulle branch:
commit 1ab5fe3d187cde8267116c4cf2527f6649d3c7e3
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue May 21 10:34:28 2013 +1000

    Remove confusing parameters in favour of the simple server role
    
    This matches what the samba-ad-dc package will alter anyway, and asks the user
    what they want, rather than asking them to guess at how we implement it.
    
    Encrypted passwords should have been the default years ago, when Samba
    switched, so this is dropped too.
    
    Andrew Bartlett

diff --git a/debian/smb.conf b/debian/smb.conf
index 06bcf33..1e74653 100644
--- a/debian/smb.conf
+++ b/debian/smb.conf
@@ -95,15 +95,16 @@
 
 ####### Authentication #######
 
-# "security = user" is always a good idea. This will require a Unix account
-# in this server for every user accessing the server. See
-# /usr/share/doc/samba-doc/htmldocs/Samba3-HOWTO/ServerType.html
-# in the samba-doc package for details.
-#   security = user
-
-# You may wish to use password encryption.  See the section on
-# 'encrypt passwords' in the smb.conf(5) manpage before enabling.
-   encrypt passwords = no
+# Server role. Defines in which mode Samba will operate. Possible
+# values are "standalone server", "member server", "classic primary
+# domain controller", "classic backup domain controller", "active
+# directory domain controller". 
+#
+# Most people will want "standalone sever" or "member server".
+# Running as "active directory domain controller" will require first
+# running "samba-tool domain provision" to wipe databases and create a
+# new domain.
+   server role = standalone server
 
 # If you are using encrypted passwords, Samba will need to know what
 # password database type you are using.  
@@ -133,11 +134,6 @@
 
 ########## Domains ###########
 
-# Is this machine able to authenticate users. Both PDC and BDC
-# must have this setting enabled. If you are the BDC you must
-# change the 'domain master' setting to no
-#
-;   domain logons = yes
 #
 # The following setting only takes effect if 'domain logons' is set
 # It specifies the location of the user's profile directory
@@ -182,11 +178,6 @@
 # of the machine that is connecting
 ;   include = /home/samba/etc/smb.conf.%m
 
-# Domain Master specifies Samba to be the Domain Master Browser. If this
-# machine will be configured as a BDC (a secondary logon server), you
-# must set this to 'no'; otherwise, the default behavior is recommended.
-#   domain master = auto
-
 # Some defaults for winbind (make sure you're not using the ranges
 # for something else.)
 ;   idmap uid = 10000-20000

-- 
Debian packaging for Samba