[Pkg-samba-maint] r1180 - trunk

[Peter Eisentraut]

Author: petere
Date: 2006-10-11 19:49:08 +0000 (Wed, 11 Oct 2006)
New Revision: 1180

Modified:
   trunk/changelog
   trunk/samba-common.postinst
Log:
* Remove possibly leftover comma from "passdb backend" setting in
  smb.conf on upgrade. Closes: ##383307.


Modified: trunk/changelog
===================================================================
--- trunk/changelog	2006-10-11 19:42:11 UTC (rev 1179)
+++ trunk/changelog	2006-10-11 19:49:08 UTC (rev 1180)
@@ -38,6 +38,8 @@
   * Use upstream makefile to install Python module.
   * Build-Depend on python-dev instead of python-all-dev.
   * Removed old upgrade support.
+  * Remove possibly leftover comma from "passdb backend" setting in
+    smb.conf on upgrade. Closes: ##383307.
 
   [ Christian Perrier ]
   * Add LSB info to the init script

Modified: trunk/samba-common.postinst
===================================================================
--- trunk/samba-common.postinst	2006-10-11 19:42:11 UTC (rev 1179)
+++ trunk/samba-common.postinst	2006-10-11 19:49:08 UTC (rev 1180)
@@ -89,7 +89,7 @@
 	then
 		sed -e "s/^\([[:space:]]*\)\[global\]/\1\[global\]/i
 			/^[[:space:]]*\[global\]/,/^[[:space:]]*\[/ \
-			        s/^\([[:space:]]*passdb backend[[:space:]]*=.*\)[[:space:]]*guest[[:space:]]*$/\1/i" \
+			        s/^\([[:space:]]*passdb backend[[:space:]]*=[^,]*\),\?[[:space:]]*guest[[:space:]]*$/\1/i" \
 			< /etc/samba/smb.conf >${TMPFILE}
 		mv -f ${TMPFILE} /etc/samba/smb.conf
 	fi