fix a problem where starting a smtpd that fails due to another
smtpd running will remove its control socket
Merge branch 'master' into portable

Conflicts:
	smtpd/smtpd.c