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

[bubulle at alioth.debian.org]

Author: bubulle
Date: 2010-01-17 12:31:30 +0000 (Sun, 17 Jan 2010)
New Revision: 3236

Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/samba.postinst
Log:
No longer prepend a patch before mksmbpasswd call

Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2010-01-17 12:29:05 UTC (rev 3235)
+++ trunk/samba/debian/changelog	2010-01-17 12:31:30 UTC (rev 3236)
@@ -1,7 +1,11 @@
 samba (2:3.4.4~dfsg-2) UNRELEASED; urgency=low
 
+  * A few lintian fixes:
   * Drop /var/run/samba from samba-common. The directory is created
     by init scripts when needed.
+  * No longer prepend a path to the mksmbpasswd call in samba.postinst.
+    This prevents the local administrator to use a replacement version
+    for some local reason.
 
  -- Christian Perrier <bubulle at debian.org>  Sun, 17 Jan 2010 13:27:55 +0100
 

Modified: trunk/samba/debian/samba.postinst
===================================================================
--- trunk/samba/debian/samba.postinst	2010-01-17 12:29:05 UTC (rev 3235)
+++ trunk/samba/debian/samba.postinst	2010-01-17 12:31:30 UTC (rev 3236)
@@ -58,7 +58,7 @@
 # FIXME: we don't want to pass these through the smbpasswd backend,
 # 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 | /usr/sbin/mksmbpasswd > /etc/samba/smbpasswd
+	getent passwd | mksmbpasswd > /etc/samba/smbpasswd
 	pdbedit -i smbpasswd -e tdbsam
 	rm /etc/samba/smbpasswd
 fi