fix a problem where starting a smtpd that fails due to another
smtpd running will remove its control socket
Merge remote-tracking branch 'upstream/master' into dsn
complete message.