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

[idd-guest at alioth.debian.org]

tags 678741 pending
thanks

Author: idd-guest
Date: 2012-06-24 09:54:01 +0000 (Sun, 24 Jun 2012)
New Revision: 4132

Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/samba.init
Log:
Don't reload smbd when running from inetd. Closes: #678741


Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2012-06-23 09:46:37 UTC (rev 4131)
+++ trunk/samba/debian/changelog	2012-06-24 09:54:01 UTC (rev 4132)
@@ -3,6 +3,7 @@
   * Only enable swat in inetd.conf on first install. Closes: #658245 
   * Minor lintian fixes. 
   * Remove DHCP hook. Closes: #652942, #629406, #649100
+  * Don't reload smbd when running from inetd. Closes: #678741 
 
  -- Ivo De Decker <ivo.dedecker at ugent.be>  Tue, 19 Jun 2012 23:11:23 +0200
 

Modified: trunk/samba/debian/samba.init
===================================================================
--- trunk/samba/debian/samba.init	2012-06-23 09:46:37 UTC (rev 4131)
+++ trunk/samba/debian/samba.init	2012-06-24 09:54:01 UTC (rev 4132)
@@ -90,11 +90,13 @@
 
 		;;
 	reload)
-		log_daemon_msg "Reloading /etc/samba/smb.conf" "smbd only"
+		if [ "$RUN_MODE" != "inetd" ]; then
+			log_daemon_msg "Reloading /etc/samba/smb.conf" "smbd only"
 
-		start-stop-daemon --stop --quiet --signal HUP --pidfile $SMBDPID
+			start-stop-daemon --stop --quiet --signal HUP --pidfile $SMBDPID
 
-		log_end_msg 0
+			log_end_msg 0
+		fi
 		;;
 	restart|force-reload)
 		$0 stop