Index: Makefile
===================================================================
RCS file: /cvs/master/smail/src/Makefile,v
retrieving revision 1.40
diff -c -r1.40 Makefile
*** Makefile	1998/04/11 23:30:08	1.40
--- Makefile	1998/08/03 04:31:50
***************
*** 78,89 ****
  all:	ddrivlib rdrivlib tdrivlib smail
  
  smail:	${DEFS_SH} ${FIRSTOBJ} ${OBJ} ${DRIVLIBS} ${LASTOBJ} \
! 		${COMPAT_LIB} bump_cnt.sh
! 	@. ./${DEFS_SH}; ${XEXEC} ${SHELL} bump_cnt.sh
! 	@. ./${DEFS_SH}; ${XEXEC} $$CC $$CFLAGS ${INCLUDES} -c ldinfo.c
  	@. ./${DEFS_SH}; ${XEXEC} $$CC $$LDFLAGS -o smail \
  		${FIRSTOBJ} ${OBJ} ${DRIVLIBS} ${LASTOBJ} \
  		${COMPAT_LIB} $$DBM_LIB $$LIBS ldinfo.o
  
  ${FIRSTOBJ} ${OBJ} ${LASTOBJ}: ${DEFS_SH} ${DEFS_H}
  
--- 78,93 ----
  all:	ddrivlib rdrivlib tdrivlib smail
  
  smail:	${DEFS_SH} ${FIRSTOBJ} ${OBJ} ${DRIVLIBS} ${LASTOBJ} \
! 		${COMPAT_LIB} bump_cnt.sh ldinfo.o
  	@. ./${DEFS_SH}; ${XEXEC} $$CC $$LDFLAGS -o smail \
  		${FIRSTOBJ} ${OBJ} ${DRIVLIBS} ${LASTOBJ} \
  		${COMPAT_LIB} $$DBM_LIB $$LIBS ldinfo.o
+ 
+ ldinfo.c:
+ 	@. ./${DEFS_SH}; ${XEXEC} ${SHELL} bump_cnt.sh
+ 
+ ldinfo.o: ldinfo.c
+ 	@. ./${DEFS_SH}; ${XEXEC} $$CC $$CFLAGS ${INCLUDES} -c ldinfo.c
  
  ${FIRSTOBJ} ${OBJ} ${LASTOBJ}: ${DEFS_SH} ${DEFS_H}
  
Index: addr.c
===================================================================
RCS file: /cvs/master/smail/src/addr.c,v
retrieving revision 1.26
diff -c -r1.26 addr.c
*** addr.c	1998/07/05 17:51:47	1.26
--- addr.c	1998/09/15 05:13:27
***************
*** 492,504 ****
       */
      if (target) {
  	*remainder = ap;
- #ifndef USE_TARGET_DOMAIN
- 	*target = NULL;
- 	DEBUG1(DBG_ADDR_HI, "parse_address: LOCAL: remainder=%s\n", *remainder);
- #else
  	DEBUG2(DBG_ADDR_HI, "parse_address: LOCAL: target=%s, remainder=%s\n",
  	       *target ? *target : "(no-domain)", *remainder);
- #endif
      } else {
  	DEBUG(DBG_ADDR_HI, "parse_address: LOCAL\n");
      }
--- 492,499 ----
Index: direct.c
===================================================================
RCS file: /cvs/master/smail/src/direct.c,v
retrieving revision 1.23
diff -c -r1.23 direct.c
*** direct.c	1998/04/11 23:30:20	1.23
--- direct.c	1998/09/15 05:22:51
***************
*** 633,642 ****
  
  	    return SEND_TO_NEXT;
  	}
! #if 0 /* since we no longer reparse mailbox forms of localhosts right down to the remainder */
! 	/* This prevents accidental matching of remainder for virtual hosts */
  	addr->flags |= ADDR_DONTHASH;
- #endif
  	DEBUG6(DBG_DIRECT_HI,
  	       "    NOT passing %s@%s to next director as %s%s%s%s\n",
  	       addr->parent->remainder,
--- 633,643 ----
  
  	    return SEND_TO_NEXT;
  	}
! 	/* Turning on ADDR_DONTHASH prevents accidental matching of remainder
! 	 * for virtual hosts or for cases where an alias/etc. re-directs to a
! 	 * localhost.
! 	 */
  	addr->flags |= ADDR_DONTHASH;
  	DEBUG6(DBG_DIRECT_HI,
  	       "    NOT passing %s@%s to next director as %s%s%s%s\n",
  	       addr->parent->remainder,
Index: main.c
===================================================================
RCS file: /cvs/master/smail/src/main.c,v
retrieving revision 1.48
diff -c -r1.48 main.c
*** main.c	1998/04/13 03:33:39	1.48
--- main.c	1998/09/15 19:27:16
***************
*** 756,762 ****
  	}
  	DEBUG4(DBG_MAIN_LO, "main: about to run %s %s %s %s\n",
  	       utilargs[0], utilargs[1], utilargs[2] ? utilargs[2] : "", utilargs[3] ? utilargs[3] : "");
! 	child = open_child(utilargs, (char **) NULL, stdin, stdout, fileno(stderr),
  			   CHILD_MINENV, (int) getuid(), (int) getgid());
  	if (child == -1) {
  	    if (errfile) {
--- 756,762 ----
  	}
  	DEBUG4(DBG_MAIN_LO, "main: about to run %s %s %s %s\n",
  	       utilargs[0], utilargs[1], utilargs[2] ? utilargs[2] : "", utilargs[3] ? utilargs[3] : "");
! 	child = open_child(utilargs, (char **) NULL, (FILE **) NULL, (FILE **) NULL, fileno(stderr),
  			   CHILD_MINENV, (int) getuid(), (int) getgid());
  	if (child == -1) {
  	    if (errfile) {