diff options
-rwxr-xr-x | tools/qmail | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/tools/qmail b/tools/qmail index 311c784..f2164d7 100755 --- a/tools/qmail +++ b/tools/qmail @@ -125,13 +125,16 @@ if test -n "${smtp%%[Nn0]*}${smtps%%[Nn0]*}${pop3%%[Nn0]*}${pop3s%%[Nn0]*}${send else : ${default:=yes} fi +insecure_default=no +if test "_$verb" != "_start" ; then + insecure_default=yes +fi : ${send:=$default} : ${smtps:=$default} : ${pop3s:=$default} -: ${pop3:=$default} ## FIXME: disable this ASAP. +: ${pop3:=$insecure_default} : ${smtp:=$default} - flag="" case "$verb" in restart) @@ -192,9 +195,9 @@ case "$verb" in test -n "$banner" && echo $banner ; banner="" proc=qmail-pop3 if proc_running $proc ; then - 1>&2 echo " Oops, $proc is already running ($pid)." + 1>&2 echo " Oops, insecure $proc is already running ($pid)." else - echo -n " POP3-server " + echo -n " insecure POP3-server " /bin/rm -f /var/run/$proc.pid $PIDO /var/run/$proc.pid \ $tcps -v -p -R $mailhost pop3 qmail-popup $mailhost \ |