Merge branch 'master' into portable
Merge branch 'portable' of ssh://ssh.poolp.org/git/opensmtpd into portable
update from -current:

From henning@:
Log message:
need errno, thx sthen
Merge branch 'master' into portable
Sync openbsd-compat/defines.h with portable OpenSSH. While there, better handle MAILDIR's #define. Fix #364