--- dbmail.init-old	2007-01-12 18:17:49.000000000 +0300
+++ dbmail.init	2007-01-12 18:15:14.000000000 +0300
@@ -52,14 +52,14 @@
 	[ -x /usr/sbin/stunnel ] || return 0
 	# assuming stunnel runs on the same host as dbmail, even though
 	# it aint necessarily so.
-	STUNNLOPT="-D 6 -p $PEMFILE -S 0 -a /etc/ssl/certs -t 300 -r localhost:imap -s dbmail -g dbmail -P /var/run/"
+	STUNNLOPT="-D 6 -p $PEMFILE -S 0 -a /etc/ssl/certs -t 300 -s dbmail -g dbmail -P /var/run/"
 	echo -n "SSL wrapper "
 	case "$1" in 
 		start)
 		[ "$START_IMAPD" ] && \
-			/usr/sbin/stunnel $STUNNLOPT -d imaps 
+			/usr/sbin/stunnel $STUNNLOPT -r localhost:imap -d imaps 
 		[ "$START_POP3D" ] && \
-			/usr/sbin/stunnel $STUNNLOPT -d pop3s
+			/usr/sbin/stunnel $STUNNLOPT -r localhost:pop3 -d pop3s
 		;;
 		
 		stop)