Imported Debian patch 8.13.3-6debian/8.13.3-6

12 files changed, 589 insertions, 141 deletions

diff --git a/debian/cf/Makefile.in b/debian/cf/Makefile.in
new file mode 100644
index 0000000..97d0ad9
--- /dev/null
+++ b/debian/cf/Makefile.in
@@ -0,0 +1,453 @@
+# Makefile.in generated by automake 1.9.4 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = cf
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/./build/mkinstalldirs
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEBIAN = @DEBIAN@
+DEBIAN_DH = @DEBIAN_DH@
+DEB_BUILD_ARCH = @DEB_BUILD_ARCH@
+DEB_BUILD_GNU_CPU = @DEB_BUILD_GNU_CPU@
+DEB_BUILD_GNU_SYSTEM = @DEB_BUILD_GNU_SYSTEM@
+DEB_BUILD_GNU_TYPE = @DEB_BUILD_GNU_TYPE@
+DEB_HOST_ARCH = @DEB_HOST_ARCH@
+DEB_HOST_GNU_CPU = @DEB_HOST_GNU_CPU@
+DEB_HOST_GNU_SYSTEM = @DEB_HOST_GNU_SYSTEM@
+DEB_HOST_GNU_TYPE = @DEB_HOST_GNU_TYPE@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SM_CPYRT = @SM_CPYRT@
+SM_DATE = @SM_DATE@
+SM_ENABLE_AUTH_FALSE = @SM_ENABLE_AUTH_FALSE@
+SM_ENABLE_AUTH_TRUE = @SM_ENABLE_AUTH_TRUE@
+SM_ENABLE_LDAP_FALSE = @SM_ENABLE_LDAP_FALSE@
+SM_ENABLE_LDAP_TRUE = @SM_ENABLE_LDAP_TRUE@
+SM_ENABLE_TLS_FALSE = @SM_ENABLE_TLS_FALSE@
+SM_ENABLE_TLS_TRUE = @SM_ENABLE_TLS_TRUE@
+SM_MAXVERS = @SM_MAXVERS@
+SM_MINVERS = @SM_MINVERS@
+SM_VERS = @SM_VERS@
+STRIP = @STRIP@
+VERSION = @VERSION@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_STRIP = @ac_ct_STRIP@
+ac_version = @ac_version@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+am_version = @am_version@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+buildtree = @buildtree@
+datadir = @datadir@
+docdir = @docdir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sm_auth_lib = @sm_auth_lib@
+sm_badepends = @sm_badepends@
+sm_build_arch = @sm_build_arch@
+sm_custom = @sm_custom@
+sm_databases = @sm_databases@
+sm_date = @sm_date@
+sm_depends = @sm_depends@
+sm_dist_name = @sm_dist_name@
+sm_dist_vers = @sm_dist_vers@
+sm_editmap_envdef = @sm_editmap_envdef@
+sm_editmap_libs = @sm_editmap_libs@
+sm_enable_auth = @sm_enable_auth@
+sm_enable_bind = @sm_enable_bind@
+sm_enable_dev = @sm_enable_dev@
+sm_enable_doc = @sm_enable_doc@
+sm_enable_hesiod = @sm_enable_hesiod@
+sm_enable_ipv6 = @sm_enable_ipv6@
+sm_enable_ldap = @sm_enable_ldap@
+sm_enable_maillock = @sm_enable_maillock@
+sm_enable_milter = @sm_enable_milter@
+sm_enable_ndbm = @sm_enable_ndbm@
+sm_enable_newdb = @sm_enable_newdb@
+sm_enable_nis = @sm_enable_nis@
+sm_enable_nisplus = @sm_enable_nisplus@
+sm_enable_regex = @sm_enable_regex@
+sm_enable_sfio = @sm_enable_sfio@
+sm_enable_shm = @sm_enable_shm@
+sm_enable_tcpd = @sm_enable_tcpd@
+sm_enable_tls = @sm_enable_tls@
+sm_envdef = @sm_envdef@
+sm_features = @sm_features@
+sm_ffr = @sm_ffr@
+sm_hesiod_parms = @sm_hesiod_parms@
+sm_host_arch = @sm_host_arch@
+sm_incdirs = @sm_incdirs@
+sm_ldap_lib = @sm_ldap_lib@
+sm_libmilter_envdef = @sm_libmilter_envdef@
+sm_libmilter_libs = @sm_libmilter_libs@
+sm_libs = @sm_libs@
+sm_libsm_envdef = @sm_libsm_envdef@
+sm_libsm_libs = @sm_libsm_libs@
+sm_libsmdb_envdef = @sm_libsmdb_envdef@
+sm_libsmdb_libs = @sm_libsmdb_libs@
+sm_libsmutil_envdef = @sm_libsmutil_envdef@
+sm_libsmutil_libs = @sm_libsmutil_libs@
+sm_m4_ffr = @sm_m4_ffr@
+sm_mail_local_envdef = @sm_mail_local_envdef@
+sm_mail_local_libs = @sm_mail_local_libs@
+sm_mailstats_envdef = @sm_mailstats_envdef@
+sm_mailstats_libs = @sm_mailstats_libs@
+sm_makemap_envdef = @sm_makemap_envdef@
+sm_makemap_libs = @sm_makemap_libs@
+sm_mapdef = @sm_mapdef@
+sm_newdb_lib = @sm_newdb_lib@
+sm_praliases_envdef = @sm_praliases_envdef@
+sm_praliases_libs = @sm_praliases_libs@
+sm_recommends = @sm_recommends@
+sm_revision = @sm_revision@
+sm_rmail_envdef = @sm_rmail_envdef@
+sm_rmail_libs = @sm_rmail_libs@
+sm_sendmail_envdef = @sm_sendmail_envdef@
+sm_sendmail_libs = @sm_sendmail_libs@
+sm_smrsh_envdef = @sm_smrsh_envdef@
+sm_smrsh_libs = @sm_smrsh_libs@
+sm_suggests = @sm_suggests@
+sm_time = @sm_time@
+sm_utc = @sm_utc@
+sm_vacation_envdef = @sm_vacation_envdef@
+sm_vacation_libs = @sm_vacation_libs@
+sm_version = @sm_version@
+sm_version_beta = @sm_version_beta@
+sm_version_major = @sm_version_major@
+sm_version_math = @sm_version_math@
+sm_version_minor = @sm_version_minor@
+sm_version_r = @sm_version_r@
+sm_version_v = @sm_version_v@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+
+#!/usr/bin/make -f
+#------------------------------------------------------------------------------
+# vim: syntax=make
+#
+# $Sendmail: Makefile,v @sm_version@ @sm_date@ @sm_time@ cowboy Exp $
+#
+# Copyright (c) 1998-@SM_CPYRT@ Richard Nelson.  All Rights Reserved.
+#
+# @configure_input@
+#
+# Rules file for Sendmail @sm_version@@sm_revision@(@sm_version_math@)
+#			 on  @sm_dist_name@ @sm_dist_vers@
+#			 via Debhelper V@DEBIAN_DH@
+#
+# Note: the .in file supports Sendmail @SM_MINVERS@ - @SM_MAXVERS@
+#		on Debian slink, potato, woody, testing, sid, ...
+#		but the generated file is customized to the version noted above.
+#
+# Richard Nelson <cowboy@debian.org> @sm_date@ @sm_time@ (@sm_utc@)
+#------------------------------------------------------------------------------
+#
+# Shipped data
+#
+# Installed cf subdirectories
+CF_DIRS = cf debian domain feature hack m4 mailer ostype
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  cf/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  cf/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+uninstall-info-am:
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am:
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	distclean-generic distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-data-hook install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am uninstall uninstall-am uninstall-info-am
+
+#
+# Local customisation... not automake friendly
+#
+install-data-hook:
+	$(INSTALL) -d ${DESTDIR}${pkgdatadir}/cf;
+	cp -a ${top_srcdir}/../${buildtree}/cf/* ${DESTDIR}${pkgdatadir}/cf;
+	chmod a+x ${DESTDIR}${pkgdatadir}/cf/sh/makeinfo.sh;
+	$(RM) ${DESTDIR}${pkgdatadir}/cf/README;
+	$(RM) ${DESTDIR}${pkgdatadir}/cf/sendmail.schema;
+	$(RM) ${DESTDIR}${pkgdatadir}/cf/cf/Build;
+	$(RM) ${DESTDIR}${pkgdatadir}/cf/cf/Makefile;
+	$(RM) ${DESTDIR}${pkgdatadir}/cf/cf/*.cf;
+	for dir in ${CF_DIRS}; do \
+		$(INSTALL) -d ${DESTDIR}${pkgdatadir}/cf/$$dir; \
+		find $$dir -type f -name '*.mc' -o  -name '*.m4' \
+			| xargs -ri \
+			$(INSTALL_DATA) '{}' ${DESTDIR}${pkgdatadir}/cf/'{}'; \
+		done;
+	if [ -f ${top_srcdir}/../${buildtree}/contrib/domainmap.m4 ]; then \
+		$(INSTALL_DATA) ${top_srcdir}/../${buildtree}/contrib/domainmap.m4 \
+			${DESTDIR}${pkgdatadir}/cf/feature; \
+		fi;
+	if [ -f ${top_srcdir}/../${buildtree}/contrib/dnsblaccess.m4 ]; then \
+		$(INSTALL_DATA) ${top_srcdir}/../${buildtree}/contrib/dnsblaccess.m4 \
+			${DESTDIR}${pkgdatadir}/cf/hack; \
+		fi;
+#
+# Debian targets, phase out (this needs to be treated as -arch, not -indep)
+#
+.PHONY: build-indep build-arch
+.PHONY: install-indep install-arch
+build-indep:
+build-arch:
+install-indep: install
+install-arch:
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/debian/cf/debian/autoconf.m4.in b/debian/cf/debian/autoconf.m4.in
index e9d6430..70423d3 100644
--- a/debian/cf/debian/autoconf.m4.in
+++ b/debian/cf/debian/autoconf.m4.in
@@ -51,6 +51,7 @@ define(`sm_enable_maillock',`@sm_enable_maillock@')dnl
 define(`sm_enable_milter',	`@sm_enable_milter@')dnl
 define(`sm_enable_sfio',	`@sm_enable_sfio@')dnl
 define(`sm_enable_auth',	`@sm_enable_auth@')dnl
+define(`sm_auth_lib',		`@sm_auth_lib@')dnl
 define(`sm_enable_tls',		`@sm_enable_tls@')dnl
 define(`sm_enable_shm',		`@sm_enable_shm@')dnl
 define(`sm_ffr',			`@sm_ffr@')dnl
diff --git a/debian/cf/debian/sendmail.mc.in b/debian/cf/debian/sendmail.mc.in
index c52cadb..0e48387 100644
--- a/debian/cf/debian/sendmail.mc.in
+++ b/debian/cf/debian/sendmail.mc.in
@@ -27,7 +27,7 @@ divert(-1)dnl
 #-----------------------------------------------------------------------------
 divert(0)dnl
 #
-#   Copyright (c) 1998-2002 Richard Nelson.  All Rights Reserved.
+#   Copyright (c) 1998-2005 Richard Nelson.  All Rights Reserved.
 #
 #  This file is used to configure Sendmail for use with Debian systems.
 #
@@ -36,6 +36,9 @@ include(`@datadir@/sendmail/cf/m4/cf.m4')dnl
 VERSIONID(`$Id: sendmail.mc, v @sm_version@@sm_revision@ @sm_date@ @sm_time@ cowboy Exp $')
 OSTYPE(`debian')dnl
 DOMAIN(`debian-mta')dnl
+dnl # Items controlled by /etc/mail/sendmail.conf - DO NOT TOUCH HERE
+dnl undefine(`confHOST_STATUS_DIRECTORY')dnl        #DAEMON_HOSTSTATS=
+dnl # Items controlled by /etc/mail/sendmail.conf - DO NOT TOUCH HERE
 dnl #
 dnl # General defines
 dnl #
@@ -44,3 +47,45 @@ dnl #	into this directory before writing files.
 dnl #	If *all* your user accounts are under /home then use that
 dnl #	instead - it will prevent any writes outside of /home !
 dnl #   define(`confSAFE_FILE_ENV',             `')dnl
+dnl #
+dnl # Daemon options - restrict to servicing LOCALHOST ONLY !!!
+dnl # Remove `, Addr=' clauses to receive from any interface
+dnl # If you want to support IPv6, switch the commented/uncommentd lines
+FEATURE(`no_default_msa')dnl
+dnl DAEMON_OPTIONS(`Family=inet6, Name=MTA-v6, Port=smtp, Addr=::1')dnl
+DAEMON_OPTIONS(`Family=inet,  Name=MTA-v4, Port=smtp, Addr=127.0.0.1')dnl
+dnl DAEMON_OPTIONS(`Family=inet6, Name=MSP-v6, Port=submission, Addr=::1')dnl
+DAEMON_OPTIONS(`Family=inet,  Name=MSP-v4, Port=submission, Addr=127.0.0.1')dnl
+dnl #
+dnl # Be somewhat anal in what we allow
+define(`confPRIVACY_FLAGS',dnl
+`needmailhelo,needexpnhelo,needvrfyhelo,restrictqrun,restrictexpand,nobodyreturn,authwarnings')dnl
+dnl #
+dnl # Define connection throttling and window length
+define(`confCONNECTION_RATE_THROTTLE', `15')dnl
+define(`confCONNECTION_RATE_WINDOW_SIZE',`10m')dnl
+dnl #
+dnl # Features
+dnl #
+dnl # The access db is the basis for most of sendmail's checking
+FEATURE(`access_db', , `skip')dnl
+dnl #
+dnl # The greet_pause feature stops some automail bots - but check the
+dnl # provided access db for details on excluding localhosts...
+FEATURE(`greet_pause', `1000')dnl 1 seconds
+dnl #
+dnl # Delay_checks allows sender<->recipient checking
+FEATURE(`delay_checks', `friend', `n')dnl
+dnl #
+dnl # If we get too many bad recipients, slow things down...
+define(`confBAD_RCPT_THROTTLE',`3')dnl
+dnl #
+dnl # Stop connections that overflow our concurrent and time connection rates
+FEATURE(`conncontrol', `nodelay', `terminate')dnl
+FEATURE(`ratecontrol', `nodelay', `terminate')dnl
+dnl #
+dnl # Default Mailer setup
+MAILER_DEFINITIONS
+MAILER(`local')dnl
+MAILER(`smtp')dnl
+
diff --git a/debian/cf/debian/starttls.m4.in b/debian/cf/debian/starttls.m4.in
deleted file mode 100644
index d9de9d0..0000000
--- a/debian/cf/debian/starttls.m4.in
+++ /dev/null
@@ -1,52 +0,0 @@
-divert(-1)dnl
-#-----------------------------------------------------------------------------
-# $Sendmail: starttls.m4,v @sm_version@ @sm_date@ @sm_time@ cowboy Exp $
-#
-# Copyright (c) 2002-@SM_CPYRT@ Richard Nelson.  All Rights Reserved.
-#
-# @configure_input@
-#
-# starttls.m4 m4 file to support user->MTA, MSP->MTA, and MTA->MTA
-# encryption and/or authentication.
-#
-# To use this file, add this line to sendmail.mc and possibly submit.mc:
-# `include(`@sysconfdir@/mail/tls/starttls.m4')dnl'
-#
-#-----------------------------------------------------------------------------
-#
-divert(0)dnl
-VERSIONID(`$Id: starttls.m4,v @sm_version@@sm_revision@ @sm_date@ @sm_time@ cowboy Exp $')
-dnl #
-dnl #---------------------------------------------------------------------
-dnl # Bring in Autoconf results
-dnl #---------------------------------------------------------------------
-ifdef(`sm_version', `dnl',
-`include(`@datadir@/sendmail/cf/debian/autoconf.m4')dnl')
-dnl #
-dnl # Check to see if inclusion is valid (version >= 8.11.0, tls enabled)
-ifelse(eval(sm_version_math >= 527104), `1', dnl
-`ifelse(sm_enable_tls, `yes', `dnl
-dnl #
-dnl # Do not touch anything above this line...
-dnl #
-dnl # CA directory - CA certs should be herein
-define(`confCACERT_PATH', `@sysconfdir@/ssl/certs')dnl
-dnl #
-dnl # CA file (may be the same as client/server certificate)
-define(`confCACERT',      `@sysconfdir@/mail/tls/sendmail-server.crt')dnl
-dnl #
-dnl # Server certificate/key (can be in the same file, and shared w/client)
-dnl # NOTE: The key must *NOT* be encrypted !!!
-define(`confSERVER_CERT', `@sysconfdir@/mail/tls/sendmail-server.crt')dnl
-define(`confSERVER_KEY',  `@sysconfdir@/mail/tls/sendmail-common.key')dnl
-dnl #
-dnl # Clien certificate/key (can be in the same file, and shared w/server)
-dnl # NOTE: The key must *NOT* be encrypted !!!
-define(`confCLIENT_CERT', `@sysconfdir@/mail/tls/sendmail-client.crt')dnl
-define(`confCLIENT_KEY',  `@sysconfdir@/mail/tls/sendmail-common.key')dnl
-dnl #
-dnl # Optional settings
-dnl define(`confTLS_SRV_OPTIONS', `V')dnl          # don't request user certs
-dnl #
-dnl # Do not touch anything below this line...
-)')dnl
diff --git a/debian/cf/domain/debian-msp.m4.in b/debian/cf/domain/debian-msp.m4.in
index c3d04d5..16bdf30 100644
--- a/debian/cf/domain/debian-msp.m4.in
+++ b/debian/cf/domain/debian-msp.m4.in
@@ -23,6 +23,7 @@ ifdef(`sm_version', `dnl',
 dnl #
 VERSIONID(`$Id: debian-msp.m4, v @sm_version@@sm_revision@ @sm_date@ @sm_time@ cowboy Exp $')
 define(`DEBIAN_MSP')dnl
+define(`confCF_VERSION', `Submit')dnl
 dnl #
 dnl # changes made herein *must* be reflected in parse_mc,update_db,debian.m4
 dnl #
@@ -46,7 +47,7 @@ define(`confRRT_IMPLIES_DSN',		`True')dnl
 define(`confSAFE_FILE_ENV',			`/')dnl
 define(`confSAFE_QUEUE',			`True')dnl
 define(`confQUEUE_FILE_MODE',		`0660')dnl
-define(`confTEMP_FILE_MODE',		`0600')dnl
+define(`confTEMP_FILE_MODE',		`0644')dnl
 dnl #
 dnl # Provide some 'more reasonable' timeout values
 dnl # See SASL/TLS sections below for more timeout values
@@ -71,28 +72,3 @@ dnl #
 dnl # Optional items (should be a subset site.config.m4 used for build)
 dnl # to prevent sendmail error messages
 dnl #
-dnl #---------------------------------------------------------------------
-dnl # SMTP AUTH (SASL) support (sendmail 8.10.0 +)
-dnl # NOTE: we'll us inaddr_any instead of 127.0.0.1 (or not...)
-dnl # Sigh: MSP AUTH doesn't work in -bs mode (/etc/sasldb !o+r)
-dnl #---------------------------------------------------------------------
-ifelse(sm_enable_auth, `yes',dnl
-`define(`confAUTH_MECHANISMS',dnl
-	`GSSAPI KERBEROS_V4 DIGEST-MD5 CRAM-MD5 PLAIN LOGIN')dnl'
-`TRUST_AUTH_MECH(`GSSAPI KERBEROS_V4 DIGEST-MD5 CRAM-MD5 PLAIN LOGIN')'
-`ifelse(eval(sm_version_math >= 527360), `1',dnl
-`define(`confTO_AUTH',     `2m')dnl      #           , def=10m'
-`define(`confDONT_BLAME_SENDMAIL',dnl
-defn(`confDONT_BLAME_SENDMAIL')`,GroupReadableSASLDBFile,GroupWritableSASLDBFile')dnl')'
-`DAEMON_OPTIONS(`Name=NoMTA, Addr=127.0.0.1, M=EA')dnl'
-)dnl
-dnl #
-dnl #---------------------------------------------------------------------
-dnl # SMTP STARTTLS (OpenSSL) support (sendmail 8.11.0 +)
-dnl #---------------------------------------------------------------------
-ifelse(sm_enable_tls, `yes',dnl
-`ifelse(eval(sm_version_math >= 527360), `1',dnl
-`define(`confTO_STARTTLS', `2m')dnl      #           , def=10m'
-`define(`confDONT_BLAME_SENDMAIL',dnl
-	defn(`confDONT_BLAME_SENDMAIL')`,GroupReadableKeyFile')dnl')'
-)dnl
diff --git a/debian/cf/domain/debian-mta.m4.in b/debian/cf/domain/debian-mta.m4.in
index 1a82051..5169ef2 100644
--- a/debian/cf/domain/debian-mta.m4.in
+++ b/debian/cf/domain/debian-mta.m4.in
@@ -61,19 +61,19 @@ dnl #
 dnl # Debian users have group writable directories/files by default (8.9.0+)
 ifelse(eval(sm_version_math >= 526592), `1',dnl
 `define(`confDONT_BLAME_SENDMAIL',dnl
-`AssumeSafeChown,ForwardFileInGroupWritableDirPath,GroupWritableForwardFileSafe,GroupWritableIncludeFileSafe,IncludeFileInGroupWritableDirPath')dnl'
+	defn(`confDONT_BLAME_SENDMAIL')`,AssumeSafeChown,ForwardFileInGroupWritableDirPath,GroupWritableForwardFileSafe,GroupWritableIncludeFileSafe,IncludeFileInGroupWritableDirPath')dnl'
 )dnl
 dnl #
 dnl # Don't warn for non-existant forward files (8.10.0+)
 ifelse(eval(sm_version_math >= 526848), `1',dnl
 `define(`confDONT_BLAME_SENDMAIL',dnl
-	defn(`confDONT_BLAME_SENDMAIL')`,DontWarnForwardFileInUnsafeDirPath')dnl'
+	defn(`confDONT_BLAME_SENDMAIL')`,DontWarnForwardFileInUnsafeDirPath,TrustStickyBit,NonRootSafeAddr')dnl'
 )dnl
 dnl #
 dnl # Allow group-writable include files (8.12.0+)
 ifelse(eval(sm_version_math >= 527360), `1',dnl
 `define(`confDONT_BLAME_SENDMAIL',dnl
-	defn(`confDONT_BLAME_SENDMAIL')`,GroupWritableIncludeFile')dnl'
+	defn(`confDONT_BLAME_SENDMAIL')`,GroupWritableIncludeFile,GroupReadableaDefaultAuthInfoFile')dnl'
 )dnl
 dnl #
 dnl # by default, disable Message Submission Agent (8.10.0+)
@@ -95,6 +95,10 @@ ifelse(eval(sm_version_math >= 527360), `1',dnl
 `define(`confPRIVACY_FLAGS',dnl
     defn(`confPRIVACY_FLAGS')`,restrictexpand')dnl')
 dnl #
+dnl # Define trusted user to be the new mta uid (smmta)
+dnl #
+ifdef(`confTRUSTED_USER',,`define(`confTRUSTED_USER',`smmta')dnl')
+dnl #
 dnl # Provide a more reasonable default for number of queue-runners
 dnl # because many/most? people will not discover this themselves
 dnl # and the sendmail default is one!
@@ -104,31 +108,3 @@ dnl #
 dnl # Optional items (should be a subset site.config.m4 used for build)
 dnl # to prevent sendmail error messages
 dnl #
-dnl #---------------------------------------------------------------------
-dnl # SMTP AUTH (SASL) support (sendmail 8.10.0 +)
-dnl # PLAIN/LOGIN needed to support SASL auth via PAM ;(
-dnl # if this bothers you, you allow them only in conjunction w/STARTTLS !
-dnl # for 8.12.0+, add EXTERNAL as an available & trusted mech (w/STARTTLS)
-dnl #---------------------------------------------------------------------
-ifelse(sm_enable_auth, `yes',dnl
-`define(`confAUTH_MECHANISMS',dnl
-`GSSAPI KERBEROS_V4 DIGEST-MD5 CRAM-MD5 PLAIN LOGIN')dnl'
-`TRUST_AUTH_MECH(`GSSAPI KERBEROS_V4 DIGEST-MD5 CRAM-MD5 PLAIN LOGIN')'
-`ifelse(eval(sm_version_math >= 527360), `1',dnl
-`define(`confAUTH_MECHANISMS',dnl
-`EXTERNAL 'defn(`confAUTH_MECHANISMS'))dnl'
-`TRUST_AUTH_MECH(`EXTERNAL')'
-`define(`confTO_AUTH',     `2m')dnl      #           , def=10m'
-`define(`confDONT_BLAME_SENDMAIL',dnl
-defn(`confDONT_BLAME_SENDMAIL')`,GroupReadableSASLDBFile,GroupWritableSASLDBFile')dnl')'
-)dnl
-dnl #
-dnl #---------------------------------------------------------------------
-dnl # SMTP STARTTLS (OpenSSL) support (sendmail 8.11.0 +)
-dnl #---------------------------------------------------------------------
-ifelse(sm_enable_tls, `yes',dnl
-`ifelse(eval(sm_version_math >= 527360), `1',dnl
-`define(`confTO_STARTTLS', `2m')dnl      #           , def=10m'
-`define(`confDONT_BLAME_SENDMAIL',dnl
-	defn(`confDONT_BLAME_SENDMAIL')`,GroupReadableKeyFile')dnl')'
-)dnl
diff --git a/debian/cf/feature/rhsbl.m4 b/debian/cf/feature/rhsbl.m4
index 857ce58..c81c45c 100644
--- a/debian/cf/feature/rhsbl.m4
+++ b/debian/cf/feature/rhsbl.m4
@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 2001 Derek J. Balling
+# Copyright (c) 2002 Derek J. Balling
 #	All rights reserved.
 #
 # Permission to use granted for all purposes. If modifications are made
@@ -11,9 +11,13 @@ divert(-1)
 # works on sendmail-8.12.x ... use on any other version may require tinkering
 # by you the downloader.
 #
+# Incorporates many changes by Sergey S. Mokryshev <mokr@mokr.net>
+#
+#
+
 divert(0)
 ifdef(`_RHSBL_R_',`dnl',`dnl
-VERSIONID(`$Id: rhsbl.m4,v 1.1 2001/08/27 15:41:15 dredd Exp $')
+VERSIONID(`$Id: rhsbl.m4,v 1.4 2002/06/01 14:05:06 dredd Exp $')
 define(`_RHSBL_R_',`')
 ifdef(`_DNSBL_R_',`dnl',`dnl
 LOCAL_CONFIG
@@ -22,19 +26,16 @@ Kdnsbl host -T<TMP>')')
 divert(-1)
 define(`_RHSBL_SRV_', `_ARG_')dnl
 define(`_RHSBL_MSG_', `ifelse(len(X`'_ARG2_),`1',`"550 Mail from " $`'&{RHS} " refused by blackhole site '_RHSBL_SRV_`"',`_ARG2_')')dnl
-define(`_RHSBL_MSG_TMP_', `ifelse(_ARG3_,`t',`"451 Temporary lookup failure of " $`'&{RHS} " at '_RHSBL_SRV_`"',`_ARG2_')')dnl
+define(`_RHSBL_MSG_TMP_', `ifelse(_ARG3_,`t',`"451 Temporary lookup failure of " $`'&{RHS} " at '_RHSBL_SRV_`"',`_ARG3_')')dnl
 divert(8)
-LOCAL_RULESETS
-SLocal_check_mail
 # DNS based RHS spam list _RHSBL_SRV_
 R$+			$: <@> $>CanonAddr $&f
-R<@> $*<@$+.>		$:<@>$1<@$2.>$|$>SearchList<+ rhs>$|<F:$1@$2><D:$2><>
-R$* $| <$={Accept}>	$: OKSOFAR
+R<@> $*<@$+.>		$: <@> <@$2.> $| $>SearchList <+ rhs> $| <F:$1@$2> <D:$2> <>
+R<@> $* $| <$={Accept}>	$: OKSOFAR
 R<@> $*<@$+.> $| $*	$: <?> $(dnsbl $2._RHSBL_SRV_. $: OK $) $(macro {RHS} $@ $2 $)
 R<@> $*			$: OKSOFAR
-R<?>OK			$: OKSOFAR
+R<?> OK			$: OKSOFAR
 ifelse(len(X`'_ARG3_),`1',
 `R<?>$+<TMP>		$: TMPOK',
 `R<?>$+<TMP>		$#error $@ 4.7.1 $: _RHSBL_MSG_TMP_')
 R<?>$+			$#error $@ 5.7.1 $: _RHSBL_MSG_
-divert(-1)
diff --git a/debian/cf/feature/vnet.m4 b/debian/cf/feature/vnet.m4
index 6086baf..aea804b 100644
--- a/debian/cf/feature/vnet.m4
+++ b/debian/cf/feature/vnet.m4
@@ -2,7 +2,7 @@ divert(-1)dnl
 #-----------------------------------------------------------------------------
 # $Sendmail: ./vnet.m4,v 8.12.0 2001/09/24 12:00:00 cowboy Exp $
 #
-# Copyright (c) 2001-2001 Richard Nelson.  All Rights Reserved.
+# Copyright (c) 2001-2004 Richard Nelson.  All Rights Reserved.
 #
 # feature(vnet) config file for building Sendmail
 # 
@@ -21,10 +21,11 @@ LOCAL_CONFIG
 # Support routing of .rscs nodes via XAGENT
 #
 # Define vnet/rscs node hlq
-CAvnet.ibm.com vnet rscs
+CAvnet.ibm.com vnet rscs ipnet
 #
 # Note: you'll have to define your XAGENT node:
 #DAlexvmk.lexington.ibm.com
+######################################################################
 dnl
 dnl
 dnl
@@ -37,13 +38,17 @@ LOCAL_RULE_3
 # Support Lotus Notes and VM TCP/IP MTAs
 #
 # Remove stupid route addressing (%hack) added by VM TCP/IP
-R$* % ibmus.rscs < @ $+> $*	$: $1 < @ us.ibm.com > $3
-R$* % ibmuk.rscs < @ $+> $*	$: $1 < @ uk.ibm.com > $3
-R$* % $-.rscs    < @ $+> $*	$: $1 < @ $2.rscs > $4
+R$* % ibmus.rscs < @ $+> $*	$: $1 < @ us.ibm.com > $3	# Deprecated
+R$* % ibmca.rscs < @ $+> $*	$: $1 < @ ca.ibm.com > $3   # Deprecated
+R$* % ibmuk.rscs < @ $+> $*	$: $1 < @ uk.ibm.com > $3	# Deprecated
+R$* % $-.rscs    < @ $+> $*	$: $1 < @ $2.rscs > $4		# Deprecated
+# Now, rewrite those address to user@<node>.vnet
+R$* < @ $-.$=A > $*			$: $1 < @ $2.vnet . >
 # Now, try the domaintable yet again...
-R$* < @ $-.rscs > $*		$: $1 < @ $(domaintable $2.rscs $) > $3
+#R$* < @ $-.vnet > $*		$: $1 < @ $(domaintable $2.vnet $) > $3
 # Finally, allow an override on simply the rscs domain...
-R$* < @ $-.rscs > $*		$: $1 < @ $2.$(domaintable rscs $) > $3
+#R$* < @ $-.vnet > $*		$: $1 < @ $2.$(domaintable vnet $) > $3
+######################################################################
 dnl
 dnl
 dnl
@@ -52,19 +57,18 @@ LOCAL_NET_CONFIG
 ### vnet: Handle .rscs domain, deliver to *.ibm.com, etc...
 ###
 ######################################################################
-
 # Skip any local addresses
 # (or we'll get a "mail loops back to itself" error
-R$* < @ $=w . > $*	$@ $1 < @ $2 . > $3	regular local name
-R$* < @ $=w > $*	$@ $1 < @ $2 . > $3	regular local name
+R$* < @ $=w . > $*		$@ $1 < @ $2 . > $3	regular local name
+R$* < @ $=w > $*		$@ $1 < @ $2 . > $3	regular local name
 
-# Recipients inside IBM--transfer the mail directly.
+# Recipients of the form user@node.{vnet,rscs,ipnet} get rewritten to
+# user@node.vnet, the message itself is forwarded to 
+# the VM TCP/IP to RSCS gateway node specified in $A.
+R$* < @ $- . vnet . > $*		$#relay $@ $A $: $1 < @$2.VNET. > $3
 
+# Recipients inside IBM--transfer the mail directly.
 R$* < @ $+.ibm.com  > $*	$#relay $@ $2.ibm.com $: $1 < @$2.ibm.com > $3
 R$* < @ $+.ibm.com. > $*	$#relay $@ $2.ibm.com $: $1 < @$2.ibm.com > $3
-
-# Recipients of the form user@node.vnet get rewritten to
-# user@node.vnet.ibm.com, the message itself is forwarded to 
-# the RSCS/VM node specified in $A.
-
-R$* < @ $-.$=A > $*	$#relay $@ $A $: $1 < @$2.vnet.ibm.com > $4
+######################################################################
+LOCAL_CONFIG
diff --git a/debian/cf/hack/debian_auth.m4.in b/debian/cf/hack/debian_auth.m4.in
index 66510b1..917c6b5 100644
--- a/debian/cf/hack/debian_auth.m4.in
+++ b/debian/cf/hack/debian_auth.m4.in
@@ -42,6 +42,6 @@ R$*	$: $&{auth_authen}	    Put authentication id in the workspace
 ifdef(`DEBIAN_DEBUG',dnl
 `R$*	$: $(log authtype:$&{auth_type} $) $1
 R$*	$: $(log authauthen:$&{auth_authen} $) $1
-R$*	$: $(log authauthor:$&{auth_author} $) $1')dnl
+R$*	$: $(log authauthor:$&{auth_author} $) $1')
 R$=t	$@ $#ok Trusted users...    Allow trusted users to auth= as anyone
 #-----------------------------------------------------------------------------
diff --git a/debian/cf/hack/virthost_by_ip.m4.in b/debian/cf/hack/virthost_by_ip.m4.in
index d304213..922751a 100644
--- a/debian/cf/hack/virthost_by_ip.m4.in
+++ b/debian/cf/hack/virthost_by_ip.m4.in
@@ -52,7 +52,7 @@ ifdef(`_REC_BY_', `dnl',
 dnl # Now, override default settings for virtual hosting
 define(`_REC_BY_', `$.by $?{if_name}${if_name}$|$j$. ($v/$Z)$?r with $r$. id $i$?{tls_version}')dnl
 define(`confRECEIVED_HEADER', `_REC_HDR_
-	_REC_AUTH_$?{auth_ssf} (${auth_ssf} bits)$.)
+	_REC_FULL_AUTH_$?{auth_ssf} bits=${auth_ssf}$.)
 	_REC_BY_
 	_REC_TLS_
 	_REC_END_')dnl
diff --git a/debian/cf/mailer/ssh.m4 b/debian/cf/mailer/ssh.m4
new file mode 100644
index 0000000..25cc475
--- /dev/null
+++ b/debian/cf/mailer/ssh.m4
@@ -0,0 +1,42 @@
+PUSHDIVERT(-1)
+dnl
+dnl By using this file, you agree to the terms and conditions set
+dnl forth in the LICENSE file which can be found at the top level of
+dnl the sendmail distribution.
+dnl
+dnl	Original version contributed by Andrzej Filip.
+dnl
+dnl $Log: ssh.m4,v $
+dnl Revision 8.1  2004/03/27 12:54:53  anfi
+dnl *** empty log message ***
+dnl
+VERSIONID(`$Id: ssh.m4,v 8.1 2004/03/27 12:54:53 anfi Exp $')
+
+ifdef(`SSH_MAILER_PATH',,
+	`ifdef(`SSH_PATH',
+		`define(`SSH_MAILER_PATH', SSH_PATH)',
+		`define(`SSH_MAILER_PATH', `/usr/bin/ssh')')')
+ifdef(`SSH_REMOTE_COMMAND',,
+		`define(`SSH_REMOTE_COMMAND', `/usr/sbin/sendmail -bs')')
+define(`_SSH_QGRP', `ifelse(defn(`SSH_MAILER_QGRP'),`',`', ` Q=SSH_MAILER_QGRP,')')dnl
+_DEFIFNOT(`_DEF_SSH_MAILER_FLAGS', `mDFMuX')
+_DEFIFNOT(`SSH_MAILER_FLAGS',`')
+ifdef(`SSH_MAILER_ARGS',, `define(`SSH_MAILER_ARGS', 
+  `ssh -o BatchMode=yes -o EscapeChar=none  -- 'SSH_MAILER_HOST` 'SSH_REMOTE_COMMAND)')
+ifdef(`SSH_MAILER_HOST',, `define(`SSH_MAILER_HOST',`$h')')
+ifdef(`SSH_MAILER_USER',`',
+`errprint(`*** SSH_MAILER_USER must be defined before MAILER(`ssh').
+')')
+ifdef(`SSH_MAILER_DIR',`',
+`errprint(`*** SSH_MAILER_DIR must be defined before MAILER(`ssh').
+')')
+
+POPDIVERT
+######################*****##############
+###   SSH Mailer specification   ###
+##################*****##################
+
+Mssh,	P=SSH_MAILER_PATH, F=_MODMF_(CONCAT(_DEF_SSH_MAILER_FLAGS, SSH_MAILER_FLAGS), `SSH'), S=EnvFromSMTP/HdrFromSMTP, R=ifdef(`_ALL_MASQUERADE_', `EnvToSMTP/HdrFromSMTP', `EnvToSMTP'), E=\r\n, L=990,
+	_OPTINS(`SSH_MAILER_MAX', `M=', `, ')_OPTINS(`SSH_MAILER_MAXMSGS', `m=', `, ')_OPTINS(`SSH_MAILER_MAXRCPTS', `r=', `, ')_OPTINS(`SSH_MAILER_CHARSET', `C=', `, ')T=DNS/RFC822/SMTP,_SSH_QGRP
+	U=SSH_MAILER_USER, D=SSH_MAILER_DIR,
+	A=SSH_MAILER_ARGS
diff --git a/debian/cf/ostype/debian.m4.in b/debian/cf/ostype/debian.m4.in
index bf48888..7c04397 100644
--- a/debian/cf/ostype/debian.m4.in
+++ b/debian/cf/ostype/debian.m4.in
@@ -68,13 +68,15 @@ dnl #
 dnl #---------------------------------------------------------------------
 dnl # mailer paths and options
 dnl #---------------------------------------------------------------------
-define(`LOCAL_MAILER_PATH',  `@libexecdir@/sensible-mda')dnl
+define(`LOCAL_MAILER_PATH',  `@sbindir@/sensible-mda')dnl
 define(`LOCAL_MAILER_ARGS',  `sensible-mda $g $u $h ${client_addr}')dnl
-define(`LOCAL_MAILER_FLAGS', `SPhnu9')dnl
-define(`LOCAL_SHELL_FLAGS',  `u9')dnl
+MODIFY_MAILER_FLAGS(`LOCAL', `+S')dnl  #do keep root
+MODIFY_MAILER_FLAGS(`LOCAL', `-r')dnl  #do not munge args
+MODIFY_MAILER_FLAGS(`LOCAL', `-m')dnl  #do not try LMTP
 define(`PROCMAIL_MAILER_PATH', `/usr/bin/procmail')dnl
 define(`PROCMAIL_MAILER_ARGS', `procmail -m $h $f $u')dnl
 define(`USENET_MAILER_PATH', `/usr/bin/inews')dnl
+dnl define(`confDEF_CHAR_SET', `iso-8859-1')dnl
 dnl #
 dnl # Optional items (should be a subset site.config.m4 used for build)
 dnl # to prevent sendmail error messages