From: David Levine <david.levine@gonift.com>
Date: Sun, 13 Mar 2016 14:42:39 +0000 (-0400)
Subject: Merge branch 'master' into xoauth
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/012d05c2b62332eb400d66b806e48216d39358c6?ds=inline;hp=--cc

Merge branch 'master' into xoauth
---

012d05c2b62332eb400d66b806e48216d39358c6
diff --cc .gitignore
index 27038108,1359f96b..f251aef7
--- a/.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 Makefile.am
index 59269d51,ec523ec4..cb34b5db
--- a/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 uip/send.c
index 4c022b4c,26ef89a8..22cdb10c
--- a/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;