[Pkg-samba-maint] r1451 - trunk/samba/debian

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2007-06-08 06:28:38 +0000 (Fri, 08 Jun 2007)
New Revision: 1451

Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/samba.config
Log:
Update samba.config to not override user preference on passdb.tdb creation
after initial configuration.  Closes: #350926.



Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2007-06-07 11:14:12 UTC (rev 1450)
+++ trunk/samba/debian/changelog	2007-06-08 06:28:38 UTC (rev 1451)
@@ -15,8 +15,12 @@
   * Add the samba-common and winbind packages to samba-dbg to get
     debugging symbols for winbindd, net, etc.
 
- -- Christian Perrier <bubulle at debian.org>  Thu, 31 May 2007 21:09:30 +0200
+  [ Steve Langasek ]
+  * Update samba.config to not override user preference on passdb.tdb
+    creation after initial configuration.  Closes: #350926.
 
+ -- Steve Langasek <vorlon at debian.org>  Thu, 07 Jun 2007 23:06:10 -0700
+
 samba (3.0.25a-1) unstable; urgency=low
 
   [ Christian Perrier ]

Modified: trunk/samba/debian/samba.config
===================================================================
--- trunk/samba/debian/samba.config	2007-06-07 11:14:12 UTC (rev 1450)
+++ trunk/samba/debian/samba.config	2007-06-08 06:28:38 UTC (rev 1451)
@@ -62,7 +62,8 @@
 	# If 'encrypt passwords' is true in smb.conf, and smbpasswd
 	# does not exist, default to yes here.
 	FILE=/etc/samba/smb.conf
-	if [ -f "$FILE" ]; then
+	db_fget samba/generate_smbpasswd seen
+	if [ "$RET" = "false" ] && [ -f "$FILE" ]; then
 		ENCRYPT=`smbconf_retr "encrypt passwords"`
 	        if [ "$ENCRYPT" ]; then
 			ENCRYPT=`echo $ENCRYPT | tr '[A-Z]' '[a-z]'`