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

[bubulle at alioth.debian.org]

Author: bubulle
Date: 2012-03-10 18:39:26 +0000 (Sat, 10 Mar 2012)
New Revision: 4035

Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/samba.postinst
Log:
samba.postinst: Add more informative error message for the case
where smb.conf was manually deleted.

Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2012-03-10 18:38:36 UTC (rev 4034)
+++ trunk/samba/debian/changelog	2012-03-10 18:39:26 UTC (rev 4035)
@@ -8,6 +8,8 @@
     After all, we have a sane default. Closes: #662801
   * Merge some Ubuntu patches:
     - samba.config: Avoid scary pdbedit warnings on first import.
+    - samba.postinst: Add more informative error message for the case
+      where smb.conf was manually deleted.
 
   [ Maarten Bezemer ]
   * Removed references to the testprns command from documentation

Modified: trunk/samba/debian/samba.postinst
===================================================================
--- trunk/samba/debian/samba.postinst	2012-03-10 18:38:36 UTC (rev 4034)
+++ trunk/samba/debian/samba.postinst	2012-03-10 18:39:26 UTC (rev 4035)
@@ -59,7 +59,7 @@
 # some of the faking can cause us problems!
 if [ "${GENERATE_SMBPASSWD}" = "true" -a ! -e /var/lib/samba/passdb.tdb -a ! -e /etc/samba/smbpasswd ]; then
 	getent passwd | mksmbpasswd > /etc/samba/smbpasswd
-	pdbedit -i smbpasswd -e tdbsam
+	pdbedit -i smbpasswd -e tdbsam -d 0
 	rm /etc/samba/smbpasswd
 fi