Merge branch 'master' into xoauth

diff --cc .gitignore
index 27038108db16ed1bb4b43583fa82b1531f0acda6,1359f96bfafc6cef3f15a2555e46a15cc0aa8b9d..f251aef7d6fc5f2b0b4245b4a83f90070b2a5274
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -78,9 -80,9 +80,10 @@@ a.out.dSYM
  /uip/mark
  /uip/mhbuild
  /uip/mhfixmsg
+ /uip/mhical
  /uip/mhl
  /uip/mhlist
 +/uip/mhlogin
  /uip/mhn
  /uip/mhparam
  /uip/mhpath

diff --cc MACHINES
Simple merge

diff --cc Makefile.am
index 59269d5106a1487a43922844dcc2fe11154b86a3,ec523ec468055b7d4c4851bbab6c64c7bfb97f91..cb34b5db50df166c9b471925d88654ba2f3294ac
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -106,8 -105,14 +110,14 @@@ TESTS = test/ali/test-ali test/anno/tes
  
  check_SCRIPTS = test/common.sh
  check_PROGRAMS = test/getfullname test/getcanon test/fakepop test/fakesmtp \
 -               test/getcwidth
 +               test/getcwidth test/fakehttp
- DISTCHECK_CONFIGURE_FLAGS = DISABLE_SETGID_MAIL=1
+ 
+ ## The location of installed nmhetcdir is, for all purposes except
+ ## distcheck, $nmhetcdir.  For distcheck, prepend $MH_INST_DIR (from
+ ## test/common.sh.in), which is based on $MH_TEST_DIR (from
+ ## $TESTS_ENVIRONMENT).
+ DISTCHECK_CONFIGURE_FLAGS = DISABLE_SETGID_MAIL=1 \
+                           NMHETCDIRINST='$${abs_builddir}/test/testdir/inst'
  
  ##
  ## Stuff that should be cleaned via "make clean"

diff --cc configure.ac
Simple merge

diff --cc h/mh.h
Simple merge

diff --cc h/prototypes.h
Simple merge

diff --cc man/send.man
Simple merge

diff --cc uip/inc.c
Simple merge

diff --cc uip/mhparam.c
Simple merge

diff --cc uip/post.c
Simple merge

diff --cc uip/send.c
index 4c022b4cac6624da160ece7685990c6d7b4d2b61,26ef89a8b4d18997da75416e1cb01f59f78a6722..22cdb10cf778bee0fc78f94679dcb020664ca3c6
--- 1/uip/send.c
--- 2/uip/send.c
+++ b/uip/send.c
@@@ -282,7 -255,9 +283,8 @@@ main (int argc, char **argv
                case SERVSW: 
                case SASLMECHSW:
                case SASLMXSSFSW:
 -              case USERSW:
                case PORTSW:
+               case MTSSM:
                case MTSSW:
                case MESSAGEIDSW:
                    vec[vecp++] = --cp;