--- qmail-smtpd.run	Mon Dec 25 23:01:30 2006
+++ run	Wed Dec 27 10:29:19 2006
@@ -1,13 +1,19 @@
 #!/bin/sh
+
 exec 2>&1
+
 #
 # SMTP service 
 #
+
 QMAIL="/var/qmail"
 ME="`head -1 $QMAIL/control/me`"
 CONCURRENCY=${CONCURRENCY:=50}
 QUSER="qmaild"
 
+# CLASS="-submission"
+CLASS=""
+
 PATH="$QMAIL/bin:$PATH"
 
 # source the environemt in ./env
@@ -21,6 +27,8 @@
 # enforce some sane defaults
 QUSER=${QUSER:="qmaild"}
 PBSTOOL=${PBSTOOL:="$QMAIL/bin/pbscheck"}
+LISTENON=${LISTENON:=0}
+PORT=${PORT:=smtp}
 
 if [ X${NOPBS+"true"} = X"true" ]; then
 	unset PBSTOOL
@@ -28,8 +36,8 @@
 
 exec \
 	envuidgid $QUSER \
-	tcpserver -v -URl $ME -x$QMAIL/control/qmail-smtpd.cdb \
-	    ${CONCURRENCY:+"-c$CONCURRENCY"} ${BACKLOG:+"-b$BACKLOG"} 0 smtp \
+	tcpserver -v -URl $ME ${TCPSERVEROPTS} -x$QMAIL/control/qmail-smtpd${CLASS}.cdb \
+	    ${CONCURRENCY:+"-c$CONCURRENCY"} ${BACKLOG:+"-b$BACKLOG"} ${LISTENON} ${PORT} \
 	$PBSTOOL \
 	$QMAIL/bin/qmail-smtpd