- sort the field names where appropriate.
- add missing smtpname in v2 envelopes in the dict if necessary.
Old v1 envelopes may have a msgid field.  If so, remove it in the dict
upgrade.  Get rid the noop "msgid" case from in the loader.
time_t is 64 bits now
spacing
spacing
Merge branch 'master' of ssh.poolp.org:/git/opensmtpd
spacing
use table reference directly rather than copying the name
use a define for mailname path
remove unused defines
remove unused imsg
add missing entry
reduce the default limits for the feedback mechanism.
Merge branch 'master' into portable

Conflicts:
	smtpd/smtpd.h
	smtpd/util.c
spacing
The code is confusing because it looks like an off-by-one can happen,
but the error would have been caught earlier.  Explicitely handle the
case where strlen is 0 to be safe.
Merge branch 'master' into portable
sort include
Merge branch 'master' into portable

Conflicts:
	smtpd/makemap.c
fix memory leak in lka