--- /etc/init.d/dbmail	2006-11-18 18:56:06.000000000 +0100
+++ dbmail.init	2006-11-15 16:54:55.000000000 +0100
@@ -29,7 +29,7 @@
 IMAPD_NAME=dbmail-imapd
 POP3D_NAME=dbmail-pop3d
 LMTPD_NAME=dbmail-lmtpd
-SIEVE_NAME=dbmail-timsieved
+SIEVE_NAME=dbmail-timsieve
 
 NAME="dbmail"
 
@@ -128,8 +128,8 @@
 	eval '_name=$'$1'_NAME'
 	
 	log_progress_msg "$_name"
-	start-stop-daemon --stop --signal HUP \
-		--pidfile ${PID_DIR}/${_name}.pid
+	start-stop-daemon --stop --signal HUP --quiet \
+		--pidfile ${PID_DIR}/${_name}.pid --name ${_name}
 	
 	r=$?
 	if [ $r -gt 0 ]; then
@@ -145,32 +145,32 @@
   start)
 	log_daemon_msg "Starting $DESC"
 	gr=0
-	if [ ${START_IMAPD:-false} = "true" ]; then service_start "IMAPD" || let gr=$gr+$?; fi
-	if [ ${START_POP3D:-false} = "true" ]; then service_start "POP3D" || let gr=$gr+$?; fi
-	if [ ${START_LMTPD:-false} = "true" ]; then service_start "LMTPD" || let gr=$gr+$?; fi
-	if [ ${START_SIEVE:-false} = "true" ]; then service_start "SIEVE" || let gr=$gr+$?; fi
-	if [ ${START_SSL:-false} = "true" ]; then ssl_wrapper start || let gr=$gr+$?; fi
+	if [ "$START_IMAPD" ]; then service_start "IMAPD" || let gr=$gr+$?; fi
+	if [ "$START_POP3D" ]; then service_start "POP3D" || let gr=$gr+$?; fi
+	if [ "$START_LMTPD" ]; then service_start "LMTPD" || let gr=$gr+$?; fi
+	if [ "$START_SIEVE" ]; then service_start "SIEVE" || let gr=$gr+$?; fi
+	if [ "$START_SSL" ]; then ssl_wrapper start || let gr=$gr+$?; fi
  	log_end_msg $gr
 	;;
 	
   stop)
 	log_daemon_msg "Stopping $DESC"
 	gr=0
-	if [ ${START_SSL:-false} = "true" ]; then ssl_wrapper stop || let gr=$gr+$?; fi
-	if [ ${START_IMAPD:-false} = "true" ]; then service_stop "IMAPD" || let gr=$gr+$?; fi
-	if [ ${START_POP3D:-false} = "true" ]; then service_stop "POP3D" || let gr=$gr+$?; fi
-	if [ ${START_LMTPD:-false} = "true" ]; then service_stop "LMTPD" || let gr=$gr+$?; fi
-	if [ ${START_SIEVE:-false} = "true" ]; then service_stop "SIEVE" || let gr=$gr+$?; fi
+	if [ "$START_SSL" ]; then ssl_wrapper stop || let gr=$gr+$?; fi
+	if [ "$START_IMAPD" ]; then service_stop "IMAPD" || let gr=$gr+$?; fi
+	if [ "$START_POP3D" ]; then service_stop "POP3D" || let gr=$gr+$?; fi
+	if [ "$START_LMTPD" ]; then service_stop "LMTPD" || let gr=$gr+$?; fi
+	if [ "$START_SIEVE" ]; then service_stop "SIEVE" || let gr=$gr+$?; fi
 	log_end_msg $gr
 	;;
 	
   reload)
   	log_daemon_msg "Reloading $DESC"
 	gr=0
-	if [ ${START_IMAPD:-false} = "true" ]; then service_reload "IMAPD" || let gr=$gr+$?; fi
-	if [ ${START_POP3D:-false} = "true" ]; then service_reload "POP3D" || let gr=$gr+$?; fi
-	if [ ${START_LMTPD:-false} = "true" ]; then service_reload "LMTPD" || let gr=$gr+$?; fi
-	if [ ${START_SIEVE:-false} = "true" ]; then service_reload "SIEVE" || let gr=$gr+$?; fi
+	if [ "$START_IMAPD" ]; then service_reload "IMAPD" || let gr=$gr+$?; fi
+	if [ "$START_POP3D" ]; then service_reload "POP3D" || let gr=$gr+$?; fi
+	if [ "$START_LMTPD" ]; then service_reload "LMTPD" || let gr=$gr+$?; fi
+	if [ "$START_SIEVE" ]; then service_reload "SIEVE" || let gr=$gr+$?; fi
 	log_end_msg $gr
 	;;
 	
--- /etc/default/dbmail	2006-11-18 19:20:21.000000000 +0100
+++ default.dbmail	2006-11-18 19:18:24.000000000 +0100
@@ -1,9 +1,5 @@
 # debian specific configuration for dbmail
 
-# Setting START_<NAME> to anyhing other than true or 
-# commenting them out will disable the daemons. 
-
 # comment out to disable the pop3 server
 #START_POP3D=true