[Pkg-samba-maint] [SCM] Debian packaging for Samba branch, samba_4.0, updated. upstream/4.0.6+dfsg-814-g5d2107a

[Andrew Bartlett]

The following commit has been merged in the samba_4.0 branch:
commit 9a60cd0ab4f9621fa53535bc096622f9b5eb453f
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Sun May 26 18:31:10 2013 +1000

    Remove remainder of encrypted password support (smb.conf fragment already gone)

diff --git a/debian/changelog b/debian/changelog
index 571a31c..4f70297 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ samba (2:4.0.6+dfsg-1) UNRELEASED; urgency=low
   [ Andrew Bartlett ]
   * Remove most of the samba4 references, except for binaries ending in 4
   * Converted to full AD DC package on the basis of the 3.6 package
+  * Removed debconf support for encrypted passwords
 
   [ Christian Perrier ]
   * Move libnss_winbind.so.2 and libnss_wins.so.2 to /lib as in 3.6.*
diff --git a/debian/samba-common.postinst b/debian/samba-common.postinst
index 0621c77..56d7a64 100644
--- a/debian/samba-common.postinst
+++ b/debian/samba-common.postinst
@@ -41,15 +41,6 @@ configure_smb_conf() {
 			s/^\([[:space:]]*\)workgroup[[:space:]]*=.*/\1workgroup = ${WORKGROUP}/i" \
 		"$CONFIG"
 
-	# Encrypt passwords?
-	db_get samba-common/encrypt_passwords || true
-	ENCRYPT_PASSWORDS="${RET}"
-
-	sed -i -e "s/^\([[:space:]]*\)\[global\]/\1\[global\]/i
-		/^[[:space:]]*\[global\]/,/^[[:space:]]*\[/ \
-		        s/^\([[:space:]]*\)encrypt passwords[[:space:]]*=.*/\1encrypt passwords = ${ENCRYPT_PASSWORDS}/i" \
-		"$CONFIG"
-
 	# Install DHCP support
 	db_get samba-common/dhcp
 	if [ "$RET" = true ] && \
diff --git a/debian/samba-common.templates b/debian/samba-common.templates
index f54885b..1d8b809 100644
--- a/debian/samba-common.templates
+++ b/debian/samba-common.templates
@@ -39,15 +39,3 @@ _Description: Workgroup/Domain Name:
  workgroup to be used when browsing with various frontends, and the domain
  name used with the "security=domain" setting.
 
-Template: samba-common/encrypt_passwords
-Type: boolean
-Default: true
-_Description: Use password encryption?
- All recent Windows clients communicate with SMB/CIFS servers using encrypted
- passwords. If you want to use clear text passwords you will need to change
- a parameter in your Windows registry.
- .
- Enabling this option is highly recommended as support for plain text
- passwords is no longer maintained in Microsoft Windows products. If
- you do, make sure you have a valid /etc/samba/smbpasswd file and that
- you set passwords in there for each user using the smbpasswd command.

-- 
Debian packaging for Samba