define SMTPD_NAME
Merge branch 'master' into portable

Conflicts:
	smtpd/smtpd.h
missing parameter
Merge branch 'master' into portable