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

[bubulle at alioth.debian.org]

Author: bubulle
Date: 2007-09-17 20:21:27 +0000 (Mon, 17 Sep 2007)
New Revision: 1512

Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/samba-common.postinst
   trunk/samba/debian/samba-common.templates
Log:
Remove the samba-common/unsupported-passdb debconf template dealing with
an obsolete (pre-etch) transition


Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2007-09-14 23:56:56 UTC (rev 1511)
+++ trunk/samba/debian/changelog	2007-09-17 20:21:27 UTC (rev 1512)
@@ -1,3 +1,12 @@
+samba (3.0.26a-1) unstable; urgency=low
+
+  * New upstream release.
+  * Remove the samba-common/unsupported-passdb debconf template and
+    the associated code in samba-common.postinst, that deals with pre-etch
+    versions transition
+
+ -- Christian Perrier <bubulle at debian.org>  Sun, 16 Sep 2007 10:16:29 +0200
+
 samba (3.0.26-1) unstable; urgency=high
 
   * New upstream release: security update for CVE-2007-4138: 

Modified: trunk/samba/debian/samba-common.postinst
===================================================================
--- trunk/samba/debian/samba-common.postinst	2007-09-14 23:56:56 UTC (rev 1511)
+++ trunk/samba/debian/samba-common.postinst	2007-09-17 20:21:27 UTC (rev 1512)
@@ -95,15 +95,6 @@
 	fi
 fi
 
-if [ -n "$2" ] && dpkg --compare-versions "$2" lt 3.0.23b-2 &&
-
-   grep -qi '^[[:space:]]*passdb backend[[:space:]]*=[[:space:]]*[^,[:space:]]\+[,[:space:]][[:space:]]*[^[:space:]]\+' \
-	/etc/samba/smb.conf
-then
-	db_input high samba-common/unsupported-passdb || true
-	db_go
-fi
-
 chmod a+r /etc/samba/smb.conf
 
 # ------------------------- Debconf questions end ---------------------

Modified: trunk/samba/debian/samba-common.templates
===================================================================
--- trunk/samba/debian/samba-common.templates	2007-09-14 23:56:56 UTC (rev 1511)
+++ trunk/samba/debian/samba-common.templates	2007-09-17 20:21:27 UTC (rev 1512)
@@ -45,11 +45,3 @@
  have a valid /etc/samba/smbpasswd file and that you set passwords in
  there for each user using the smbpasswd command.
 
-Template: samba-common/unsupported-passdb
-Type: note
-_Description: Chaining passdb backends is not supported
- Beginning with version 3.0.23, samba no longer supports chaining
- multiple backends in the "passdb backend" parameter.  It appears that
- your smb.conf file contains a passdb backend parameter consisting of a
- list of backends.  The new version of samba will not work until you
- correct this.