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

[Steve Langasek]

Author: vorlon
Date: 2007-03-21 21:16:16 +0000 (Wed, 21 Mar 2007)
New Revision: 1305

Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/samba-common.postinst
Log:
Fixed the regexp used for matching broken passdb backend settings, since 
we were getting false positives on *all* values. :/  The correct match
should be: one or more non-space, non-comma characters, followed by a
space or a comma, followed by zero or more spaces, followed by one or
more non-space characters.  Closes: #415725.



Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2007-03-18 08:28:55 UTC (rev 1304)
+++ trunk/samba/debian/changelog	2007-03-21 21:16:16 UTC (rev 1305)
@@ -1,5 +1,17 @@
-samba (3.0.24-5) UNRELEASED; urgency=low
+samba (3.0.24-5) unstable; urgency=high
 
+  * The "see what you get for trusting the quality of my packages,
+    release team?  Release team, please unblock this package" release.
+  * High-urgency brown-paper-upload for etch-targetted fix for
+    regression introduced in the last version
+
+  [ Steve Langasek ]
+  * Fixed the regexp used for matching broken passdb backend settings,
+    since we were getting false positives on *all* values. :/  The
+    correct match should be: one or more non-space, non-comma
+    characters, followed by a space or a comma, followed by zero or more
+    spaces, followed by one or more non-space characters.  Closes: #415725.
+
   [ Debconf translations ]
   * Nepali
   * Korean; closes: #414883.
@@ -9,7 +21,7 @@
   * Greek. Closes: #415122
   * Norwegian Nynorsk added.
 
- -- Christian Perrier <bubulle at debian.org>  Sun, 18 Mar 2007 09:28:26 +0100
+ -- Steve Langasek <vorlon at debian.org>  Wed, 21 Mar 2007 13:49:46 -0700
 
 samba (3.0.24-4) unstable; urgency=medium
 

Modified: trunk/samba/debian/samba-common.postinst
===================================================================
--- trunk/samba/debian/samba-common.postinst	2007-03-18 08:28:55 UTC (rev 1304)
+++ trunk/samba/debian/samba-common.postinst	2007-03-21 21:16:16 UTC (rev 1305)
@@ -96,7 +96,8 @@
 fi
 
 if [ -n "$2" ] && dpkg --compare-versions "$2" lt 3.0.23b-2 &&
-   grep -qi '^[[:space:]]*passdb backend[[:space:]]*=[^,]*\,\?[[:space:]]*[^[:space:]]\+' \
+
+   grep -qi '^[[:space:]]*passdb backend[[:space:]]*=[[:space:]]*[^,[:space:]]\+[,[:space:][[:space:]]*[^[:space:]]\+' \
 	/etc/samba/smb.conf
 then
 	db_input high samba-common/unsupported-passdb || true