Debian updates. Brings files in packaging/Debian on par with the

latest Debian official packages for Debian unstable. Also fixes
patches that got out of date in the beta2->beta3 development process.
(This used to be commit 03871fd574bf9c0f6d88c96423f77e9ada7b16f7)

1 files changed, 0 insertions, 19 deletions

diff --git a/packaging/Debian/debian/samba.postinst b/packaging/Debian/debian/samba.postinst
index c3db0373f1..1a25290ed2 100644
--- a/packaging/Debian/debian/samba.postinst
+++ b/packaging/Debian/debian/samba.postinst
@@ -191,11 +191,6 @@ if dpkg --compare-versions "$2" lt 2.999+3.0.alpha20-4; then
 	update-inetd --remove netbios-ns
 fi
 
-# We always run /etc/init.d/samba, even if we run Samba from inetd.
-#	The init.d script takes care of handling the conflict of running
-#	from inetd or as daemons.
-update-rc.d samba defaults 20 19 > /dev/null
-
 # We want to add these entries to inetd.conf commented out. Otherwise
 #	UDP traffic could make inetd to start nmbd or smbd right during
 #	the configuration stage.
@@ -209,16 +204,6 @@ else
 	update-inetd --enable netbios-ssn
 fi
 
-# Start Samba: we don't want to call /etc/init.d/samba if we are
-# running from inetd because a nasty help message would be printed out.
-
-# Run the init script if this is a first-time install, or if it's an
-# upgrade and Samba was running before, _and_ we're not running from inetd.
-if [ -z "$2" -o ! -f /tmp/samba-was-not-running ]; then
-	# Check the script is executable before running it.
-	[ -x /etc/init.d/samba ] && /etc/init.d/samba start
-fi
-
 # This check is a safety net: the /etc/samba/smbpasswd file must have
 #	permissions 600.
 if [ -f /etc/samba/smbpasswd ]; then
@@ -238,10 +223,6 @@ rm -f /etc/samba/debian_config
 mv -f /var/log/nmb* /var/log/samba/ 2> /dev/null || true
 mv -f /var/log/smb* /var/log/samba/ 2> /dev/null || true
 
-# Do this last, so we don't accidentally start the daemons if something 
-# else in the script fails above.
-rm -f /tmp/samba-was-not-running
-
 #DEBHELPER#
 
 exit 0