From ccadc08df59949ba12cfb7a71045ca62483fd492 Mon Sep 17 00:00:00 2001 From: John Denker Date: Sat, 14 Jul 2012 08:53:15 -0700 Subject: turn off insecure pop3 server --- tools/qmail | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'tools') 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 \ -- cgit v1.2.3