initial import of NetBSD tree

132 files changed, 57254 insertions, 0 deletions

diff --git a/usr.sbin/sendmail/FAQ b/usr.sbin/sendmail/FAQ
new file mode 100644
index 00000000000..743dc362fca
--- /dev/null
+++ b/usr.sbin/sendmail/FAQ
@@ -0,0 +1,343 @@
+			    Sendmail Version 8
+			Frequently Asked Questions
+		         Version 8.4 of 4/20/94
+
+
+This FAQ is specific to Version 8 of sendmail.  Other questions,
+particularly regarding compilation and configuration, are answered
+in src/READ_ME and cf/README.
+
+----------------------------------------------------------------------
+  * Where can I get Version 8?
+
+	Via anonymous FTP from FTP.CS.Berkeley.EDU in /ucb/sendmail.
+----------------------------------------------------------------------
+  * What are the differences between Version 8 and other versions?
+
+	See doc/changes/changes.me in the sendmail distribution.
+----------------------------------------------------------------------
+  * What happened to sendmail 6.x and 7.x?
+
+	When I released a new version of sendmail, I changed it to
+	Release 6.  Development continued in that tree until 4.4BSD
+	was released, when everything on the 4.4 tape was set to be
+	version 8.1.  Version 7.x never existed.
+----------------------------------------------------------------------
+  * Version 8 requires a new version of "make".  Where can I get this?
+
+	Actually, Version 8 does not require a new version of "make".
+	It includes a collection of Makefiles for different architectures,
+	only one or two of which require the new "make".  If you are
+	porting to a new architecture, start with Makefile.dist.
+
+	If you really do want the new make, it is available on any of
+	the BSD Net2 or 4.4-Lite distribution sites.  These include:
+
+		ftp.uu.net		/systems/unix/bsd-sources
+		gatekeeper.dec.com	/.0/BSD/net2
+		ucquais.cba.uc.edu	/pub/net2
+		ftp.luth.se		/pub/unix/4.3bsd/net2
+
+	Diffs and instructions for building this version of make under
+	SunOS 4.1.x are available on ftp.css.itd.umich.edu in
+	/pub/systems/sun/Net2-make.sun4.diff.Z.
+----------------------------------------------------------------------
+  * What macro package do I use to format the V8 man pages?
+
+	The BSD group switched over the the ``mandoc'' macros for
+	the 4.4 release.  These include more hooks designed for
+	hypertext handling.  However, new man pages won't format
+	under the old man macros.  Fortunately, old man pages will
+	format under the new mandoc macros.
+
+	Get the new macros with the BSD Net2 or 4.4-Lite release.
+
+	This macro set is also available with newer versions of groff.
+----------------------------------------------------------------------
+  * What books are available describing sendmail?
+
+	There is one book available devoted to sendmail:
+
+	    Costales, Allman, and Rickert, _Sendmail_.  O'Reilly &
+		Associates.
+
+	Several books have sendmail chapters, for example:
+
+	    Nemeth, Snyder, and Seebass, _Unix System Administration
+		Handbook_.  Prentice-Hall.
+	    Carl-Mitchell and Quarterman, _Practical Internetworking with
+		TCP/IP and UNIX_.  Addison-Wesley.
+	    Hunt, _TCP/IP Network Administration_.  O'Reilly & Associates.
+
+	Another book about sendmail is due out "soon":
+
+	    Avolio & Vixie, _Sendmail Theory and Practice_.  Digital
+		Press (release date unknown).
+----------------------------------------------------------------------
+  * How do I make all my addresses appear to be from a single host?
+
+	Using the V8 configuration macros, use:
+
+		MASQUERADE_AS(my.dom.ain)
+
+	This will cause all addresses to be sent out as being from
+	the indicated domain.
+----------------------------------------------------------------------
+  * How do I rewrite my From: lines to read ``First_Last@My.Domain''?
+
+	There are a couple of ways of doing this.  This describes using
+	the "user database" code.  This is still experimental, and was
+	intended for a different purpose -- however, it does work
+	with a bit of care.  It does require that you have the Berkeley
+	"db" package installed (it won't work with DBM).
+
+	First, create your input file.  This should have lines like:
+
+		loginname:mailname	First_Last
+		First_Last:maildrop	loginname
+
+	Install it in (say) /etc/userdb.  Create the database:
+
+		makemap btree /etc/userdb.db < /etc/userdb
+
+	You can then create a config file that uses this.  You will
+	have to include the following in your .mc file:
+
+		define(confUSERDB_SPEC, /etc/userdb.db)
+		FEATURE(notsticky)
+----------------------------------------------------------------------
+  * So what was the user database feature intended for?
+
+	The intent was to have all information for a given user (where
+	the user is the unique login name, not an inherently non-unique
+	full name) in one place.  This would include phone numbers,
+	addresses, and so forth.  The "maildrop" feature is because
+	Berkeley does not use a centralized mail server (there are a
+	number of reasons for this that are mostly historic), and so
+	we need to know where each user gets his or her mail delivered --
+	i.e., the mail drop.
+
+	We are in the process of setting up our environment so that
+	mail sent to an unqualified "name" goes to that person's
+	preferred maildrop; mail sent to "name@host" goes to that
+	host.  The purpose of "FEATURE(notsticky)" is to cause
+	"name@host" to be looked up in the user database for delivery
+	to the maildrop.
+----------------------------------------------------------------------
+  * Why are you so hostile to using full names for e-mail addresses?
+
+	Because full names are not unique.  For example, the computer
+	community has two Andy Tannenbaums and two Peter Deutsches.
+	At one time, Bell Labs had two Stephen R. Bournes with offices
+	a few doors apart.  You can create alternative addresses
+	(e.g., Stephen_R_Bourne_2), but that's even worse -- which
+	one of them has to have their name desecrated in this way?
+	And you can bet that they will get most of the other person's
+	email.
+
+	So called "full names" are just longer versions of unique
+	names.  Rather that lulling people into a sense of security,
+	I'd rather that it be clear that these handles are arbitrary.
+	People should use good user agents that have alias mappings
+	so that they can attach arbitrary names for their personal
+	use to those with whom they correspond.
+
+	Even worse is fuzzy matching in e-mail -- this can make good
+	addresses turn bad.  For example, I'm currently (to the best
+	of my knowledge) the only ``Allman'' at Berkeley, so mail
+	sent to "Allman@Berkeley.EDU" should get to me.  But if
+	another Allman ever appears, this address could suddenly
+	become ambiguous.  I've been the only Allman at Berkeley for
+	over fifteen years -- to suddenly have this "good address"
+	bounce mail because it is ambiguous would be a heinous wrong.
+
+	Finger services should be as fuzzy as possible.  Mail services
+	should be unique.
+----------------------------------------------------------------------
+  * When I use sendmail V8 with a Sun config file I get lines like:
+
+	/etc/sendmail.cf: line 273: replacement $3 out of bounds
+
+    the line in question reads:
+
+	R$*<@$%y>$*		$1<@$2.LOCAL>$3			user@ether
+
+    what does this mean?  How do I fix it?
+
+	V8 doesn't recognize the Sun "$%y" syntax, so as far as it
+	is concerned, there is only a $1 and a $2 (but no $3) in this
+	line.  Read Rick McCarty's paper on "Converting Standard Sun
+	Config Files to Sendmail Version 8", in the contrib directory
+	(file "converting.sun.configs") on the sendmail distribution
+	for a full discussion of how to do this.
+----------------------------------------------------------------------
+  * Should I use a wildcard MX for my domain?
+
+	If at all possible, no.
+
+	Wildcard MX records have lots of semantic "gotcha"s.  For
+	example, they will match a host "unknown.your.domain" -- if
+	you don't explicitly test for unknown hosts in your domain,
+	you will get "config error: mail loops back to myself"
+	errors.
+----------------------------------------------------------------------
+  * I'm connected to the network via a SLIP link.  Sometimes my sendmail
+    process hangs (although it looks like part of the message has been
+    transfered).  Everything else works.  What's wrong?
+
+	Most likely, the problem isn't sendmail at all, but the low
+	level network connection.  It's important that the MTU (Maximum
+	Transfer Unit) for the SLIP connection be set properly at both
+	ends.  If they disagree, large packets will be trashed and
+	the connection will hang.
+----------------------------------------------------------------------
+  * I just upgraded to 8.x and suddenly I'm getting messages in my
+    syslog of the form "collect: I/O error on connection".  What is
+    going wrong?
+
+    	Nothing.  This is just a diagnosis of a condition that had
+    	not been diagnosed before.  If you are getting a lot of these
+    	from a single host, there is probably some incompatibility
+    	between 8.x and that host.  If you get a lot of them in general,
+    	you may have network problems that are causing connections to
+    	get reset.
+----------------------------------------------------------------------
+  * How can I get sendmail to deliver local mail to $HOME/.mail
+    instead of into /usr/spool/mail (or /usr/mail)?
+
+	This is a local mailer issue, not a sendmail issue.  Either
+	modify your local mailer (source code will be required) or
+	change the program called in the "local" mailer configuration
+	description to be a new program that does this local delivery.
+	I understand that "procmail" works well, although I haven't
+	used it myself.
+
+	You might be interested in reading the paper ``HLFSD: Delivering
+	Email to your $HOME'' available in the Proceedings of the
+	USENIX System Administration (LISA VII) Conference (November
+	1993).  This is also available via public FTP from
+	ftp.cs.columbia.edu:/pub/hlfsd/{README.hlfsd,hlfsd.ps}.
+----------------------------------------------------------------------
+  * Under V8, the "From " header gets mysteriously munged when I send
+    to an alias.
+
+	``It's not a bug, it's a feature.''  This happens when you have
+	a "owner-list" alias and you send to "list".  V8 propogates the
+	owner information into the envelope sender field (which appears
+	as the "From " header on UNIX mail or as the Return-Path: header)
+	so that downstream errors are properly returned to the mailing
+	list owner instead of to the sender.  In order to make this
+	appear as sensible as possible to end users, I recommend making
+	the owner point to a "request" address -- for example:
+
+		list:		:include:/path/name/list.list
+		owner-list:	list-request
+		list-request:	eric
+
+	This will make message sent to "list" come out as being
+	"From list-request" instead of "From eric".
+----------------------------------------------------------------------
+  * There are four UUCP mailers listed in the configuration files.
+    Which one should I use?
+
+	The choice is partly a matter of local preferences and what is
+	running at the other end of your UUCP connection.  Unlike good
+	protocols that define what will go over the wire, UUCP uses
+	the policy that you should do what is right for the other end;
+	if they change, you have to change.  This makes it hard to
+	do the right thing, and discourages people from updating their
+	software.  In general, if you can avoid UUCP, please do.
+
+	If you can't avoid it, you'll have to find the version that is
+	closest to what the other end accepts.  Following is a summary
+	of the UUCP mailers available.
+
+	uucp-old (obsolete name: "uucp")
+	  This is the oldest, the worst (but the closest to UUCP) way of
+	  sending messages accros UUCP connections.  It does bangify
+	  everything and prepends $U (your UUCP name) to the sender's
+	  address (which can already be a bang path itself).  It can
+	  only send to one address at a time, so it spends a lot of
+	  time copying duplicates of messages.  Avoid this if at all
+	  possible.
+
+	uucp-new (obsolete name: "suucp")
+	  The same as above, except that it assumes that in one rmail
+	  command you can specify several recipients.  It still has a
+	  lot of other problems.
+
+	uucp-dom
+	  This UUCP mailer keeps everything as domain addresses.
+	  Basically, it uses the SMTP mailer rewriting rules.
+
+	  Unfortunately, a lot of UUCP mailer transport agents require
+	  bangified addresses in the envelope, although you can use
+	  domain-based addresses in the message header.  (The envelope
+	  shows up as the From_ line on UNIX mail.)  So....
+
+	uucp-uudom
+	  This is a cross between uucp-new (for the envelope addresses)
+	  and uucp-dom (for the header addresses).  It bangifies the
+	  envelope sender (From_ line in messages) without adding the
+	  local hostname, unless there is no host name on the address
+	  at all (e.g., "wolf") or the host component is a UUCP host name
+	  instead of a domain name ("somehost!wolf" instead of
+	  "some.dom.ain!wolf").
+
+	Examples:
+
+	We are on host grasp.insa-lyon.fr (UUCP host name "grasp").  The
+	following summarizes the sender rewriting for various mailers.
+
+	Mailer          sender		rewriting in the envelope
+	------		------		-------------------------
+	uucp-{old,new}	wolf		grasp!wolf
+	uucp-dom	wolf		wolf@grasp.insa-lyon.fr
+	uucp-uudom	wolf		grasp.insa-lyon.fr!wolf
+
+	uucp-{old,new}	wolf@fr.net	grasp!fr.net!wolf
+	uucp-dom	wolf@fr.net	wolf@fr.net
+	uucp-uudom	wolf@fr.net	fr.net!wolf
+
+	uucp-{old,new}	somehost!wolf	grasp!somehost!wolf
+	uucp-dom	somehost!wolf	somehost!wolf@grasp.insa-lyon.fr
+	uucp-uudom	somehost!wolf	grasp.insa-lyon.fr!somehost!wolf
+----------------------------------------------------------------------
+  * I'm trying to to get my mail to go into queue only mode, and it
+    delivers the mail interactively anyway.  (Or, I'm trying to use
+    the "don't deliver to expensive mailer" flag, and it doesn't
+    delivers the mail interactively anyway.)  I can see it does it:
+    here's the output of "sendmail -v foo@somehost" (or Mail -v or
+    equivalent).
+
+	The -v flag to sendmail (which is implied by the -v flag to
+	Mail and other programs in that family) tells sendmail to
+	watch the transaction.  Since you have explicitly asked to
+	see what's going on, it assumes that you do not want to to
+	auto-queue, and turns that feature off.  Remove the -v flag
+	and use a "tail -f" of the log instead to see what's going on.
+
+	If you are trying to use the "don't deliver to expensive mailer"
+	flag (mailer flag "e"), be sure you also turn on global option
+	"c" -- otherwise it ignores the mailer flag.
+----------------------------------------------------------------------
+  * I'm getting "Local configuration error" messages, such as:
+
+	553 relay.domain.net config error: mail loops back to myself
+	554 <user@domain.net>... Local configuration error
+
+    How can I solve this problem?
+
+	You have asked mail to the domain (e.g., domain.net) to be
+	forwarded to a specific host (in this case, relay.domain.net)
+	by using an MX record, but the relay machine doesn't recognize
+	itself as domain.net.  Add domain.net to /etc/sendmail.cw
+	(if you are using FEATURE(use_cw_file)) or add "Cw domain.net"
+	to your configuration file.
+----------------------------------------------------------------------
+  * I want to run Sendmail version 8 on my DEC system, but you don't
+    have MAIL11V3 support in sendmail.  How do I handle this?
+
+	Get Paul Vixie's reimplementation of the mail11 protocol
+	from gatekeeper.dec.com in /pub/DEC/gwtools.
+----------------------------------------------------------------------
diff --git a/usr.sbin/sendmail/KNOWNBUGS b/usr.sbin/sendmail/KNOWNBUGS
new file mode 100644
index 00000000000..f34c6b738c1
--- /dev/null
+++ b/usr.sbin/sendmail/KNOWNBUGS
@@ -0,0 +1,131 @@
+
+
+	     K N O W N   B U G S   I N   S E N D M A I L
+			     (for 8.6.7)
+
+
+The following are bugs or deficiencies in sendmail that I am aware of
+but which have not been fixed in the current release.  You probably
+want to get the most up to date version of this from FTP.CS.Berkeley.EDU
+in /ucb/sendmail/KNOWNBUGS.  For descriptions of bugs that have been
+fixed, see the file RELEASE_NOTES (in the root directory of the sendmail
+distribution).
+
+This list is not guaranteed to be complete.
+
+
+* Null bytes are not handled properly.
+
+  Sendmail should handle full binary data.  As it stands, it handles
+  any value from 0x01-0xFF in the body and 0x01-0x80 and 0xA0-0xFF in
+  the header.  Notably missing is 0x00, which would require a major
+  restructuring of the code -- for example, almost no C library support
+  could be used to handle strings.
+
+* Duplicate error messages.
+
+  Sometimes identical, duplicate error messages can be generated.  As
+  near as I can tell, this is rare and relatively innocuous.
+
+* No "exposed users" in "nullrelay" configuration.
+
+  The "nullrelay" configuration hides all addresses behind the mail
+  hub name.  Some sites might prefer to expose some names such as
+  root.  This information is always available in Received: lines.
+
+* $c (hop count) macro improperly set.
+
+  The $c macro is supposed to contain the current hop count, for use
+  when calling a mailer.  This macro is initialized too early, and
+  is always zero (or the value of the -c command line flag, if any).
+  This macro will probably be removed entirely in a future release;
+  I don't believe there are any mailers left that require it.
+
+* If you EXPN a list or user that has a program mailer, the output of
+  EXPN will include ``@local.host.name''.  You can't actually mail to
+  this address.  It's not clear what the right behaviour is in this
+  circumstance.
+
+* REDIRECT aliases don't work with `n' option.
+
+  If you have option `n' set when you use newaliases and have
+  REDIRECT addresses in your aliases file, you'll get the error
+  messages during the newaliases instead of when email is sent to
+  the address in question.  The workaround is to turn off the `n'
+  option.
+
+* MX records that point at non-existent hosts work strangly.
+
+  Consider the DNS records:
+
+	hostH	MX	1 hostA
+		MX	2 hostB
+	hostA	A	128.32.8.9
+
+  (note that there is no A record for hostB).  If hostA is down,
+  an attempt to send to hostH gives "host unknown" -- that is, it
+  reflects out the status on the last host it tries, which in this
+  case is hostB, which is unknown.  It probably ought to eliminate
+  hostB early in processing.
+
+* NAME environment variables with commas break.
+
+  If you define your NAME environment variable to have a comma
+  (e.g., ``Lastname, Firstname''), and you are using the $q definition
+  that uses ``name <address>'' format, sendmail treats the first and
+  last names as two addresses, thus producing a bogus From line.  You
+  can work around this by changing the $q definition to use
+  ``address (name)''.
+
+* \231 considered harmful.
+
+  Header addresses that have the \231 character (and possibly others
+  in the range \201 - \237) behave in odd and usually unexpected ways.
+
+* DEC Alphas (OSF/1 1.3) sometimes time out on sending mail.
+
+  I have one report that DEC Alphas acting as SMTP clients sometimes
+  will apparently not see the "250 OK" message in response to the
+  dot that indicates the end of the message.  This only happens if
+  the message is run from the queue -- if it gets through on first
+  try, everything is fine.  I have been unable to reproduce this
+  problem at Berkeley.
+
+* accept() problem on SVR4.
+
+  Apparently, the sendmail daemon loop (doing accept()s on the network)
+  can get into a wierd state on SVR4; it starts logging ``SYSERR:
+  getrequests: accept: Protocol Error''.  The workaround is to kill
+  and restart the sendmail daemon.  We don't have an SVR4 system at
+  Berkeley that carries more than token mail load, so I can't validate
+  this.  It is likely to be a glitch in the sockets emulation, since
+  "Protocol Error" is not possible error code with Berkeley TCP/IP.
+
+  I've also had someone report the message ``sendmail: accept:
+  SIOCGPGRP failed errno 22'' on an SVR4 system.  This message is
+  not in the sendmail source code, so I assume it is also a bug
+  in the sockets emulation.  (Errno 22 is EINVAL "Invalid Argument"
+  on all the systems I have available, including Solaris 2.x.)
+
+* Sending user deletion not done properly in :include: lists.
+
+  If you don't have the "m" (me too) option set, then a person
+  sending to a list that contains themselves should not get a copy
+  of the message.  However, if that list points to a :include: file
+  that has one address per line, this will break, and the sender
+  will always get a copy of their own message, just as though the
+  "m" option were set.
+
+  You can eliminate this by adding commas at the end of each line
+  of the :include: file.
+
+* Excessive mailing list nesting can run out of file descriptors.
+
+  If you have a mailing list that includes lots of other mailing
+  lists, each of which has a separate owner, you can run out of
+  file descriptors.  Each mailing list with a separate owner uses
+  one open file descriptor (prior to 8.6.6 it was three open
+  file descriptors per list).  This is particularly egregious if
+  you have your connection cache set to be large.
+
+(Version 8.18, last updated 3/14/94)
diff --git a/usr.sbin/sendmail/Makefile b/usr.sbin/sendmail/Makefile
new file mode 100644
index 00000000000..e1d97b61556
--- /dev/null
+++ b/usr.sbin/sendmail/Makefile
@@ -0,0 +1,28 @@
+#       @(#)Makefile	8.3 (Berkeley) 2/27/94
+
+SUBDIR= src mailstats makemap praliases cf/cf
+.if make(install)
+SUBDIR+= doc/intro doc/op
+.endif
+
+FTPDIR=	barad-dur:/disks/barad-dur/ftp/sendmail/.
+VER=	XX
+
+tar: Files.base Files.cf Files.misc Files.xdoc
+	(cd src; ${MAKE})
+	(cd doc; PRINTER=ps ${MAKE})
+	(cd doc; chmod 444 op/op.ps intro/intro.ps usenix/usenix.ps)
+	(cd cf/cf; ${MAKE})
+	pax -w -x tar -L -f sendmail.${VER}.base.tar `grep -v ^# Files.base`
+	compress sendmail.${VER}.base.tar
+	pax -w -x tar -L -f sendmail.${VER}.cf.tar `grep -v ^# Files.cf`
+	compress sendmail.${VER}.cf.tar
+	pax -w -x tar -L -f sendmail.${VER}.misc.tar `grep -v ^# Files.misc`
+	compress sendmail.${VER}.misc.tar
+	pax -w -x tar -L -f sendmail.${VER}.xdoc.tar `grep -v ^# Files.xdoc`
+	compress sendmail.${VER}.xdoc.tar
+
+ftp: sendmail.${VER}.base.tar.Z sendmail.${VER}.cf.tar.Z sendmail.${VER}.misc.tar.Z sendmail.${VER}.xdoc.tar.Z
+	rcp sendmail.${VER}.*.tar.Z RELEASE_NOTES FAQ KNOWNBUGS ${FTPDIR}
+
+.include <bsd.subdir.mk>
diff --git a/usr.sbin/sendmail/READ_ME b/usr.sbin/sendmail/READ_ME
new file mode 100644
index 00000000000..016fa7f49c9
--- /dev/null
+++ b/usr.sbin/sendmail/READ_ME
@@ -0,0 +1,239 @@
+/*-
+ *	@(#)READ_ME	8.10 (Berkeley) 4/13/94
+ */
+
+			SENDMAIL RELEASE 8
+
+This directory has the latest sendmail software from Berkeley.  See
+doc/op/op.me for a summary of changes since 5.67.
+
+Report any bugs to sendmail@CS.Berkeley.EDU.
+
+The latest version of sendmail is kept on FTP.CS.Berkeley.EDU, directory
+/ucb/sendmail; check there for the latest revision.
+
+
++--------------+
+| MANUAL PAGES |
++--------------+
+
+The sendmail manual pages use contemporary Berkeley troff macros.  If
+your system does not process these manual pages, you can pick up the
+new macros in a BSD Net/2 FTP site (e.g.  on FTP.UU.NET, the files
+/systems/unix/bsd-sources/share/tmac/me/strip.sed and
+/systems/unix/bsd-sources/share/tmac/*).
+
+The strip.sed file is only used in installation.
+
+After installation, edit tmac.doc and tmac.andoc to reflect the
+installation path of the tmac files.  Those files contain pointers to
+/usr/share/tmac/, and those pointers are not changed by the `make
+install` process.
+
+Rename the existing tmac.an to be tmac.an.old, and rename tmac.andoc
+to be tmac.an.
+
+tmac.an will choose between tmac.an.old, your old macros, or tmac.doc,
+which are the new macros, so that both the new man pages and the
+existing man pages will be translated properly.
+
+I'm also told that the groff distribution from MIT has a tmac.doc
+macro set that is compatible with these macros.
+
+
++-----------------------+
+| RELATED DOCUMENTATION |
++-----------------------+
+
+There are other files you should read.  Rooted in this directory are:
+
+  CHANGES-R5-R8
+	Describes changes between Release 5 and Release 8 of sendmail.
+	There are some things that may behave somewhat differently.
+	For example, the rules governing when :include: files will
+	be read have been tightened up for security reasons.
+  FAQ
+	Answers to Frequently Asked Questions.
+  KNOWNBUGS
+	Known bugs in the current release.  I try to keep this up
+	to date -- get the latest version from FTP.CS.Berkeley.EDU
+	in /ucb/sendmail/KNOWNBUGS.
+  RELEASE_NOTES
+	A detailed description of the changes in each version.  This
+	is quite long, but informative.
+  src/READ_ME
+	Details on compiling and installing sendmail.
+  cf/README
+	Details on configuring sendmail.
+  doc/op/op.me
+	The sendmail Installation & Operations Guide.  Be warned: if
+	you are running this off on SunOS or some other system with an
+	old version of -me, you need to add the following macro to the
+	macros:
+
+		.de sm
+		\s-1\\$1\\s0\\$2
+		..
+
+	This sets a word in a smaller pointsize.
+
+
++--------------+
+| RELATED RFCS |
++--------------+
+
+There are several related RFCs that you may wish to read -- they are
+available via anonymous FTP to several sites, including nic.ddn.mil
+(directory rfc), ftp.nisc.sri.com (rfc), nis.nsf.net (RFC),
+nisc.jvnc.net (rfc), venera.isi.edu (in-notes), and wuarchive.wustl.edu
+(info/rfc).  They can also be retrieved via electronic mail by sending
+email to one of:
+
+	mail-server@nisc.sri.com
+		Put "send rfcNNN" in message body
+	nis-info@nis.nsf.net
+		Put "send RFCnnn.TXT-1" in message body
+	sendrfc@jvnc.net
+		Put "RFCnnn" as Subject: line
+
+Important RFCs for electronic mail are:
+
+	RFC821	SMTP protocol
+	RFC822	Mail header format
+	RFC974	MX routing
+	RFC976	UUCP mail format
+	RFC1123	Host requirements (modifies 821, 822, and 974)
+	RFC1413	Identification server
+	RFC1341	MIME: Multipurpose Internet Mail Extensions
+	RFC1344	Implications of MIME for Internet Mail Gateways
+
+Other standards that may be of interest (but which are less directly
+relevant to sendmail) are:
+
+	RFC987	Mapping between RFC822 and X.400
+	RFC1049	Content-Type header field (extension to RFC822)
+
+Warning to AIX users: this version of sendmail does not implement
+MB, MR, or MG DNS resource records, as defined as experiments in
+RFC883.
+
+
++-------------------+
+| DATABASE ROUTINES |
++-------------------+
+
+IF YOU WANT TO RUN THE NEW BERKELEY DB SOFTWARE:  ****  DO NOT  ****
+use the version that was on the Net2 tape -- it has a number of
+nefarious bugs that were bad enough when I got them; you shouldn't have
+to go through the same thing.  Instead, get a new version via public
+FTP from ftp.CS.Berkeley.EDU, file ucb/4bsd/db.tar.Z.  This software
+is highly recommended; it gets rid of several stupid limits, it's much
+faster, and the interface is nicer to animals and plants.  You will
+also probably find that you have to add -I/where/you/put/db/include
+to the sendmail makefile to get db.h to work properly.
+
+Be sure you remove ndbm.h and ndbm.o from the db distribution.  These
+will cause problems with sendmail because sendmail already understands
+about NEWDB and NDBM coexisting.
+
+
++--------------------+
+| Host Name Services |
++--------------------+
+
+If you compile with NAMED_BIND (the default) sendmail will use
+DNS (the Domain Name System) for most host name lookups.  If
+you do not have DNS running at your site you may have to turn
+this off to cause sendmail to use NIS and/or the /etc/hosts file.
+In particular, on SunOS you have to choose to use DNS (which
+you should do if you are attached to the Internet, otherwise
+you lose MX records, which are required) or NIS -- there is no
+way to try both.
+
+If you are using NIS and /etc/hosts, it is critical that you
+list the long (fully qualified) name first in the /etc/hosts file
+used to build the NIS database.  For example, the line should read
+
+	128.32.149.68   mastodon.CS.Berkeley.EDU mastodon
+
+**** NOT ****
+
+	128.32.149.68   mastodon mastodon.CS.Berkeley.EDU
+
+If you use the wrong order, sendmail will conclude that your
+canonical name is the short version and use that in messages.
+The name "mastodon" doesn't mean much outside of Berkeley,
+and so this creates incorrect and unreplyable messages.
+
+
++-------------+
+| USE WITH MH |
++-------------+
+
+This version of sendmail notices and reports certain kinds of SMTP
+protocol violations that were ignored by older versions.  If you
+are running MH you may wish to install the patch in contrib/mh.patch
+that will prevent these warning reports.  This patch also works
+with the old version of sendmail, so it's safe to go ahead and
+install it.
+
+
++-----------+
+| MAKEFILES |
++-----------+
+
+The Makefiles in this release use the new Berkeley "make" that is
+available in BSD Net/2 and 4.4BSD.  If you are using this version
+of make, you may notice one or two places where the Makefile includes
+"../../Makefile.inc".  This file is not included with the sendmail
+distribution because it's not part of sendmail.  However, it is,
+in toto:
+
+	#	@(#)Makefile.inc	8.1 (Berkeley) 6/6/93
+
+	BINDIR?=	/usr/sbin
+
+The other directories should all have Makefile.dist files that work
+on the old make, albeit without all the niceties included.
+
+You can also get a new Berkeley make from the Net2 release (available
+on many public FTP archives).  This version should also interpret old
+Makefiles, so you could drop it in as your default make.
+
+For more details, see src/READ_ME.
+
+
++---------------------+
+| DIRECTORY STRUCTURE |
++---------------------+
+
+The structure of this directory tree is:
+
+cf		Source for Berkeley configuration files.  These are
+		different than what you've seen before.  They are a
+		fairly dramatic rewrite, requiring the new sendmail
+		(since they use new features).
+contrib		Some contributed tools to help with sendmail.  THESE
+		ARE NOT SUPPORTED by Berkeley -- contact the original
+		authors if you have problems.  (This directory is not
+		on the 4.4BSD tape.)
+doc		Documentation.  If you are getting source, read
+		op.me -- it's long, but worth it.
+mailstats	Statistics printing program.  It has the pathname of
+		sendmail.st compiled in, so if you've changed that,
+		beware.  This isn't all that useful.
+makemap		A program that creates the keyed maps used by the $( ... $)
+		construct in sendmail.  It is primitive but effective.
+		It takes a very simple input format, so you will probably
+		expect to preprocess must human-convenient formats
+		using sed scripts before this program will like them.
+		But it should be functionally complete.
+praliases	A program to print the DBM version of the aliases file.
+		It hasn't been converted to understand the new Berkeley
+		DB format (which we are using).
+rmail		Source for rmail(8).  This is used as a delivery
+		agent for for UUCP, and could presumably be used by
+		other non-socket oriented mailers.  Older versions of
+		rmail are probably deficient.
+src		Source for the sendmail program itself.
+test		Some test scripts (currently only for compilation aids).
diff --git a/usr.sbin/sendmail/RELEASE_NOTES b/usr.sbin/sendmail/RELEASE_NOTES
new file mode 100644
index 00000000000..98f746193a3
--- /dev/null
+++ b/usr.sbin/sendmail/RELEASE_NOTES
@@ -0,0 +1,2646 @@
+			SENDMAIL RELEASE NOTES
+	     @(#)RELEASE_NOTES	8.6.12.1 (Berkeley) 3/28/95
+
+This listing shows the version of the sendmail binary, the version
+of the sendmail configuration files, the date of release, and a
+summary of the changes in that release.
+
+8.6.12/8.6.12	95/03/28
+	Fix to IDENT code (it was getting the size of the reply buffer
+		too small, so nothing was ever accepted).  Fix from several
+		people, including Allan Johannesen, Shane Castle of the
+		Boulder County Information Services, and Jeff Smith of
+		Warwick University (all arrived within a few hours of
+		each other!).
+	Fix a problem that could cause large jobs to run out of
+		file descriptors on systems that use vfork() rather
+		than fork().
+
+8.6.11/8.6.11	95/03/08
+	The ``possible attack'' message would be logged more often
+		than necessary if you are using Pine as a user agent.
+	The wrong host would be reported in the ``possible attack''
+		message when attempted from IDENT.
+	In some cases the syslog buffer could be overflowed when
+		reporting the ``possible attack'' message.  This can
+		cause denial of service attacks.  Truncate the message
+		to 80 characters to prevent this problem.
+	When reading the IDENT response a loop is needed around the
+		read from the network to ensure that you don't get
+		partial lines.
+	Password entries without any shell listed (that is, a null
+		shell) wouldn't match as "ok".  Problem noted by
+		Rob McMahon.
+	When running BIND 4.9.x a problem could occur because the
+		_res.options field is initialized differently than it
+		was historically -- this requires that sendmail call
+		res_init before it tweaks any bits.
+	Fix an incompatibility in openxscript() between the file open mode
+		and the stdio mode passed to fdopen.  This caused UnixWare
+		2.0 to have conniptions.  Fix from Martin Sohnius of
+		Novell Labs Europe.
+	Fix problem with static linking of local getopt routine when
+		using GNU's ld command.  Fix from John Kennedy of
+		Cal State Chico.
+	It was possible to turn off privacy flags.  Problem noted by
+		*Hobbit*.
+	Be more paranoid about writing files.  Suggestions by *Hobbit*
+		and Liudvikas Bukys.
+	MAKEMAP: fixes for 64 bit machines (DEC Alphas in particular)
+		from Spider Boardman.
+	CONFIG: No changes (version number only, to keep it in sync
+		with the binaries).
+
+8.6.10/8.6.10	95/02/10
+	SECURITY: Diagnose bogus values to some command line flags that
+		could allow trash to get into headers and qf files.
+	Validate the name of the user returned by the IDENT protocol.
+		Some systems that really dislike IDENT send intentionally
+		bogus information.  Problem pointed out by Michael Bushnell
+		of the Free Software Foundation.  Has some security
+		implications.
+	Fix a problem causing error messages about DNS problems when
+		the host name contained a percent sign to act oddly
+		because it was passed as a printf-style format string.
+		In some cases this could cause core dumps.
+	Avoid possible buffer overrun in returntosender() if error
+		message is quite ling.  From Fletcher Mattox of the
+		University of Texas.
+	Fix a problem that would silently drop "too many hops" error
+		messages if and only if you were sending to an alias.
+		From Jon Giltner of the University of Colorado and
+		Dan Harton of Oak Ridge National Laboratory.
+	Fix a bug that caused core dumps on some systems if -d11.2 was
+		set and e->e_message was null.  Fix from Bruce Nagel of
+		Data General.
+	Fix problem that can still cause df files to be left around
+		after "hop count exceeded" messages.  Fix from Andrew
+		Chang and Shau-Ping Lo of SunSoft.
+	Fix a problem that can cause buffer overflows on very long
+		user names (as might occur if you piped to a program
+		with a lot of arguments).
+	Avoid returning an error and re-queueing if the host signature
+		is null; this can occur on addresses like ``user@.''.
+		Problem noted by Wesley Craig and the University of
+		Michigan.
+	Avoid possible calls to malloc(0) if MCI caching is turned
+		off.  Bug fix from Pierre David of the Laboratoire
+		Parallelisme, Reseaux, Systemes et Modelisation (PRiSM),
+		Universite de Versailles - St Quentin, and Jacky
+		Thibault.
+	Make a local copy of the line being sent via senttolist() -- in
+		some cases, buffers could get trashed by map lookups
+		causing it to do unexpected things.  This also simplifies
+		some of the map code.
+	CONFIG: No changes (version number only, to keep it in sync
+		with the binaries).
+
+8.6.9/8.6.9	94/04/19
+	Do all mail delivery completely disconnected from any terminal.
+		This provides consistency with daemon delivery and
+		may have some security implications.
+	Make sure that malloc doesn't get called with zero size,
+		since that fails on some systems.  Reported by Ed
+		Hill of the University of Iowa.
+	Fix multi-line values for $e (SMTP greeting message).  Reported
+		by Mike O'Connor of Ford Motor Company.
+	Avoid syserr if no NIS domain name is defined, but the map it
+		is trying to open is optional.  From Win Bent of USC.
+	Changes for picky compilers from Ed Gould of Digital Equipment.
+	Hesiod support for UDB from Todd Miller of the University of
+		Colorado.  Use "hesiod" as the service name in the U
+		option.
+	Fix a problem that failed to set the "authentic" host name (that
+		is, the one derived from the socket info) if you called
+		sendmail -bs from inetd.  Based on code contributed by
+		Todd Miller (this problem was also reported by Guy Helmer
+		of Dakota State University).  This also fixes a related
+		problem reported by Liudvikas Bukys of the University of
+		Rochester.
+	Parameterize "nroff -h" in all the Makefiles so people with
+		variant versions can use them easily.  Suggested by
+		Peter Collinson of Hillside Systems.
+	SMTP "MAIL" commands with multiple ESMTP parameters required two
+		spaces between parameters instead of one.  Reported by
+		Valdis Kletnieks of Virginia Tech.
+	Reduce the number of system calls during message collection by
+		using global timeouts around the collect() loop.  This
+		code was contributed by Eric Wassenaar.
+	If the initial hostname name gathering results in a name
+		without a dot (usually caused by NIS misconfiguration)
+		and BIND is compiled in, directly access DNS to get
+		the canonical name.  This should make life easier for
+		Solaris systems.  If it still can't be resolved, and
+		if the name server is listed as "required", try again
+		in 30 seconds.  If that also fails, exit immediately to
+		avoid bogus "config error: mail loops back to myself"
+		messages.
+	Improve the "MAIL DELETED BECAUSE OF LACK OF DISK SPACE" error
+		message to explain how much space was available and
+		sound a bit less threatening.  Suggested by Stan Janet
+		of the National Institute of Standards and Technology.
+	If mail is delivered to an alias that has an owner, deliver any
+		requested return-receipt immediately, and strip the
+		Return-Receipt-To: header from the subsequent message.
+		This prevents a certain class of denial of service
+		attack, arguably gives more reasonable semantics, and
+		moves things more towards what will probably become a
+		network standard.  Suggested by Christopher Davis of
+		Kapor Enterprises.
+	Add a "noreceipts" privacy flag to turn off all return receipts
+		without recompiling.
+	Avoid printing ESMTP parameters as part of the error message
+		if there are errors during parsing.  This change is
+		purely cosmetic.
+	Avoid sending out error messages during the collect phase of
+		SMTP; there is an MVS mailer from UCLA that gets
+		confused by this.  Of course, I think it's their bug....
+	Check for the $j macro getting undefined, losing a dot, or getting
+		lost from $=w in the daemon before accepting a connection;
+		if it is, it dumps state, prints a LOG_ALERT message,
+		and drops core for debugging.  This is an attempt to
+		track down a bug that I thought was long since gone.
+		If you see this, please forward the log fragment to
+		sendmail@CS.Berkeley.EDU.
+	Change OLD_NEWDB from a #ifdef to a #if so it can be turned off
+		with -DOLD_NEWDB=0 on the command line.  From Christophe
+		Wolfhugel.
+	Instead of trying to truncate the listen queue for the server
+		SMTP port when the load average is too high, just close
+		the port completely and reopen it later as needed.
+		This ensures that the other end gets a quick "connection
+		refused" response, and that the connection can be
+		recovered later.  In particular, some socket emulations
+		seem to get confused if you tweak the listen queue
+		size around and can never start listening to connections
+		again.  The down side is that someone could start up
+		another daemon process in the interim, so you could
+		have multiple daemons all not listening to connections;
+		this could in turn cause the sendmail.pid file to be
+		incorrect.  A better approach might be to accept the
+		connection and give a 421 code, but that could break
+		other mailers in mysterious ways and have paging behaviour
+		implications.
+	Fix a glitch in TCP-level debugging that caused flag 16.101 to
+		set debugging on the wrong socket.  From Eric Wassenaar.
+	When creating a df* temporary file, be sure you truncate any
+		existing data in the file -- otherwise system crashes
+		and the like could result in extra data being sent.
+	DOC: Replace the CHANGES-R5-R8 readme file with a paper in the
+		doc directory.  This includes some additional
+		information.
+	CONFIG: change UUCP rules to never add $U! or $k! on the front
+		of recipient envelope addresses.  This should have been
+		handled by the $&h trick, but broke if people were
+		mixing domainized and UUCP addresses.  They should
+		probably have converted all the way over to uucp-uudom
+		instead of uucp-{new,old}, but the failure mode was to
+		loop the mail, which was bad news.
+	Portability fixes:
+		Newer BSDI systems (several people).
+		Older BSDI systems from Christophe Wolfhugel.
+		Intergraph CLIX, from Paul Southworth of CICNet.
+		UnixWare, from Evan Champion.
+		NetBSD from Adam Glass.
+		Solaris from Quentin Campbell of the University of
+			Newcastle upon Tyne.
+		IRIX from Dean Cookson and Bill Driscoll of Mitre
+			Corporation.
+		NCR 3000 from Kevin Darcy of Chrysler Corporation.
+		SunOS (it has setsid() and setvbuf() calls) from
+			Jonathan Kamens of OpenVision Technologies.
+		HP-UX from Tor Lillqvist.
+	New Files:
+		src/Makefile.CLIX
+		src/Makefile.NCR3000
+		doc/changes/Makefile
+		doc/changes/changes.me
+		doc/changes/changes.ps
+
+8.6.8/8.6.6	94/03/21
+	SECURITY: it was possible to read any file as root using the
+		E (error message) option.  Reported by Richard Jones;
+		fixed by Michael Corrigan and Christophe Wolfhugel.
+
+8.6.7/8.6.6	94/03/14
+	SECURITY: it was possible to get root access by using wierd
+		values to the -d flag.  Thanks to Alain Durand of
+		INRIA for forwarding me the notice from the bugtraq
+		list.
+
+8.6.6/8.6.6	94/03/13
+	SECURITY: the ability to give files away on System V-based
+		systems proved dangerous -- don't run as the owner
+		of a :include: file on a system that allows giveaways.
+		Unfortunately, this also applies to determining a
+		valid shell.
+	IMPORTANT: Previous versions weren't expiring old connections
+		in the connection cache for a long time under some
+		circumstances.  This could result in resource exhaustion,
+		both at your end and at the other end.  This checks the
+		connections for timeouts much more frequently.  From
+		Doug Anderson of NCSC.
+	Fix a glitch that snuck in that caused programs to be run as
+		the sender instead of the recipient if the mail was
+		from a local user to another local user.  From
+		Motonori Nakamura of Kyoto University.
+	Fix "wildcard" on /etc/shell matching -- instead of looking
+		for "*", look for "/SENDMAIL/ANY/SHELL/".  From
+		Bryan Costales of ICSI.
+	Change the method used to declare the "statfs" availability;
+		instead of HASSTATFS and/or HASUSTAT with a ton of
+		tweaking in conf.c, there is a single #define called
+		SFS_TYPE which takes on one of six values (SFS_NONE
+		for no statfs availability, SFS_USTAT for the ustat(2)
+		syscall, SFS_4ARGS for a four argument statfs(2) call,
+		and SFS_VFS, SFS_MOUNT, or SFS_STATFS for a two argument
+		statfs(2) call with the declarations in <sys/vfs.h>,
+		<sys/mount.h>, or <sys/statfs.h> respectively).
+	Fix glitch in NetInfo support that could return garbage if
+		there was no "/locations/sendmail" property.  From
+		David Meyer of the University of Virginia.
+	Change HASFLOCK from defined/not-defined to a 0/1 definition
+		to allow Linux to turn it off even though it is a
+		BSD-like system.
+	Allow setting of "ident" timeout to zero to turn off the ident
+		protocol entirely.
+	Make 7-bit stripping local to a connection (instead of to a
+		mailer); this allows you to specify that SMTP is a
+		7-bit channel, but revert to 8-bit should it advertise
+		that it supports 8BITMIME.  You still have to specify
+		mailer flag 7 to get this stripping at all.
+	Improve makesendmail script so it handles more cases automatically.
+	Tighten up restrictions on taking ownership of :include: files
+		to avoid problems on systems that allow you to give away
+		files.
+	Fix a problem that made it impossible to rebuild the alias
+		file if it was on a read-only file system.  From
+		Harry Edmon of the University of Washington.
+	Improve MX randomization function.  From John Gardiner Myers
+		of CMU.
+	Fix a minor glitch causing a bogus message to be printed (used
+		%s instead of %d in a printf string for the line number)
+		when a bad queue file was read.  From Harry Edmon.
+	Allow $s to remain NULL on locally generated mail.  I'm not
+		sure this is necessary, but a lot of people have complained
+		about it, and there is a legitimate question as to whether
+		"localhost" is legal as an 822-style domain.
+	Fix a problem with very short line lengths (mailer L= flag) in
+		headers.  This causes a leading space to be added onto
+		continuation lines (including in the body!), and also
+		tries to wrap headers containing addresses (From:, To:,
+		etc) intelligently at the shorter line lengths.  Problem
+		Reported by Lars-Johan Liman of SUNET Operations Center.
+	Log the real user name when logging syserrs, since these can have
+		security implications.  Suggested by several people.
+	Fix address logging of cached connections -- it used to always
+		log the numeric address as zero.  This is a somewhat
+		bogus implementation in that it does an extra system
+		call, but it should be an inexpensive one.  Fix from
+		Motonori Nakamura.
+	Tighten up handling of short syslog buffers even more -- there
+		were cases where the outgoing relay= name was too long
+		to share a line with delay= and mailer= logging.
+	Limit the overhead on split envelopes to one open file descriptor
+		per envelope -- previously the overhead was three
+		descriptors.  This was in response to a problem reported
+		by P{r (Pell) Emanuelsson.
+	Fixes to better handle the case of unexpected connection closes;
+		this redirects the output to the transcript so the info
+		is not lost.  From Eric Wassenaar.
+	Fix potential string overrun if you macro evaluate a string that
+		has a naked $ at the end.  Problem noted by James Matheson
+		<jmrm@eng.cam.ac.uk>.
+	Make default error number on $#error messages 553 (``Requested
+		action not taken: mailbox name not allowed'') instead of
+		501 (``Syntax error in parameters or arguments'') to
+		avoid bogus "protocol error" messages.
+	Strip off any existing trailing dot on names during $[ ... $]
+		lookup.  This prevents it from ending up with two dots
+		on the end of dot terminated names.  From Wesley Craig
+		of the University of Michigan and Bryan Costales of ICSI.
+	Clean up file class reading so that the debugging information is
+		more informative.  It hadn't been using setclass, so you
+		didn't see the class items being added.
+	Avoid core dump if you are running a version of sendmail where
+		NIS is compiled in, and you specify an NIS map, but
+		NIS is not running.  Fix from John Oleynick of
+		Rutgers.
+	Diagnose bizarre case where res_search returns a failure value,
+		but sets h_errno to a success value.
+	Make sure that "too many hops" messages are considered important
+		enough to send an error to the Postmaster (that is, the
+		address specified in the P option).  This fix should
+		help problems that cause the df file to be left around
+		sometimes -- unfortunately, I can't seem to reproduce
+		the problem myself.
+	Avoid core dump (null pointer reference) on EXPN command; this
+		only occurred if your log level was set to 10 or higher
+		and the target account was an alias or had a .forward file.
+		Problem noted by Janne Himanka.
+	Avoid "denial of service" attacks by someone who is flooding your
+		SMTP port with bad commands by shutting the connection
+		after 25 bad commands are issued.  From Kyle Jones of
+		UUNET.
+	Fix core dump on error messages with very long "to" buffers;
+		fmtmsg overflows the message buffer.  Fixed by trimming
+		the to address to 203 characters.  Problem reported by
+		John Oleynick.
+	Fix configuration for HASFLOCK -- there were some spots where
+		a #ifndef was incorrectly #ifdef.  Pointed out by
+		George Baltz of the University of Maryland.
+	Fix a typo in savemail() that could cause the error message To:
+		lists to be incorrect in some places.  From Motonori
+		Nakamura.
+	Fix a glitch that can cause duplicate error messages on split
+		envelopes where an address on one of the lists has a
+		name server failure.  Fix from Voradesh Yenbut of the
+		University of Washington.
+	Fix possible bogus pointer reference on ESMTP parameters that
+		don't have an ``=value'' part.
+	CNAME loops caused an error message to be generated, but also
+		re-queued the message.  Changed to just re-queue the
+		message (it's really hard to just bounce it because
+		of the wierd way the name server works in the presence
+		of CNAME loops).  Problem noted by James M.R.Matheson
+		of Cambridge University.
+	Avoid giving ``warning: foo owned process doing -bs'' messages
+		if they use ``MAIL FROM:<foo>'' where foo is their true
+		user name.  Suggested by Andreas Stolcke of ICSI.
+	Change the NAMED_BIND compile flag to be a 0/1 flag so you can
+		override it easily in the Makefile -- that is, you can
+		turn it off using -DNAMED_BIND=0.
+	If a gethostbyname(...) of an address with a trailing dot fails,
+		try it without the trailing dot.  This is because if
+		you have a version of gethostbyname() that falls back
+		to NIS or the /etc/hosts file it will fail to find
+		perfectly reasonable names that just don't happen to
+		be dot terminated in the hosts file.  You don't want to
+		strip the dot first though because we're trying to ensure
+		that country names that match one of your subdomains get
+		a chance.
+	PRALIASES: fix bogus output on non-null-terminated strings.
+		From Bill Gianopoulos of Raytheon.
+	CONFIG: Avoid rewriting anything that matches $w to be $j.
+		This was in code intended to only catch the self-literal
+		address (that is, [1.2.3.4], where 1.2.3.4 is your
+		IP address), but the code was broken.  However, it will
+		still do this if $M is defined; this is necessary to
+		get client configurations to work (sigh).  Note that this
+		means that $M overrides :mailname entries in the user
+		database!  Problem noted by Paul Southworth.
+	CONFIG: Fix definition of Solaris help file location.  From
+		Steve Cliffe <steve@gorgon.cs.uow.edu.au>.
+	CONFIG: Fix bug that broke news.group.USENET mappings.
+	CONFIG: Allow declaration of SMTP_MAILER_MAX, FAX_MAILER_MAX,
+		and USENET_MAILER_MAX to tweak the maximum message
+		size for various mailers.
+	CONFIG: Change definition of USENET_MAILER_ARGS to include argv[0]
+		instead of assuming that it is "inews" for consistency
+		with other mailers.  From Michael Corrigan of UC San Diego.
+	CONFIG: When mail is forwarded to a LOCAL_RELAY or a MAIL_HUB,
+		qualify the address in the SMTP envelope as user@{relay|hub}
+		instead of user@$j.  From Bill Wisner of The Well.
+	CONFIG: Fix route-addr syntax in nullrelay configuration set.
+	CONFIG: Don't turn off case mapping of user names in the local
+		mailer for IRIX.  This was different than most every other
+		system.
+	CONFIG: Avoid infinite loops on certainly list:; syntaxes in
+		envelope.  Noted by Thierry Besancon
+		<besancon@excalibur.ens.fr>.
+	CONFIG: Don't include -z by default on uux line -- most systems
+		don't want it set by default.  Pointed out by Philippe
+		Michel of Thomson CSF.
+	CONFIG: Fix some bugs with mailertables -- for example, if your
+		host name was foo.bar.ray.com and you matched against
+		".ray.com", the old implementation bound %1 to "bar"
+		instead of "foo.bar".  Also, allow "." in the mailertable
+		to match anything -- essentially, take over SMART_HOST.
+		This also moves matching of explicit local host names
+		before the mailertable so they don't have to be special
+		cased in the mailertable data.  Reported by Bill
+		Gianopoulos of Raytheon; the fix for the %1 binding
+		problem was contributed by Nicholas Comanos of the
+		University of Sydney.
+	CONFIG: Don't include "root" in class $=L (users to deliver
+		locally, even if a hub or relay exists) by default.
+		This is because of the known bug where definition of
+		both a LOCAL_RELAY and a MAIL_HUB causes $=L to ignore
+		both and deliver into the local mailbox.
+	CONFIG: Move up bitdomain and uudomain handling so that they
+		are done before .UUCP class matching; uudomain was
+		reported as ineffective before.  This also frees up
+		diversion 8 for future use.  Problem reported by Kimmo
+		Suominen.
+	CONFIG: Don't try to convert dotted IP address (e.g., [1.2.3.4])
+		into host names.  As pointed out by Jonathan Kamens,
+		these are often used because either the forward or reverse
+		mapping is broken; this translation makes it broken again.
+	DOC: Clarify $@ and $: in the Install & Op Guide.  From Kimmo
+		Suominen.
+	Portability fixes:
+		Unicos from David L. Kensiski of Sterling Sofware.
+		DomainOS from Don Lewis of Silicon Systems.
+		GNU m4 1.0.3 from Karst Koymans of Utrecht University.
+		Convex from Kimmo Suominen <kim@tac.nyc.ny.us>.
+		NetBSD from Adam Glass <glass@sun-lamp.cs.berkeley.edu>.
+		BSD/386 from Tony Sanders of BSDI.
+		Apollo from Eric Wassenaar.
+		DGUX from Doug Anderson.
+		Sequent DYNIX/ptx 2.0 from Tim Wright of Sequent.
+	NEW FILES:
+		src/Makefile.DomainOS
+		src/Makefile.PTX
+		src/Makefile.SunOS.5.1
+		src/Makefile.SunOS.5.2
+		src/Makefile.SunOS.5.x
+		src/mailq.1
+		cf/ostype/domainos.m4
+		doc/op/Makefile
+		doc/intro/Makefile
+		doc/usenix/Makefile
+
+8.6.5/8.6.5	94/01/13
+	Security fix:  /.forward could be owned by anyone (the test
+		to allow root to own any file was backwards).  From
+		Bob Campbell at U.C. Berkeley.
+	Security fix: group ids were not completely set when programs
+		were invoked.  This caused programs to have group
+		permissions they should not have had (usually group
+		daemon instead of their own group).  In particular,
+		Perl scripts would refuse to run.
+	Security: check to make sure files that are written are not
+		symbolic links (at least under some circumstances).
+		Although this does not respond to a specific known
+		attack, it's just a good idea.  Suggested by
+		Christian Wettergren.
+	Security fix: if a user had an NFS mounted home directory on
+		a system with a restricted shell listed in their
+		/etc/passwd entry, they could still execute any
+		program by putting that in their .forward file.
+		This fix prevents that by insisting that their shell
+		appear in /etc/shells before allowing a .forward to
+		execute a program or write a file.  You can disable
+		this by putting "*" in /etc/shells.  It also won't
+		permit world-writable :include: files to reference
+		programs or files (there's no way to disable this).
+		These behaviours are only one level deep -- for
+		example, it is legal for a world-writable :include:
+		file to reference an alias that writes a file, on
+		the assumption that the alias file is well controlled.
+	Security fix: root was not treated suspiciously enough when
+		looking into subdirectories.  This would potentially
+		allow a cracker to examine files that were publically
+		readable but in a non-publically searchable directory.
+	Fix a problem that causes an error on QUIT on a cached
+		connection to create problems on the current job.
+		These are typically unrelated, so errors occur in
+		the wrong place.
+	Reset CurrentLA in sendall() -- this makes sendmail queue
+		runs more responsive to load average, and fixes a
+		problem that ignored the load average in locally
+		generated mail.  From Eric Wassenaar.
+	Fix possible core dump on aliases with null LHS.  From
+		John Orthoefer of BB&N.
+	Revert to using flock() whenever possible -- there are just
+		too many bugs in fcntl() locking, particularly over
+		NFS, that cause sendmail to fail in perverse ways.
+	Fix a bug that causes the connection cache to get confused
+		when sending error messages.  This resulted in
+		"unexpected close" messages.  It should fix itself
+		on the following queue run.  Problem noted by
+		Liudvikas Bukys of the University of Rochester.
+	Include $k in $=k as documented in the Install & Op Guide.
+		This seems odd, but it was documented....  From
+		Michael Corrigan of UCSD.
+	Fix problem that caused :include:s from alias files to be
+		forced to be owned by root instead of daemon
+		(actually DefUid).  From Tim Irvin.
+	Diagnose unrecognized I option values -- from Mortin Forssen
+		of the Chalmers University of Technology.
+	Make "error" mailer work consistently when there is no error
+		code associated with it -- previously it returned OK
+		even though there was a real problem.  Now it assumes
+		EX_UNAVAILABLE.
+	Fix bug that caused the last header line of messages that had
+		no body and which were terminated with EOF instead of
+		"." to be discarded.  Problem noted by Liudvikas Bukys.
+	Fix core dump on SMTP mail to programs that failed -- it tried
+		to go to a "next MX host" when none existed, causing
+		a core dump.  From der Mouse at McGill University.
+	Change IDENTPROTO from a defined/not defined to a 0/1 switch;
+		this makes it easier to turn it off (using
+		-DIDENTPROTO=0 in the Makefile).  From der Mouse.
+	Fix YP_MASTER_NAME store to use the unupdated result of
+		gethostname() (instead of myhostname(), which tries
+		to fully qualify the name) to be consistent with
+		SunOS.  If your hostname is unqualified, this fixes
+		transfers to slave servers.  Bug noted by Keith
+		McMillan of Ameritech Services, Inc.
+	Fix Ultrix problem: gethostbyname() can return a very large
+		(> 500) h_length field, which causes the sockaddr
+		to be trashed.  Use the size of the sockaddr instead.
+		Fix from Bob Manson of Ohio State.
+	Don't assume "-a." on host lookups if NAMED_BIND is not
+		defined -- this confuses gethostbyname on hosts
+		file lookups, which doesn't understand the trailing
+		dot convention.
+	Log SMTP server subprocesses that die with a signal instead
+		of from a clean exit.
+	If you don't have option "I" set, don't assume that a DNS
+		"host unknown" message is authoritative -- it
+		might still be found in /etc/hosts.
+	Fix a problem that would cause Deferred: messages to be sent
+		as the subject of an error message, even though the
+		actual cause of a message was more severe than that.
+		Problem noted by Chris Seabrook of OSSI.
+	Fix race condition in DBM alias file locking.  From Kyle
+		Jones of UUNET.
+	Limit delivery syslog line length to avoid bugs in some
+		versions of syslog(3).  This adds a new compile time
+		variable SYSLOG_BUFSIZE.  From Jay Plett of Princeton
+		University, which is in turn derived from IDA.
+	Fix quotes inside of comments in addresses -- previously
+		it insisted that they be balanced, but the 822 spec
+		says that they should be ignored.
+	Dump open file state to syslog upon receiving SIGUSR1 (for
+		debugging).  This also evaluates ruleset 89, if set
+		(with the null input), and logs the result.  This
+		should be used sparingly, since the rewrite process
+		is not reentrant.
+	Change -qI, -qR, and -qS flags to be case-insensitive as
+		documented in the Bat Book.
+	If the mailer returned EX_IOERR or EX_OSERR, sendmail did not
+		return an error message and did not requeue the message.
+		Fix based on code from Roland Dirlewanger of
+		Reseau Regional Aquarel, Bordeaux, France.
+	Fix a problem that caused a seg fault if you got a 421 error
+		code during some parts of connection initialization.
+		I've only seen this when talking to buggy mailers on
+		the other end, but it shouldn't give a seg fault in
+		any case.  From Amir Plivatsky.
+	Fix core dump caused by a ruleset call that returns null.
+		Fix from Bryan Costales of ICSI.
+	Full-Name: field was being ignored.  Fix from Motonori Nakamura
+		of Kyoto University.
+	Fix a possible problem with very long input lines in setproctitle.
+		From P{r Emanuelsson.
+	Avoid putting "This is a warning message" out on return receipts.
+		Suggested by Douglas Anderson.
+	Detect loops caused by recursive ruleset calls.  Suggested by
+		Bryan Costales.
+	Initialize non-alias maps during alias rebuilds -- they may be
+		needed for parsing.  Problem noted by Douglas Anderson.
+	Log sender address even if no message was collected in SMTP
+		(e.g., if all RCPTs failed).  Suggested by Motonori
+		Nakamura.
+	Don't reflect the owner-list contents into the envelope sender
+		address if the value contains ", :, /, or | (to avoid
+		illegal addresses appearing there).
+	Efficiency hack for toktype macro -- from Craig Partridge of
+		BB&N.
+	Clean up DNS error printing so that a host name is always
+		included.
+	Remember to set $i during queue runs.  Reported by Stephen
+		Campbell of Dartmouth University.
+	If ${HOSTALIASES} is set, use it during canonification so that
+		headers are properly mapped.  Reported by Anne Bennett
+		of Concordia University.
+	Avoid printing misleading error message if SMTP mailer (not
+		using [IPC]) should die on a core dump.
+	Avoid incorrect diagnosis of "file 1 closed" when it is caused
+		by the other end closing the connection.  From
+		Dave Morrison of Oracle.
+	Improve several of the error messages printed by "mailq"
+		to include a host name or other useful information.
+	Add NetInfo preliminary support for NeXT systems.  From Vince
+		DeMarco.
+	Fix a glitch that sometimes caused :include:s that pointed to
+		NFS filesystems that were down to give an "aliasing/
+		forwarding loop broken" message instead of queueing
+		the message for retry.  Noted by William C Fenner of
+		the NRL Connection Machine Facility.
+	Fix a problem that could cause a core dump if the input sequence
+		had (or somehow acquired) a \231 character.
+	Make sure that route-addrs always have <angle brackets> around
+		them in non-SMTP envelopes (SMTP envelopes already do
+		this properly).
+	Avoid wierd headers on unbalanced punctuation of the form:
+		``Joe User <user)'' -- this caused reference to the
+		null macro.  Fix from Rick McCarty of IO.COM.
+	Fix a problem that caused an alias "user: user@local.host" to
+		not have the QNOTREMOTE bit set; this caused configs
+		to act as if FEATURE(notsticky) was defined even when
+		it was not.  The effect of the problem was to make it
+		very hard to to set up satellite sites that had a few
+		local accounts, with everything else forwarded to a
+		corporate hub.  Reported by Detlef Drewanz of the
+		University of Rostock and Mark Frost of NCD.
+	Change queuing to not call rulesets 3, {1 or 2}, 4 on header
+		addresses.  This is more efficient (fewer name server
+		calls) and fixes certain unusual configurations, such
+		as those that have ruleset 4 do something that is
+		non-idempotent unless a mailer-specific ruleset did
+		something else.  Problem reported by Brian J. Coan
+		of the Institute for Global Communications.
+	Fix the "obsolete argument" routine in main to better understand
+		new arguments.  For example, if you used ``sendmail
+		-C config -v -q'' it would choke on the -q because
+		the -C would stop looking for old-format arguments.
+	Fix the code that was intended to allow two users to forward their
+		mail to the same program and have them appear unique.
+	Portability fixes for:
+		SCO UNIX from Murray Kucherawy.
+		SCO Open Server 3.2v4 from Philippe Brand.
+		System V Release 4 from Rick Ellis and others.
+		OSF/1 from Steve Campbell.
+		DG/UX from Ben Mesander of the USGS and Bryan Curnutt
+			of Stoner Associates.
+		Motorola SysV88 from Kevin Johnson of Motorola.
+		Solaris 2.3 from Casper H.S. Dik of the University
+			of Amsterdam and John Caruso of University
+			of Maryland.
+		FreeBSD from Ollivier Robert.
+		NetBSD from Adam Glass.
+		TitanOS from Kate Hedstrom of Rutgers University.
+		Irix from Bryan Curnutt.
+		Dynix from Jim Davis of the University of Arizona.
+		RISC/os.
+		Linux from John Kennedy of California State University
+			at Chico.
+		Solaris 2.x from Tony Boner of the U.S. Air Force.
+		NEXTSTEP 3.x from Vince DeMarco.
+		HP-UX from various people.  NOTA BENE:  the location
+			of the config file has moved to /usr/lib
+			to match the HP-UX version of sendmail.
+	CONFIG: Don't do any recipient rewriting on relay mailer;
+		since this is intended only for internal use, the
+		usual RFC 821/822/1123 rules can be relaxed.  The
+		main point of this is to avoid munging (ugh) UUCP
+		addresses when relaying internally.
+	CONFIG: fix typo in mailer/uucp.m4 that mutilates list:;
+		syntax addresses delivered via UUCP.  Solution
+		provided by Peter Wemm.
+	CONFIG: fix thumb-fumble in default UUCP relaying in ruleset
+		zero; it caused double @ signs in addresses.  From
+		Irving Reid of the University of Toronto.
+	CONFIG: Portability fixes for SCO Unix 3.2 with TCP/IP 1.2.1
+		from Markku Toijala of ICL Personal Systems Oy.
+	CONFIG: Add trailing "." on pseudo-domains for consistency;
+		this fixes a problem (noted by Al Whaley of Sunnyside)
+		that made it hard to recognize your own pseudodomain
+		names.
+	CONFIG: catch "@host" syntax errors (i.e., null local-parts)
+		rather than letting them get "local configuration
+		error"s.  Problem noted by John Gardiner Myers.
+	CONFIG: add uucp-uudom mailer variant, based on code posted
+		by Spider Boardman <spider@Orb.Nashua.NH.US>; this
+		has uucp-dom semantics but old UUCP syntax.  This
+		also permits "uucp-old" as an alias for "uucp" and
+		"uucp-new" as a synonym for "suucp" for consistency.
+	CONFIG: add POP mailer support (from Kimmo Suominen
+		<kim@grendel.lut.fi>).
+	CONFIG: drop CSNET_RELAY support -- CSNET is long gone.
+	CONFIG: fix bug caused with domain literal addresses (e.g.,
+		``[128.32.131.12]'') when FEATURE(allmasquerade)
+		was set; it would get an additional @masquerade.host
+		added to the address.  Problem noted by Peter Wan
+		of Georgia Tech.
+	CONFIG: make sure that the local UUCP name is in $=w.  From
+		Jim Murray of Stratus.
+	CONFIG: changes to UUCP rewriting to simulate IDA-style "V"
+		mailer flag.  Briefly, if you are sending to host
+		"foo", then it rewrites "foo!...!baz" to "...!baz",
+		"foo!baz" remains "foo!baz", and anything else has
+		the local name prepended.
+	CONFIG: portability fixes for HP-UX.
+	DOC: several minor problems fixed in the Install & Op Guide.
+	MAKEMAP: fix core dump problem on lines that are too long or
+		which lack newline.  From Mark Delany.
+	MAILSTATS: print sums of columns (total messages & kbytes
+		in and out of the system).  From Tom Ferrin of UC
+		San Francisco Computer Graphics Lab.
+	SIGNIFICANT USER- OR SYSAD-VISIBLE CHANGES:
+		On HP-UX, /etc/sendmail.cf has been moved to
+			/usr/lib/sendmail.cf to match HP sendmail.
+		Permissions have been tightened up on world-writable
+			:include: files and accounts that have shells
+			that are not listed in /etc/shells.  This may
+			cause some .forward files that have worked
+			before to start failing.
+		SIGUSR1 dumps some state to the log.
+	NEW FILES:
+		src/Makefile.DGUX
+		src/Makefile.Dynix
+		src/Makefile.FreeBSD
+		src/Makefile.Mach386
+		src/Makefile.NetBSD
+		src/Makefile.RISCos
+		src/Makefile.SCO
+		src/Makefile.SVR4
+		src/Makefile.Titan
+		cf/mailer/pop.m4
+		cf/ostype/bsdi1.0.m4
+		cf/ostype/dgux.m4
+		cf/ostype/dynix3.2.m4
+		cf/ostype/sco3.2.m4
+		makemap/Makefile.dist
+		praliases/Makefile.dist
+
+8.6.4/8.6.4	93/10/31
+	Repair core-dump problem (write to read-only memory segment)
+		if you fall back to the return-to-Postmaster case in
+		savemail.  Problem reported by Richard Liu.
+	Immediately diagnose bogus sender addresses in SMTP.  This
+		makes quite certain that crackers can't use this
+		class of attack.
+	Reliability Fix:  check return value from fclose() and fsync()
+		in a few critical places.
+	Minor problem in initsys() that reversed a condition for
+		redirecting the output channel on queue runs.  It's
+		not clear this code even does anything.  From Eric
+		Wassenaar of the Dutch National Institute for Nuclear
+		and High-Energy Physics.
+	Fix some problems that caused queue runs to do "too much work",
+		such as double-reading the Errors-To: header.  From
+		Eric Wassenaar.
+	Error messages on writing the temporary file (including the
+		data file) were getting suppressed in SMTP -- this
+		fix causes them to be properly reported.  From Eric
+		Wassenaar.
+	Some changes to support AF_UNIX sockets -- this will only
+		really become relevant in the next release, but some
+		people need it for local patches.  From Michael
+		Corrigan of UC San Diego.
+	Use dynamically allocated memory (instead of static buffers)
+		for macros defined in initsys() and settime(); since
+		these can have different values depending on which
+		envelope they are in.  From Eric Wassenaar.
+	Improve logging to show ctladdr on to= logging; this tells you
+		what uid/gid processes ran as.
+	Fix a problem that caused error messages to be discarded if
+		the sender address was unparseable for some reason;
+		this was supposed to fall back to the "return to
+		postmaster" case.
+	Improve aliaswait backoff algorithm.
+	Portability patches for Linux (8.6.3 required another header
+		file) (from Karl London) and SCO UNIX.
+	CONFIG: patch prog mailer to not strip host name off of envelope
+		addresses (so that it matches local again).  From
+		Christopher Davis.
+	CONFIG: change uucp-dom mailer so that "<>" translates to $n;
+		this prevents uux from seeing lines with null names like
+		``From   Sat Oct 30 14:55:31 1993''.  From Motonori
+		Nakamura of Kyoto University.
+	CONFIG: handle <list:;> syntax correctly.  This isn't legal, but
+		it shouldn't fail miserably.  From Motonori Nakamura.
+
+8.6.3/8.6.3	93/10/24
+	IMPORTANT FIX: Fix several problems that caused open files to
+		be "lost" during queue runs; this overflowed the open
+		file table on large runs.  An assumption that fdopen
+		always succeeds sometimes resulted in core dumps when
+		this happens; sometimes the message is delivered twice,
+		sometimes (probably) infinite times.  This problem in
+		various form was reported by P{r (Pell) Emanuelsson and
+		Robert Campbell of U.C. Berkeley.
+	Special diagnosis of EMFILE error conditions -- it now prints
+		the known open file descriptors so you can figure out
+		what is consuming so much resources.
+	Fix a couple of problems caused by early address parsing
+		errors -- one caused it to return a "this is only a
+		warning" when it really wasn't, and the other started
+		parsing through a random pointer.  The first was
+		noted by Eric Wassenaar.
+	Fix an infinite loop problem caused by null components in the
+		host signature.  Problem noted by Jan Sorensen.
+	Be sure to reset the "current date" when sending an error
+		message -- PostMasterCopy messages were being sent
+		with an old Date: header.
+	Fix a problem that caused duplicated mail when sendmail was
+		(1) compiled without HASFLOCK, (2) you are sending to
+		an alias that has an owner-* alias, (3) you execute
+		sendmail with -t flag, (4) you run in -odb mode, and
+		(5) the sender specifies both the alias name and
+		another alias [i.e., the envelope is split], then
+		duplicate messages are sent.  The problem description
+		and one-line fix are from Motonori Nakamura of Kyoto
+		University.
+	Avoid a problem that causes error messages to be discarded
+		in some cases -- this was the result of a "fix" to
+		avoid duplicate error messages, but two are better
+		than zero.  Reported by Tim Rylance.
+	Fix a minor botch in checkfd012() -- fix from Dave Hill of
+		Computervision R&D Ltd.
+	Remove "X-Authentication-Warning: <user> set sender to <address>
+		using -f" entirely -- it is far too eager to include
+		this, and it is confusing folks.  I'll try to make it
+		work "right" in 8.7.  Problem noted by Yoshitaka
+		Tokugawa of dit Co., Ltd.
+	Fix a race condition with the errno value in tick() and
+		reapchild() -- this caused occasional misdiagnosis
+		of problems.  Kyle Jones of UUNET helped this along.
+	Repair rule loop-detection code.  From Michael Corrigan of
+		U.C. San Diego.
+	Fix a problem that caused sender domain addition (C mailer
+		flag to be ignored if you use -odq or use -odb with
+		a high load average.  Problem reported by Jim Murray
+		of Stratus.
+	Fix ident protocol on multi-homed machines.  It was not
+		always using the correct interface.  Fix from J.R.
+		Oldroyd of Opal.
+	Previously, sendmail assumed that any SMTP greeting message
+		that wasn't 2xx was a temporary failure -- it should
+		only take 4xx as a temporary failure, and return a
+		solid error message on anything else -- for example,
+		to allow you to reject connections on a workstation
+		that is MXed to a mail server.
+	Portability enhancements for 386BSD/FreeBSD/NetBSD from
+		Ollivier Robert.
+	CONFIG: FEATURE(always_add_domain) didn't always add the domain;
+		in particular, on local mail it modified the header sender
+		but not the header recipient address(es).  Reported by
+		Jeffrey Honig of Cornell University.  Also, strip
+		any host from envelope recipient address(es), since
+		local mailers don't understand host names -- this is
+		to help mailertable entries.  From Christopher Davis.
+	CONFIG: masquerading didn't apply to addresses that already
+		had a domain.  This change replaces a local hostname
+		by the masquerade name in the SMTP mailer (previously
+		it only added the masquerade name if it didn't already
+		have a domain name).  Several people complained about
+		this.
+
+8.6.2/8.6.2	93/10/15
+	Put a "successful delivery" message in the transcript for
+		addresses that get return-receipts.
+	Put a prominent "this is only a warning" message in warning
+		messages -- some people don't read carefully enough
+		and end up sending the message several times.
+	Include reason for temporary failure in the "warning" return
+		message.  Currently, it just says "cannot send for
+		four hours".
+	Fix the "Original message received" time generated for
+		returntosender messages.  It was previously listed as
+		the current time.  Bug reported by Eric Hagberg of
+		Cornell University Medical College.
+	If there is an error when writing the body of a message,
+		don't send the trailing dot and wait for a response
+		in sender SMTP, as this could cause the connection to
+		hang up under some bizarre circumstances.  From Eric
+		Wassenaar.
+	Fix some server SMTP synchronization problems caused when
+		connections fail during message collection.  From
+		Eric Wassenaar.
+	Fix a problem that can cause srvrsmtp to reject mail if the
+		name server is down -- it accepts the RCPT but rejects
+		the DATA command.  Problem reported by Jim Murray of
+		Stratus.
+	Fix a problem that can cause core dumps if the config file
+		incorrectly resolves to a null hostname.  Reported by
+		Allan Johannesen of WPI.
+	Non-root use of -C flag, dangerous -f flags, and use of -oQ
+		by non-root users were not put into
+		X-Authentication-Warning:s as intended because the
+		config file hadn't set the PrivacyFlags yet.  Fix
+		from Sven-Ove Westberg of the University of Lulea.
+	Under very odd circumstances, the alias file rebuild code
+		could get confused as to whether a database was
+		open or not.
+	Check "vendor code" on the end of V lines -- this is
+		intended to provide a hook for vendor-specific
+		configuration syntax.  (This is a "new feature",
+		but I've made an exception to my rule in a belief
+		that this is a highly exceptional case.)
+	Portability fixes for DG/UX (from Douglas Anderson of NCSC),
+		SCO Unix (from Murray Kucherawy), A/UX, and OSF/1
+		(from Jon Forrest of UC Berkeley)
+	CONFIG: fix ``mailer:host'' form of UUCP relay naming.
+
+8.6.1/8.6	93/10/08
+	Portability fixes for A/UX and Encore UMAX V.
+	Fix error message handling -- if you had a name server down
+		causing an error during parsing, that message was never
+		propogated to the queue file.
+
+8.6/8.6		93/10/05
+	Configuration cleanup: make it easier to undo IDENTPROTO in
+		conf.h (other systems have the same bug).
+	If HASGETDTABLESIZE and _SC_OPEN_MAX are both defined, assume
+		getdtablesize() instead of sysconf(); a disturbingly
+		large number of systems defined _SC_OPEN_MAX in the
+		header files but don't have the syscall.
+	Another patch to really truly ignore MX records in getcanonname
+		if trymx == FALSE.
+	Fix problem that caused the "250 IAA25499 Message accepted for
+		delivery" message to be omitted if there was an error
+		in the header of the message (e.g., a bad Errors-To:
+		line).  Pointed out by Michael Corrigan of UCSD.
+	Announce name of host we are chatting when we get errors; this
+		is an IDA-ism suggested by Christophe Wolfhugel.
+	Portability fixes for Alpha OSF/1 (from Anthony Baxter of the
+		Australian Artificial Intelligence Institute), SCO Unix
+		(from Murray Kucherawy of Hookup Communication Corp.),
+		NeXT (from Vince DeMarco and myself), Linux (from
+		Karl London <karl@borg.demon.co.uk>), BSDI (from
+		Christophe Wolfhugel, and SVR4 on Dell (from Kimmo
+		Suominen), AUX 3.0 on Macintosh, and ANSI C compilers.
+	Some changes to get around gcc optimizer bugs.  From Takahiro
+		Kanbe.
+	Fix error recovery in queueup if another tf file of the same
+		name already exists.  Problem stumbled over by Bill
+		Wisner of The Well.
+	Output YP_MASTER_NAME and YP_LAST_MODIFIED without null bytes.
+		Problem noted by Keith McMillan of Ameritech Services.
+	Deal with group permissions properly when opening .forward and
+		:include: files.  This relaxes the 8.1C restrictions
+		slightly more.  This includes proper setting of groups
+		when reading :include: files, allowing you to read some
+		files that you should be able to read but have previously
+		been denied unless you owned them or they had "other"
+		read permission.
+	Make certain that $j is in $=w (after the .cf is read) so that
+		if the user is forced to override some silly system,
+		MX suppression will still work.
+	Fix a couple of efficiency problems where newstr was double-
+		calling expensive routines.  In at least one case, it
+		wasn't guaranteed that they would always return the
+		same result.  Problem noted by Christophe Wolfhugel.
+	Fix null pointer dereference in putoutmsg -- only on an error
+		condition from a non-SMTP mailer.  From Motonori
+		Nakamura.
+	Macro expand "C" line class definitions before scanning so that
+		"CX $Z" works.
+	Fix problem that caused error message to be sent while still
+		trying to send the original message if the connection
+		is closed during a DATA command after getting an error
+		on an RCPT command (pretty obscure).  Problem reported
+		by John Myers of CMU.
+	Fix reply to NOOP to be 250 instead of 200 -- this is a long
+		term bug.
+	Fix a nasty bug causing core dumps when returning the "warning:
+		cannot deliver for N hours -- will keep trying" message;
+		it only occurred if you had PostMasterCopy set and
+		only on some architectures.  Although sendmail would
+		keep trying, it would send error messages on each
+		queue interval.  This is an important fix.
+	Allow u and g options to take user and group names respectively.
+	Don't do a chdir into the queue directory in -bt mode to make
+		ruleset testing a bit easier.
+	Don't allow users to turn off logging (using -oL) on the command
+		line -- command line can only raise, not lower, logging
+		level.
+	Set $u to the original recipient on the SMTP transaction or on
+		the command line.  This is only done if there is exactly
+		one recipient.  Technically, this does not meet the
+		specs, because it does not guarantee a domain on the
+		address.
+	Fix a problem that dumped error messages on bad addresses if
+		you used the -t flag.  Problem noted by Josh Smith of
+		Harvey Mudd College.
+	Given an address such as ``<foo> <bar>'', auto-quote the first
+		``<foo>'' part, giving ``"<foo>" <bar>''.  This is to
+		avoid the problem of people who use angle brackets in
+		their full name information.
+	Fix a null pointer dereference if you set option "l", have
+		an Errors-To: header in the message, and have Errors-To:
+		defined in the config file H lines.  From J.R. Oldroyd.
+	Put YPCOMPAT on #ifdef NIS instead -- it's one less thing to get
+		wrong when compiling.  Suggested by Rick McCarty of TI.
+	Fix a problem that could pass negative SIZE parameter if the
+		df file got lost; this would cause servers to always
+		give a temporary failure, making the problem even worse.
+		Problem noted by Allan Johannesen of WPI.
+	Add "ident" timeout (one of the "r" option selectors) for IDENT
+		protocol timeouts (30s default).  Requested by Murray
+		Kucherawy of HookUp Communication Corp. to handle bogus
+		PC TCP/IP implementations.
+	Change $w default definition to be just the first component of
+		the domain name on config level 5.  The $j macro defaults
+		to the FQDN; $m remains as before.  This lets well-behaved
+		config files use any of the short, long, or subdomain
+		names.
+	Add makesendmail script in src to try to automate multi-architecture
+		builds.  I know, this is sub-optimal, but it is still
+		helpful.
+	Fix very obscure race condition that can cause a queue run to
+		get a queue file for an already completed job.  This
+		problem has existed for years.  Problem noted by the
+		long suffering Allan Johannesen of WPI.
+	Fix a problem that caused the raw sender name to be passed to
+		udbsender instead of the canonified name -- this caused
+		it to sometimes miss records that it should have found.
+	Relax check of name on HELO packet so that a program using -bs
+		that claims to be itself works properly.
+	Restore rewriting of $: part of address through 2, R, 4 in
+		buildaddr -- this requires passing a lot of flags to get
+		it right.  Unlike old versions, this ONLY rewrites
+		recipient addresses, not sender addresses.
+	Fix a bug that caused core dumps in config files that cannot
+		resolve /file/name style addresses.  Fix from Jonathan
+		Kamens of OpenVision Technologies.
+	Fix problem with fcntl locking that can cause error returns to
+		be lost if the lock is lost; this required fully
+		queueing everything, dropping the envelope (so errors
+		would get returned), and then re-reading the queue from
+		scratch.
+	Fix a problem that caused aliases that redefine an otherwise
+		true address to still send to the original address
+		if and only if the alias failed in certain bizarre
+		ways (e.g, if they pointed at a list:; syntax address).
+		Problem pointed out by Jonathan Kamens.
+	Remove support for frozen configuration files.  They caused
+		more trouble than it was worth.
+	Fix problem that can cause error messages to get ignored when
+		using both -odb and -t flags.  Problem noted by Rob
+		McNicholas at U.C. Berkeley.
+	Include all "normal" variations on hostname in $=w.  For example,
+		if the host name is vangogh.cs.berkeley.edu, $=w will
+		contain vangogh, vangogh.cs, and vangogh.cs.berkeley.edu.
+	Add "restrictqrun" privacy flag -- without this, anyone can run
+		the queue.
+	Reset SmtpPhase global on initial connection creation so that
+		messages don't come out with stale information.
+	Pass an "ext" argument to lockfile so that error/log messages
+		will properly reflect the true filename being locked.
+	Put all [...] address forms into $=w -- this eliminates the need
+		for MAXIPADDR in conf.h.  Suggested by John Gardiner
+		Myers of CMU.
+	Fix a bug that can cause qf files to be left around even after
+		an SMTP RSET command.  Problem and fix from Michael
+		Corrigan.
+	Don't send a PostMasterCopy to errors when the Precedence: is
+		negative.  Error reports still go to the envelope
+		sender address.
+	Add LA_SHORT for load averages.
+	Lock sendmail.st file when posting statistics.
+	Add "SendBufSize" and "RcvBufSize" suboptions to "O" option to
+		set the size of the TCP send and receive buffers; if you
+		run over a slow slip line you may need to set these down
+		(although it would be better to fix the SLIP implementation
+		so that it's not necessary to recompile every program
+		that does bulk data transfer).
+	Allow null defaults on $( ... $) lookups.  Problem reported by
+		Amir Plivatsky.
+	Diagnose crufty S and V config lines.  This resulted from an
+		observation that some people were using the SITE macro
+		without the SITECONFIG macro first, which was causing
+		bogus config files that were not caught.
+	Fix makemap -f flag to turn off case folding (it was turning it
+		on instead).  THIS IS A USER VISIBLE CHANGE!!!
+	Fix a problem that caused multiple error messages to be sent if
+		you used "sendmail -t -oem -odb", your system uses fcntl
+		locking, and one of the recipient addresses is unknown.
+	Reset uid earlier in include() so that recursive .forwards or
+		:include:s don't use the wrong uid.
+	If file descriptor 0, 1, or 2 was closed when sendmail was
+		called, the code to recover the descriptor was broken.
+		This sometimes (only sometimes) caused problems with the
+		alias file.  Fix from Motonori Nakamura.
+	Fix a problem that caused aliaswait to go into infinite recursion
+		if the @:@ metasymbol wasn't found in the alias file.
+	Improve error message on newaliases if database files cannot be
+		opened or if running with no database format defined.
+	Do a better estimation of the size of error messages when NoReturn
+		is set.  Problem noted by P{r (Pell) Emanuelsson.
+	Fix a problem causing the "c" option (don't connect to expensive
+		mailers) to be ignored in SMTP.  Problem noted and the
+		solution suggested by Robert Elz of Munnari University.
+	Improve connection caching algorithm by passing "[host]" to
+		hostsignature, which strips the square brackets and
+		returns the real name.  This allows mailertable entries
+		to match regular entries.
+	Re-enable Return-Receipt-To: -- people seem to want this stupid
+		feature, even if it doesn't work right.
+	Catch and log attempts to try the "wiz" command in server SMTP.
+		This also ups the log level from LOG_NOTICE to LOG_CRIT.
+	Be more generous at assigning $z to the home directory -- do this
+		for programs that are specified through a .forward file.
+		Fix from Andrew Chang of Sun Microsystems.
+	Always save a fatal error message in preference to a non-fatal
+		error message so that the "subject" line of return
+		messages is the best possible.
+	CONFIG: reduce the number of quotes needed to quote configuration
+		parameters with commas: two quotes should work now, e.g.,
+		define(ALIAS_FILE, ``/etc/aliases,/etc/aliases.local'').
+	CONFIG: class $=Z is a set of UUCP hosts that use uucp-dom
+		connections (domain-ized UUCP).
+	CONFIG: fix bug in default maps (-o must be before database file
+		name).  Pointed out by Christophe Wolfhugel.  
+	CONFIG: add FEATURE(nodns) to state that we are not relying on
+		DNS.  This would presumably be used in UUCP islands.
+	CONFIG: add OSTYPE(nextstep) and OSTYPE(linux).
+	CONFIG: log $u in Received: line.  This is in technical violation
+		of the standards, since it doesn't guarantee a domain
+		on the address.
+	CONFIG: don't assume "m" in local mailer flags -- this means that
+		if you redefine LOCAL_MAILER_FLAGS you will have to include
+		the "m" flag should you want it.  Apparently some Solaris 2.2
+		installations can't handle multiple local recipients.
+		Problem noted by Josh Smith.
+	CONFIG: add confDOMAIN_NAME to set $j (if undefined, $j defaults).
+	CONFIG: change default version level from 4 to 5.
+	CONFIG: add FEATURE(nullclient) to create a config file that
+		forwards all mail to a hub without ever looking at the
+		addresses in any detail.
+	CONFIG: properly strip mailer: information off of relays when
+		used to change .BITNET form into %-hack form.
+	CONFIG: fix a problem that caused infinite loops if presented
+		with an address such as "!foo".
+	CONFIG: check for self literal (e.g., [128.32.131.12]) even if
+		the reverse "PTR" mapping is broken.  There's a better
+		way to do this, but the change is fairly major and I
+		want to hold it for another release.  Problem noted by
+		Bret Marquis.
+
+8.5/8.5		93/07/23
+	Serious bug: if you used a command line recipient that was unknown
+		sendmail would not send a return message (it was treating
+		everything as though it had an SMTP-style client that
+		would do the return itself).  Problem noted by Josh Smith.
+	Change "trymx" option in getcanonname() to ignore all MX data,
+		even during a T_ANY query.  This actually didn't break
+		anything, because the only time you called getcanonname
+		with !trymx was if you already knew there were no MX
+		records, but it is somewhat cleaner.  From Motonori
+		Nakamura.
+	Don't call getcanonname from getmxrr if you already know there
+		are no DNS records matching the name.
+	Fix a problem causing error messages to always include "The
+		original message was received ... from localhost".
+		The correct original host information is now included.
+	Previous change to cf/sh/makeinfo.sh doesn't port to Ultrix (their
+		version of "test" doesn't have the -x flag).  Change it
+		to use -f instead.  From John Myers.
+	CONFIG: 8.4 mistakenly set the default SMTP-style mailer to
+		esmtp -- it should be smtp.
+	CONFIG: send all relayed mail using confRELAY_MAILER (defaults
+		to "relay" (a variant of "smtp") if MAILER(smtp) is used,
+		else "suucp" if MAILER(uucp) is used, else "unknown");
+		this cleans up the configs somewhat.  This fixes a serious
+		problem that caused route-addrs to get mistaken as relays,
+		pointed out by John Myers.  WARNING: this also causes
+		the default on SMART_HOST to change from "suucp" to
+		"relay" if you have MAILER(smtp) specified.
+
+8.4/8.4		93/07/22
+	Add option `w'.  If you receive a message that comes to you because
+		you are the best (lowest preference) target of an MX, and
+		you haven't explicitly recognized the source MX host in
+		your .cf file, this option will cause you to try the target
+		host directly (as if there were no MX for it at all).  If
+		`w' is not set, this case is a configuration error.
+		Beware: if `w' is set, senders may get bogus errors like
+		"message timed out" or "host unknown" for problems that
+		are really configuration errors.  This option is
+		disrecommended, provided only for compatibility with
+		UIUC sendmail.
+	Fix a problem that caused the incoming socket to be left open
+		when sendmail forks after the DATA command.  This caused
+		calling systems to wait in FIN_WAIT_2 state until the
+		entire list was processed and the child closed -- a
+		potentially prodigious amount of time.  Problem noted
+		by Neil Rickert.
+	Fix problem (created in 6.64) that caused mail sent to multiple
+		addresses, one of which was a bad address, to completely
+		suppress the sending of the message.  This changes
+		handling of EF_FATALERRS somewhat, and adds an
+		EF_GLOBALERRS flag.  This also fixes a potential problem
+		with duplicate error messages if there is a syntax error
+		in the header of a message that isn't noticed until late
+		in processing.  Original problem pointed out by Josh Smith
+		of Harvey Mudd College.  This release includes quite a bit
+		of dickering with error handling (see below).
+	Back out SMTP transaction if MAIL gets nested 501 error.  This
+		will only hurt already-broken software and should help
+		humans.
+	Fix a problem that broke aliases when neither NDBM nor NEWDB were
+		compiled in.  It would never read the alias file.
+	Repair unbalanced `)' and `>' (the "open" versions are already
+		repaired).
+	Logging of "done" in dropenvelope() was incorrect: it would
+		log this even when the queue file still existed.  Change
+		this to only log "done" (at log level 11) when the
+		queue file is actually removed.  From John Myers.
+	Log "lost connection" in server SMTP at log level 20 if there
+		is no pending transaction.  Some senders just close the
+		connection rather than sending QUIT.
+	Fix a bug causing getmxrr to add a dot to the end of unqualified
+		domains that do not have MX records -- this would cause
+		the subsequent host name lookup to fail.  The problem
+		only occurred if you had FEATURE(nocanonify) set.
+		Problem noted by Rick McCarty of Texas Instruments.
+	Fix invocation of setvbuf when passed a -X flag -- I had
+		unwittingly used an ANSI C extension, and this caused
+		core dumps on some machines.
+	Diagnose self-destructive alias loops on RCPT as well as EXPN.
+		Previously it just gave an empty send queue, which
+		then gave either "Need RCPT (recipient)" at the DATA
+		(confusing, since you had given an RCPT command which
+		returned 250) or just dropped the email, depending on
+		whether you were running VERBose mode.  Now it usually
+		diagnoses this case as "aliasing/forwarding loop broken".
+		Unfortunately, it still doesn't adequately diagnose
+		some true error conditions.
+	Add internal concept of "warning messages" using 6xx codes.
+		These are not reported only to Postmaster.  Unbalanced
+		parens, brackets, and quotes are printed as 653 codes.
+		They are always mapped to 5xx codes before use in SMTP.
+	Clean up error messages to tell both the actual address that
+		failed and the alias they arose from.  This makes it
+		somewhat easier to diagnose problems.  Difficulty noted
+		by Motonori Nakamura.
+	Fix a problem that inappropriately added a ctladdr to addresses
+		that shouldn't have had one during a queue run.  This
+		caused error messages to be handled differently during
+		a queue run than a direct run.
+	Don't print the qf name and line number if you get errors during
+		the direct run of the queue from srvrsmtp -- this was
+		just extra stuff for users to crawl through.
+	Put command line flags on second line of pid file so you can
+		auto-restart the daemon with all appropriate arguments.
+		Use "kill `head -1 /etc/sendmail.pid`" to stop the
+		daemon, and "eval `tail -1 /etc/sendmail.pid`" to
+		restart it.
+	Remove the ``setuid(getuid())'' in main -- this caused the
+		IDENT daemon to screw up.  This required that I change
+		HASSETEUID to HASSETREUID and complicate the mode
+		changing somewhat because both Ultrix and SunOS seem
+		to have a bug causing seteuid() to set the saved uid
+		as well as the effective.  The program test/t_setreuid.c
+		will test to see if your implementation of setreuid(2)
+		is appropriately functional.
+	The FallBackMX (option V) handling failed to properly identify
+		fallback to yourself -- most of the code was there,
+		but it wasn't being enabled.  Problem noted by Murray
+		Kucherawy of the University of Waterloo.
+	Change :include: open timeout from ETIMEDOUT to an internal
+		code EOPENTIMEOUT; this avoids adding "during SmtpPhase
+		with CurHostName" in error messages, which can be
+		confusing.  Reported by Jonathan Kamens of OpenVision
+		Technologies.
+	Back out setpgrp (setpgid on POSIX systems) call to reset the
+		process group id.  The original fix was to get around
+		some problems with recalcitrant MUAs, but it breaks
+		any call from a shell that creates a process group id
+		different from the process id.  I could try to fix
+		this by diddling the tty owner (using tcsetpgrp or
+		equivalent) but this is too likely to break other
+		things.
+	Portability changes:
+		Support -M as equivalent to -oM on Ultrix -- apparently
+			DECnet calls sendmail with -MrDECnet -Ms<HOST> -bs
+			instead of using standard flags.  Oh joy.  This
+			behaviour reported by Jon Giltner of University
+			of Colorado.
+		SGI IRIX  -- this includes several changes that should
+			help other strict ANSI compilers.
+		SCO Unix -- from Murray Kucherawy of HookUp Communication
+			Corporation.
+		Solaris running the Sun C compiler (which despite the
+			documentation apparently doesn't define
+			__STDC__ by default).
+		ConvexOS from Eric Schnoebelen of Convex.
+		Sony NEWS workstations and Omron LUNA workstations from
+			Motonori Nakamura.
+	CONFIG: add confTRY_NULL_MX_LIST to set option `w'.
+	CONFIG: delete `C' and `e' from default SMTP mailers flags;
+		several people have made a good argument that this
+		creates more problems than it solves (although this
+		may prove painful in the short run).
+	CONFIG: generalize all the relays to accept a "mailer:host"
+		format.
+	CONFIG: move local processing in ruleset 0 into a new ruleset
+		98 (8 on old sendmail).  Domain literal [a.b.c.d]
+		addresses are also passed through this ruleset.
+	CONFIG: if neither SMART_HOST nor MAILER(smtp) were defined,
+		internet-style addresses would "fall off the end" of
+		ruleset zero and be interpreted as local -- however,
+		the angle brackets confused the recursive call.
+		These are now diagnosed as "Unrecognized host name".
+	CONFIG: USENET rules weren't included in S0 because of a mistaken
+		ifdef(`_MAILER_USENET_') instead of
+		ifdef(`_MAILER_usenet_').  Problem found by Rein Tollevik
+		of SINTEF RUNIT, Oslo.
+	CONFIG: move up LOCAL_RULE_0 processing so that it happens very
+		early in ruleset 0; this allows .mc authors to bypass
+		things like the "short circuit" code for local addresses.
+		Prompted by a comment by Bill Wisner of The Well.
+	CONFIG: add confSMTP_MAILER to define the mailer used (smtp or
+		esmtp) to send SMTP mail.  This allows you to default
+		to esmtp but use a mailertable or other override to
+		deal with broken servers.  This logic was pointed out
+		to me by Bill Wisner.  Ditto for confLOCAL_MAILER.
+	Changes to cf/sh/makeinfo.sh to make it portable to SVR4
+		environments.  Ugly as sin.
+
+8.3/8.3		93/07/13
+	Fix setuid problems introduced in 8.2 that caused messages
+		like "Cannot create qfXXXXXX: Invalid argument"
+		or "Cannot reopen dfXXXXXX: Permission denied".  This
+		involved a new compile flag "HASSETEUID" that takes
+		the place of the old _POSIX_SAVED_IDS -- it turns out
+		that the POSIX interface is broken enough to break
+		some systems badly.  This includes some fixes for
+		HP-UX.  Also fixes problems where the real uid is
+		not reset properly on startup (from Neil Rickert).
+	Fix a problem that caused timed out messages to not report the
+		addresses that timed out.  Error messages are also more
+		"user friendly".
+	Drop required bandwidth on connections from 64 bytes/sec to
+		16 bytes/sec.
+	Further Solaris portability changes -- doesn't require the BSD
+		compatibility library.  This also adds a new
+		"HASGETDTABLESIZE" compile flag which can be used if
+		you want to use getdtablesize(2) instead of sysconf(2).
+		These are loosely based on changes from David Meyer at
+		University of Oregon.  This now seems to work, at least
+		for quick test cases.
+	Fix a problem that can cause duplicate error messages to be
+		sent if you are in SMTP, you send to multiple addresses,
+		and at least one of those addresses is good and points
+		to an account that has a .forward file (whew!).
+	Fix a problem causing messages to be discarded if checkcompat()
+		returned EX_TEMPFAIL (because it didn't properly mark
+		the "to" address).  Problem noted by John Myers.
+	Fix dfopen to return NULL if the open failed; I was depending
+		on fdopen(-1) returning NULL, which isn't the case.  This
+		isn't serious, but does result in wierd error diagnoses.
+		From Michael Corrigan.
+	CONFIG: add UUCP_MAX_SIZE M4 macro to set the maximum size of
+		messages sent through UUCP-family mailers.  Suggested
+		by Bill Wisner of The Well.
+	CONFIG: if both MAILER(uucp) and MAILER(smtp) are specified,
+		include a "uucp-dom" mailer that uses domain-style
+		addressing.  Suggested by Bill Wisner.
+	CONFIG: Add LOCAL_SHELL_FLAGS and LOCAL_SHELL_ARGS to match
+		LOCAL_MAILER_FLAGS and LOCAL_MAILER_ARGS.  Suggested by
+		Christophe Wolfhugel.
+	CONFIG: Add OSTYPE(aix3).  From Christophe Wolfhugel.
+
+8.2/8.2		93/07/11
+	Don't drop out on config file parse errors in -bt mode.
+	On older configuration files, assume option "l" (use Errors-To
+		header) for back compatibility.  NOTE:  this DOES NOT
+		imply an endorsement of the Errors-To: header in any way.
+	Accept -x flag on AIX-3 as well as OSF/1.  Why, why, why???
+	Don't log errors on EHLO -- it isn't a "real" error for an old
+		SMTP server to give an error on this command, and
+		logging it in the transcript can be confusing.  Fix
+		from Bill Wisner.
+	IRIX compatibility changes provided by Dan Rich
+		<drich@sandman.lerc.nasa.gov>.
+	Solaris 2 compatibility changes.  Provided by Bob Cunningham
+		<bob@kahala.soest.hawaii.edu>, John Oleynick
+		<juo@klinzhai.rutgers.edu>
+	Debugging: -d17 was overloaded (hostsignature and usersmtp.c);
+		move usersmtp (smtpinit and smtpmailfrom) to -d18 to
+		match the other flags in that file.
+	Flush transcript before fork in mailfile().  From Eric Wassenaar.
+	Save h_errno in mci struct and improve error message display.
+		Changes from Eric Wassenaar.
+	Open /dev/null for the transcript if the create of the xf file
+		failed; this avoids at least one possible null pointer
+		reference in very wierd cases.  From Eric Wassenaar.
+	Clean up statistics gathering; it was over-reporting because of
+		forks.  From Eric Wassenaar.
+	Fix problem that causes old Return-Path: line to override new
+		Return-Path: line (conf.c needs H_FORCE to avoid
+		re-using old value).  From Motonori Nakamura.
+	Fix broken -m flag in K definition -- even if -m (match only)
+		was specified, it would still replace the key with the
+		value.  Noted by Rick McCarty of Texas Instruments.
+	If the name server timed out over several days, no "timed out"
+		message would ever be sent back.  The timeout code
+		has been moved from markfailure() to dropenvelope()
+		so that all such failures should be diagnosted.  Pointed
+		out by Christophe Wolfhugel and others.
+	Relax safefile() constraints: directories in an include or
+		forward path must be readable by self if the controlling
+		user owns the entry, readable by all otherwise (e.g.,
+		when reading your .forward file, you have to own and
+		have X permssion in it; everyone needs X permission in
+		the root and directories leading up to your home);
+		include files must be readable by anyone, but need not
+		be owned by you.
+	If _POSIX_SAVED_IDS is defined, setuid to the owner before
+		reading a .forward file; this gets around some problems
+		on NFS mounts if root permission is not exported and
+		the user's home directory isn't x'able.
+	Additional NeXT portability enhancements from Axel Zinser.
+	Additional HP-UX portability enhancements from Brian Bullen.
+	Add a timeout around SMTP message writes; this assumes you can
+		get throughput of at least 64 bytes/second.  Note that
+		this does not impact the "datafinal" default, which
+		is separate; this is just intended to work around
+		network clogs that will occur before the final dot
+		is sent.  From Eric Wassenaar.
+	Change map code to set the "include null" flag adaptively --
+		it initially tries both, but if it finds anything
+		matching without a null it never tries again with a
+		null and vice versa.  If -N is specified, it never
+		tries without the null and creates new maps with a
+		null byte.  If -O is specified, it never tries with
+		the null (for efficiency).  If -N and -O are specified,
+		you get -NO (get it?) lookup at all, so this would
+		be a bad idea.  If you don't specify either -N or -O,
+		it adapts.
+	Fix recognition of "same from address" so that MH submissions
+		will insert the appropriate full name information;
+		this used to work and got broken somewhere along the
+		way.
+	Some changes to eliminate some unnecessary SYSERRs in the
+		log.  For example, if you lost a connection, don't
+		bother reporting that fact on the connection you lost.
+	Add some "extended debugging" flags to try to track down
+		why we get occassional problems with file descriptor
+		one being closed when execing a mailer; it seems to
+		only happen when there has been another error in the
+		same transaction.  This requires XDEBUG, defined
+		by default in conf.h.
+	Add "-X filename" command line flag, which logs both sides of
+		all SMTP transactions.  This is intended ONLY for
+		debugging bad implementations of other mailers; start
+		it up, send a message from a mailer that is failing,
+		and then kill it off and examine the indicated log.
+		This output is not intended to be particularly human
+		readable.  This also adds the HASSETVBUF compile
+		flag, defaulted on if your compiler defines __STDC__.
+	CONFIG: change SMART_HOST to override an SMTP mailer.  If you
+		have a local net that should get direct connects, you
+		will need to use LOCAL_NET_CONFIG to catch these hosts.
+		See cf/README for an example.
+	CONFIG: add LOCAL_MAILER_ARGS (default: `mail -d $u') to handle
+		sites that don't use the -d flag.
+	CONFIG: hide recipient addresses as well as sender addresses
+		behind $M if FEATURE(allmasquerade) is specified; this
+		has been requested by several people, but can break
+		local aliases.  For example, if you mail to "localalias"
+		this will be rewritten as "localalias@masqueradehost";
+		although initial delivery will work, replies will be
+		broken.  Use it sparingly.
+	CONFIG: add FEATURE(domaintable).  This maps unqualified domains
+		to qualified domains in headers.  I believe this is
+		largely equivalent to the IDA feature of the same name.
+	CONFIG: use $U as UUCP name instead of $k.  This permits you
+		to override the "system name" as your UUCP name --
+		in particular, to use domain-ized UUCP names.  From
+		Bill Wisner of The Well.
+	CONFIG: create new mailer "esmtp" that always tries EHLO
+		first.  This is currently unused in the config files,
+		but could be used in a mailertable entry.
+
+8.1C/8.1B	93/06/27
+	Serious security bug fix: it was possible to read any file on
+		the system, regardless of ownership and permissions.
+	If a subroutine returns a fully qualified address, return it
+		immediately instead of feeding it back into rewriting.
+		This fixes a problem with mailertable lookups.
+	CONFIG: fix some M4 frotz (concat => CONCAT)
+
+8.1B/8.1A	93/06/12
+	Serious bug fix: pattern matching backup algorithm stepped by
+		two tokens in classes instead of one.  Found by Claus
+		Assmann at University of Kiel, Germany.
+
+8.1A/8.1A	93/06/08
+	Another mailertable fix....
+
+8.1/8.1		93/06/07
+	4.4BSD freeze.  No semantic changes.
+
+6.65/6.34	93/06/06
+	Fix some lintish problems.
+	Fix some cases where server SMTP behaved poorly when handed bogus
+		input, pointed out by Eric Wassenaar.
+	CONFIG: fix some more (sigh) mailertable bugs -- thanks to
+		Motonori Nakamura of Kyoto University (again).
+
+6.64/6.33	93/06/05
+	Don't send 050 (-v) information after the 250 response to a QUIT
+		command in srvrsmtp -- clients usually close the connection
+		at this point, and it causes bogus error messages.
+	Don't send messages that have errors on input (such as unbalanced
+		parentheses) during SMTP transactions, since a return
+		message has (probably) already been sent.
+	Give better diagnostics on timeouts during network reads, including
+		information similar to the SMTP phase.
+	Fix bug that caused SMTP messages to deliver synchronously; this
+		happened after the DATA 250, and hence caused reading the
+		next command to be delayed.
+	Ignore Errors-To: header unless 'l' (lower case el) header is
+		specified.  The Errors-To: header violates RFC 1123.
+		Errors-To: was only needed to take the place of the
+		envelope sender in the days when most Unix mailers
+		didn't understand about the two kinds of senders.
+	Don't send warning messages in response to automatically generated
+		messages (that is, those From:<>).
+	CONFIG: fix some rather stupid typos in the mailertable code
+		pointed out by Motonori Nakamura of Kyoto University.
+	CONFIG: add confUSE_ERRORS_TO configuration option.
+	CONFIG: if ALWAYS_ADD_DOMAIN is selected, try to use $M
+		(masquerade name) instead of $j.
+	CONFIG: don't add dots to relay names (added in 6.29); it breaks
+		several things, and can be simulated by dot terminating
+		the names of relays.  For example, use:
+			DBbit.net.relay.
+		(note the trailing dot).
+
+6.63/6.32	93/06/01
+	Fix prototypes to eliminate chars in argument lists -- some
+		compilers are pissy about this.
+	Log protocol ($r) and body type if set so we can determine if
+		the adaptive algorithms are working.
+	Pessimize on locking of database files (particularly for NEWDB
+		databases) during opens.  There were problems with
+		processes opening the file while it was rebuilt; since
+		NEWDB caches heavily, the reader opened an empty file,
+		which is an error.  If your system has the ability to
+		lock atomically on open, this works properly; otherwise,
+		there are race conditions.
+	Check mod time on .pag file instead of .dir in NDBM aliases
+		because the .dir file doesn't get updated for small
+		alias files.  From John Gardiner Myers of CMU.
+	More Solaris portability -- it now compiles on Solaris, but
+		hangs up in gethostbyname().
+	Move setting of RES_DEBUG flag before first myhostname() call
+		so we can see name server traffic on that call.
+	Fsync() queue files.
+	Fix a problem that causes -bi to try to rebuild maps other than
+		the alias file(s).
+	Fix a problem that caused udb to reject entries from any but
+		the first database listed.
+	Rearrange doc subdirectory for 4.4BSD release tape.
+	CONFIG: put $r into the Received line.  This was an oversight.
+	CONFIG: fix typo (call to ruleset 99 should have been rulset 90).
+	CONFIG: move "auxiliary" subroutines to be in ruleset 90-99
+		range -- in the long run, single digit rulesets may
+		become reserved for builtin use by sendmail.
+	CONFIG: fix major problem that causes host aliases (that is,
+		anything in $=w != $j) to not be recognized.  This has
+		been around since 6.30.
+
+6.62/6.31	93/05/28
+	BETA RELEASE
+	Fix recursive syserr (if there is an error printing a syserr
+		message).  This makes the code much less eager to consider
+		a write error as serious.  This also includes some
+		heuristics to be clever about closed connections.
+	Lock NEWDB files during gets.  This requires version 1.5 or later
+		of the db library.  If you have an older version, you
+		can use -DOLD_NEWDB.  This will go away in a few weeks.
+	Fix problem causing aliases that use host maps to get overwritten.
+	Do appropriate byte swapping on port numbers in ident protocol
+		code.  Fix from Allan Johannesen of WPI.
+	Defer opening of map files to the same time as alias files so that
+		the daemon will tend to pick up new versions more promptly.
+	Prototype a bunch more functions.
+	Some Solaris 2.1 changes (still doesn't link though).
+	Try to simplify Makefiles by including more subordinate #defines
+		in conf.h (based on OS type).
+	CONFIG: check for domains if FEATURE(mailertable) is defined.
+		For example, if the host name is "knecht.cs.berkeley.edu"
+		it will search the following mailertable keys:
+			knecht.cs.berkeley.edu
+			.cs.berkeley.edu
+			.berkeley.edu
+			.edu
+		This could be used to replace the special relays for bitnet
+		and similar nets.
+
+6.61/6.30	93/05/24
+	Fix problem that prevented appending dots on canonified host
+		names.  This breaks tons of config files -- very
+		important fix.
+	Fix improper pointer dereference in response to HELO command.
+	Fix core dump if debugging set in map_rewrite.
+	CONFIG: add FEATURE(always_add_domain) to always attach the
+		local domain (only impacts local mail).
+	CONFIG: try to avoid turning names into $j -- although
+		technically a host can only have one "canonical name",
+		it seems to be common practice to have several.
+
+6.60/6.29	93/05/22
+	Major change: merge alias databases with maps.  This expands and
+		changes the map class interface but fixes a bunch of bugs.
+		The important user-visible change is that the file name
+		in a K line now does not include the ".db" extension; this
+		is added automatically.  Also, the -d (NIS domain) flag is
+		missing from the K config line; use @domain instead.
+		When compiling, the *_MAP names are gone -- just compile
+		in NDBM, NEWDB, and/or NIS support.
+	Announce mailer/host/user triple on -bv flag -- from Brian
+		Bullen of Stirling University.
+	Don't send more than one line in response to HELO -- it confuses
+		Pony Express, which then behaves very badly.  However,
+		this change does send two line 220 greetings, with the
+		second line reading "ESMTP spoken here".  The usersmtp
+		module recognizes this and goes into ESMTP mode regardless
+		of the setting of the "a" mailer flag.  Thus, "a" means
+		"always try EHLO".
+	AIX portability changes (thanks to Christophe Wolfhugel of
+		Herve Schauer Consultants (Paris) for providing me with
+		an INSA account for this purpose).  Lightly tested.  Use
+		-D_AIX3.  This probably breaks compatibility with some
+		older systems (e.g., 4.2bsd) but still works on SunOS
+		4.1.2, Ultrix 4.2A, HP-UX 8.07, OSF/1 T1.3, and AIX 3.2.3.
+	Fix a problem causing an error message loop if the output channel
+		is hosed.
+	Add the Makefiles that I use for various environments -- some are
+		Berkeley make versions and some are old make versions.
+		My makefile for the NeXT box has gotten lost, alas!
+	PRALIASES: support for printing NEWDB databases.  From
+		Michael J. Corrigan of U.C. San Diego.
+	CONFIG: don't pass pseudo-domains to $[ ... $] (if you have
+		a wildcard MX it can have wierd results).  From
+		Christophe Wolfhugel.
+	CONFIG: dot terminate relay hostnames in S0.  From Christophe
+		Wolfhugel.
+
+6.59/6.28	93/05/13
+	Log version with SMTP daemon startup message.
+	Adjust setproctitle to work on NetBSD and BSD/386.
+	Fix null pointer reference in MX fallback code.
+	A bunch of minor fixes from Eric Wassenaar:
+		If deliver cannot execv the mailer, return EX_OSERR
+			instead of EX_TEMPFAIL (to give better
+			error messages).
+		Consistently malloc e_message.
+		Catch degenerate case of calling returntosender()
+			with an empty returnq.
+		MIME reformatting.
+
+6.58/6.28	93/05/13
+	Fix bug that can cause incorrect verbose display of user smtp
+		messages.
+	Disable SMTP VERB command if PRIV_NOEXPN is set (since this
+		could reveal the same information.
+	Allow failure when reading SMTP greeting message to go on to
+		next MX host.
+	Add "MIME-Version: 1.0" header if using MIME (this was NOT
+		included in RFC 1344, but Bill King of Allan-Bradley
+		Company forwarded me email from Nathaniel Borenstein
+		claiming that it was an inadvertent omission).
+	Don't use Content-Type: X-message-header.  According to John
+		Myers of CMU, many MIME readers will completely ignore
+		the data if they don't recognize it.  Instead, just
+		add a blank line to make it a legal (empty) message.
+	Fix problem causing dots to keep getting appended to cached
+		hostnames.  This can cause buffer overrun conditions.
+		The problem was found by Erik Forsberg of Retix,
+		although I used a different bug fix than he provided.
+	Fix parsing of split header/envelope rewriting specs -- from
+		Eric Forsberg.
+	Fix from Eric Wassenaar to correct To: lists in error messages.
+
+6.57/6.28	93/05/11
+	Fix minor glitch causing extra ctladdrs to be output to queue
+		file.  Just an annoyance.
+	Cache results of name server canonification lookups to avoid
+		backed up queue runs.
+	Major rewrite of alias.c: considerable cleanup, plus sample
+		(untested) support for NIS aliases.  The "A" option
+		can now be a comma separated list (or be repeated) --
+		that is, you can have multiple alias databases.  Each
+		database can have the syntax ``class:file''; if no class
+		is specified, the "implicit" class is assumed.  Implicit
+		searches through a list of compiled in types -- hash,
+		dbm, nis, and stab.  Alias files are searched in the
+		order they are listed.  For example:
+			OAhash:/etc/aliases.local,/etc/aliases
+			OAnis:mail.aliases@my.nis.domain
+		first searches the hash database /etc/aliases.local,
+		then the regular /etc/aliases database, then the NIS
+		map "mail.aliases" in the NIS domain "my.nis.domain".
+	If in Verbose mode (probably from VERB command) run SMTP job
+		in foreground and don't do RCPT optimizations.
+	Add udb :mailsender as equivalent to owner- for regular aliases.
+	Delete option 8; add option 7 that means the opposite.  That is,
+		default to 8-bit mode; a special option is needed to
+		force sendmail into 7 bit mode.
+	Send error messages in encapsulated MIME format.
+	New compile flag "NIS" that turns on NIS alias and NIS map
+		support.
+	Add "j" option to send error messages in MIME (RFC 1341)
+		encapsulated message format per RFC 1344.  The
+		syntax is pretty ugly if you don't have MIME-aware
+		user agents.
+	Clean up message handling (for display in mailq output).
+	New setproctitle implementation for 4.4bsd.
+	Create files (such as ~/dead.letter) using mode FileMode (the
+		F option value) instead of 0666.
+	Fix bug causing output of EXPN command to not be fully qualified.
+		This may cause some problems with UUCP addresses that
+		will require some config file assistance -- specifically,
+		the $: part has to include the host name for this output
+		to make sense.
+	Fix a problem that sometimes diagnosed errors and still sent the
+		message if the header syntax was bad.
+	Fix a bug that caused an error message to be emailed when sendmail
+		was operating in -bv mode.
+	Add "ListenQueueSize" keyword to daemon options option (OO) to
+		set the queue size parameter passed to listen().  You
+		will normally have to tweak your kernel to up this.
+	Strip spaces off of beginning of message-id before logging (in
+		case it was folded across lines).
+	Tweak compile flags in daemon.c -- there were some cases where
+		it wouldn't work without NETINET.
+	Change *file* mailer to output all the usual default headers
+		(From, Date, Message-Id).  It gets used when sending
+		back error messages.
+	CONFIG: explicitly catch and diagnose list:; syntax in ruleset
+		zero -- this is not a valid recipient syntax according
+		to RFC 821.
+	CONFIG: add confMIME_FORMAT_ERRORS to send error messages in
+		MIME format.  Defaults to on.
+	CONFIG: add SMTP_MAILER_FLAGS and UUCP_MAILER_FLAGS to augment
+		the flags for those mailers.
+
+6.56/6.27	93/05/01
+	Fix problem that causes the fallback mail to postmaster
+		(case ESM_POSTMASTER in savemail()) to not look at
+		aliases (ugh).
+	Some more HPUX tweaking (compile flag hpux => __hpux so it
+		still works in ANSI mode).
+	Don't try to flock non-regular files when mailing to a file.
+		In particular, this was a problem if you tried to
+		send to /dev/null.
+	Fix a wierd bug that can cause senders to be queued as
+		recipients if the name server is down when the mail
+		is initially sent.  This hack just ignores sender
+		deletion (essentially, it sets the MeToo flag) if there
+		is a TEMPFAIL during processing of the sender address.
+		Obscure.
+	Fix a dangling else problem -- from Brian Bullen from University
+		of Stirling, UK.
+	Add the "b" mailer flag to force a blank line on the end of
+		messages.  Some brilliant versions of /bin/mail insist
+		on this but do not add it themselves.
+	Add the "g" mailer flag to prevent user SMTP from sending
+		"MAIL From:<>".  This is only intended to be a
+		transitional gesture, and should not be used if at
+		all possible.  It appears that Berkeley and IDA
+		config files have always handled this properly; the
+		UK config kit apparently does not.
+	Don't lowercase and then capitalize header field names -- leave
+		them with original capitalization.  Fixes from Bill
+		King of Allen-Bradley Company.
+	Further cleanup and improved reporting of error messages,
+		particularly conditions that cause messages to be
+		requeued for future delivery.
+	Tweak syslog priorities in some cases.
+	CONFIG: clean up route-addr on UUCP addresses.
+
+6.55/6.25	93/04/27
+	HPUX 8.07 compatibility changes in getla() -- I had to make
+		these changes to get it to work at Berkeley, although
+		others seem to have been working before (???).
+	Various patches to XLA code.
+	Fix problem that causes setuid bit on files to be ignored from
+		SMTP or in queue runs.  Problem noted by Jason Ornstein
+		of Under The Wire, Inc.
+	Fix problem that can cause CNAMEs to be ignored.
+	Generalize getmxrr to match local host in $=w instead of a
+		single name passed in.
+	Some cleanup from Eric Wassenaar:
+		Use FileMailer instead of ProgMailer in two places.
+		Eliminate duplicate 8th-bit stripping in commaize.
+		Fix a problem with mis-parsing of backslash escapes
+			under some circumstances.
+	NIS map fix (was always including trailing null character)
+		from Mike Glendinning of Ingres UK.
+	Add "a" mailer flag to try using ESMTP.  It tries the EHLO
+		command and if that fails falls back to regular SMTP.
+		Also parses EHLO option keywords.  If host supports
+		SIZE extension, this is added to the MAIL FROM:
+		command.
+	Extend "b" option to include a second value which is the
+		maximum message size this server is willing to accept.
+		For example, a value of "10/1000000" says that there
+		must be ten blocks free, and sendmail will reject
+		any message larger than one megabyte.
+	Some portability hooks for NeXT (this could be applicable
+		to Mach in general).  You have to create an empty
+		file called "unistd.h" to get it to compile.
+	Adjust config values (MAXLINE, MAXATOM, and PSBUFSIZE) to
+		be more generous.
+	Add X400-Received: to the list of headers tagged with H_TRACE
+		in conf.c.  From Bill King, Allen-Bradley Co.
+
+6.54/6.25	93/04/19
+	Fix problem that caused redefinition of SMTP and QUEUE compile
+		flags.  Pointed out by Jon Forrest of the Sequoia 2000
+		project at Berkeley.
+	Properly handle \! hack -- it was treating host\!user as one
+		token (host!user) instead of three (host, !, user).
+		Fix from Eric Wassenaar of NIKHEF-H.
+	Fix compilation problem in getauthinfo() if IDENTPROTO is off.
+	Turn off DEFNAMES and DNSRCH when getting the hostsignature
+		(i.e., MX records) in level 1 configuration files; this
+		matches the old behaviour.  From Motonori Nakamura of
+		Kyoto University.
+	Improve error message printing -- if sent through an alias,
+		error messages include the name of the alias in the
+		message.  Unfortunately, in order to make this work
+		properly in queue runs, this changes the format of the
+		C line in the qf file.  The relatively uselessness of
+		the previous information was pointed out to me by
+		Allan E Johannesen of WPI.
+	Add XLA compile flag to add hooks to Christophe Wolfhugel's
+		extended load average code.  This is still in very early
+		form.  For information regarding the guts of the xla
+		code, contact Christophe.Wolfhugel@grasp.insa-lyon.fr.
+	Additional hooks for detecting tempfails in rewriting rules
+		(that is, in map lookups).
+
+6.53/6.25	93/04/15
+	Properly diagnose ruleset zero returning null (instead of a mailer
+		triple).  From Motonori Nakamura of Kyoto University.
+	More generalization of socket code for other protocols.
+	Shorten timeouts on reverse name lookups -- since they are done
+		during connection establishment, long timeouts here can
+		cause higher level timeouts.  This mainly serves to accept
+		mail from hosts that do not have proper reverse (PTR) DNS
+		records set up.
+	Reset e_statmsg before each mailer invocation to avoid bogus
+		messages in the log.
+	Redefine $r, $s, and $_ in error envelopes so you don't get
+		incorrect cruft in the error message.  Problem noted by
+		Motonori Nakamura of Kyoto University.
+	Fix a problem that can cause failure to return errors to Postmaster
+		in certain cases.  From Motonori Nakamura.
+	Fix a problem that can cause some systems to give duplicate error
+		messages when a bad syntax address such as "<a" is presented
+		to an SMTP server.   It doesn't seem to occur on all
+		machines.  From Motonori Nakamura.
+	Default IDENTPROTO off for Ultrix and HPUX, which apparently have
+		the interesting "feature" that when they receive a "Host
+		unreachable" message they closes all open connections to
+		that host.  However, some firewall gateways send this message
+		if you try to connect to an unauthorized port, such as the
+		IDENT port (113).  Thus, no email can be received from such
+		hosts.  There is some evidence that versions of Ultrix before
+		4.3 do not have this problem.  Thanks to Tom Ivar Helbekkmo
+		for pointing out this behaviour to me and to Michael Corrigan
+		of U.C. San Diego for informing me about the HPUX problem.
+	Allow IPC mailers to return a colon-separated list of hosts in the
+		$@ clause; these are searched in order as though they were
+		MX records.
+	When sending an error report, print the list of addresses tagged
+		as bad.  Requested by Allan E Johannesen of WPI.
+	Change map function calls to return a status code.  This gets
+		passed back as the result of rewrite.  Parseaddr marks
+		the address as a QUEUEUP address if the return code is
+		EX_TEMPFAIL.  All this to queue properly if the name
+		server is down.  This code is not well tested.  This code
+		changes the interface to map lookup functions (a fifth
+		parameter, int *statp, is added).  Feature requested by
+		Dan Oscarsson.
+	Don't delete quotes (in the dequote map) if there are spaces in
+		the string, since this would cause them to be replaced by
+		the SpaceSub character.
+	Accept BODY=8BITMIME on SMTP MAIL command.  This isn't advertised
+		because the 8BIT to 7BIT translation doesn't exist yet.
+		This does add a "bodytype" field to both envelope and
+		queue file and a -B command line flag to pass the type in
+		during direct invocations.
+	Discard return error messages only on responses to responses to
+		responses, not on responses to responses.  That is, the
+		algorithm is to try return to sender, then return to
+		postmaster, then discard.  Previously it discarded
+		immediately if the return to sender pass failed.
+	CONFIG: back out change to hide unqualified hostnames behind %-hack.
+		This screws up local aliases and .forward files.
+	CONFIG: add FEATURE(nocanonify) to turn off calls to $[ ... $];
+		some sites only handle completely canonified names.
+		Requested by John Gardiner Myers of CMU.
+	CONFIG: some UUCP code was still included even if FEATURE(nouucp)
+		was specified.
+
+6.52/6.24	93/04/10
+	Clean up some minor glitches on error return messages pointed out
+		by Motonori Nakamura of Kyoto University.
+	Fix reply() to not reset SmtpReplyBuffer on fatal errors; this
+		was supposed to reset SmtpMsg Buffer.  This makes the
+		client side code virtually useless.  Reported by Allan
+		E Johannesen of WPI and Phil Brandenberger of Swarthmore.
+	Better debug messages if fuzzy is disabled, suggested by Allan
+		E Johannesen of WPI.
+	Offset SmtpReplyBuffer by four in usersmtp when checking for
+		loopback.  From Eric Wassenaar.
+	Don't set $s until after runinchild in srvrsmtp -- otherwise
+		it gets cleared.  From Eric Wassenaar.
+	Implement IDA-style $&x for deferred macro expansion.
+	More POSIX compatibility.
+	CONFIG: Hide unqualified hostnames behind %-hack using $s as the
+		actual sender.  This is only done if $r is non-null, that
+		is, if this is not locally submitted mail.
+	CONFIG: Add FEATURE(bitdomain) allowing mapping of BITNET host
+		names to internet domains.  A program contributed by
+		John Gardiner Myers of CMU to create the maps is included
+		in the contrib directory (in the "misc" tar file).
+	CONFIG: Add FEATURE(uucpdomain) for a similar mapping for UUCP
+		hosts.  There is currently no tool to create this map.
+
+6.51/6.23	93/04/04
+	Add D= mailer flag to specify a path of possible working directories
+		in which to execute the mailer.  This is intended for the
+		prog mailer; some shells can get upset if they don't have
+		access to the current directory.
+	Add RFC 1413 (IDENT) protocol support.  This is only very loosely
+		tested.  This adds a $_ macro to be the authenticated
+		info (in ``user@domain [address]'' form) and debug flag
+		9 to trace the protocol.
+	Check for loopbacks in usersmtp instead of srvrsmtp -- there is no
+		reason for a local agent to not be talking to the localhost
+		(although the inverse is not true).
+	Add a few hooks for automated map rebuilding.  This is certainly
+		not done yet.
+	CONFIG: Have prog mailer specify a path of ``D=$z:/'' -- that is,
+		user's home directory then the root.
+	CONFIG: Log RFC 1413 identification in Received: line.
+
+6.50/6.22	93/04/01
+	Fixes to requeueing code to make it compute priority, nrcpts,
+		and the like properly.
+
+6.49/6.22	93/04/01
+	Diagnose incorrect privacy flags.  Suggested by Bryan Costales
+		of ICSI.
+	Some ANSI C fixes.
+	Arrange to quote backslashes as well as other special characters
+		in the phrase part of a route-addr.
+	Some fixes to FallBackMX code suggested by Motonori Nakamura of
+		Kyoto University.
+	More vigorous zeroing of CurHostAddr to avoid logging of bogus
+		host addresses when you are actually just printing
+		information from the MCI structure; problem noted by
+		Michael Corrigan of U.C. San Diego.
+	Don't ignore rest of queue if any job is not runnable.  This can
+		also cause an incorrect job to be lost.  Fix from
+		Eric Wassenaar.
+	Always respond "quickly" to RCPT command; do alias expansion and
+		the like later.  This also means that mail for lists that
+		have errors will be acccepted, and an error sent back
+		later.  This is done by instantiating the queue file
+		and then immediately running and requeueing it.
+
+6.48/6.22	93/03/30
+	Fix incorrect diagnosis of infinite loop in ruleset.  Problem noted
+		by several people.
+	Improve information printed when infinite loops are discovered.
+	Zero CurHostAddr to fix erroneous internet addresses in log when no
+		addresses can be bound.  Pointed out by Motonori Nakamura
+		of Kyoto University.
+	"Probe" SMTP connections using RSET instead of NOOP "just in case".
+		Suggested by John Gardiner Myers of CMU.
+	Don't warn about -f if you are setting sender to yourself.
+
+6.47/6.22	93/03/29
+	Fix incompatible call to endmailer in smtpquit which causes core
+		dumps.  Noted by Allan E Johannesen of WPI.
+	HPUX portability changes from Michael J. Corrigan of UC San Diego.
+	Require MAIL before RCPT command in srvrsmtp.c.  This had been
+		intentional from the 821 draft days when the order wasn't
+		clear, but is silly now.
+	Fix bug in nis_magic routine that was initializing parameters
+		incorrectly.  Fix from Takahiro Kanbe of Fuji Xerox
+		Information Systems Co., Ltd.
+	Change default for PrivacyFlags in conf.c to 0 -- since it always
+		"or"s in new values, there was no way to turn off the
+		AuthWarning stuff.
+	Add O option to set SMTP daemon options.
+	Add V option to set fallback MX host.  This always sorts at lower
+		priority than anything it gets from the name server.  It
+		should only be used for environments with very bad network
+		connectivity.  Requested by several people.
+	Log sending info.  It's not clear this is a good idea.
+	CONFIG: fix typo in mailertable code.  Noted by Phil Brandenberger
+		of Swarthmore.
+	CONFIG: add confDAEMON_OPTIONS and confFALLBACK_MX to set options
+		O and V, respectively.
+
+6.46/6.21	93/03/26
+	Fix botch in server SMTP that broke transactions that did not
+		use HELO first (like MH).  Fix from Michael Corrigan
+		of U.C. San Diego.
+	Fall back to other MX records if there is an error anywhere
+		in delivery (actually on MAIL or DATA -- RCPT is harder).
+		Suggested by John Gardiner Myers and Motonori Nakamura.
+	Revert to non-prototypes -- it turns out that our ANSI C
+		compiler is more forgiving than most others about
+		mixing prototyped extern declarations with non-prototyped
+		function definitions.
+	Fix a problem with multi-word class matching pointed out by
+		Neil Rickert.  Given:
+			CX b a.b.c
+			R$+ $=X $+	$: $1 < $2 > $3
+		the input "user@a.b.c" failed instead of being properly
+		rewritten as "user@a.<b>.c".
+	Neil also convinced me that it was correct that $~ should match
+		only one token -- the problem is that it's always possible
+		to add another token, so $~ matches far too eagerly.
+
+6.45/6.21	93/03/25
+	Implement multi-word classes (properly!).
+
+6.44/6.21	93/03/25
+	Add X-Authentication-Warning: headers to clue users into possible
+		attempts to forge mail.  This is on the authwarnings
+		privacy flag, but is the default.  Suggested by Bryan
+		Costales of ICSI.
+	Pass default units for convtime in so they can be more reasonable.
+	Allow config files to always add a new Comments: header (i.e.,
+		they will be added even if an old one already exists).
+		Suggested by Bryan Costales of ICSI.
+	Allow config files to delete an existing Return-Path: header.
+		These should only be added at final delivery.  Suggested
+		by Bryan Costales of ICSI.
+	Some debugging additions.  Suggested by Bryan Costales of ICSI.
+	Clean up logging of Family 0 addresses.  Noted by David Muir
+		Sharnoff and others.
+	Add a "dequote" map class.  This allows config files to strip
+		quotes off of addresses.  Note that this is not a builtin
+		map, just a class -- so you have to define the map
+		using the K line.
+	Fix a bug in the queueup() loop getting a locked tf where in
+		very odd cases it can fall off the bottom and core dump.
+		Of course, it was P{r Emanuelsson who found it....
+	Open a new transcript when splitting an envelope.  Problem found
+		by Allan E Johannesen of WPI.
+	Improved error output in endmailer if the mailer core dumps.
+	CONFIG: Fix typo in UUCP mailer definition.
+	CONFIG: Default several of the new options on: eight bit input,
+		privacy flags set to "authwarnings", and message warning
+		set to 4h.
+	CONFIG: Use dequote map.
+
+6.43/6.20	93/03/23
+	Fix problem with assumption of an sa_len field in a generic
+		sockaddr -- it turns out that most vendors haven't
+		picked up this (very important) fix.
+	Change compilation flags for daemon code -- select one or both
+		of NETINET or NETISO, but don't ever set DAEMON manually.
+	CONFIG: add FEATURE(mailertable) to do IDA-style mailertables.
+
+6.42/6.19	93/03/19
+	Use Postmaster as default fallback return address, not root.
+	POSIX changes for file descriptor handling.
+	Diagnose errors writing new queue file.
+	If you change the owner using an owner- alias, also change the
+		error mode to EM_MAIL so that errors don't get dropped
+		into an inappropriate directory.  Problem noted by
+		Allan E Johannesen of WPI.
+	If you are su'ed to root, send email as who you really are, not
+		as root.  From Brian Kantor of U.C. San Diego.
+	Allow warning messages to be sent after a configurable interval
+		has passed without delivery.  The message is sent only
+		once per envelope.  This changes the format of the qf
+		file to have an F line, and the format of the T option
+		to accept take the format "return/warn" (both intervals).
+	Don't force all local names to lower case -- this was left over
+		from the wierd handling of case mapping on aliases.  It
+		is now driven (as expected) by the "u" mailer flag.
+		Problem noted by P{r Emanuelsson.
+	Fix problem that caused headers on returned email to be trashed;
+		they were getting freed, but are still accessible via
+		BlankEnvelope.
+	Fix problem that caused bogus ids to be created on returned
+		mail.
+	Add support for ISO and other non-INET networking.  This is by
+		no means finished yet.  This does assume a lot of other
+		system support, like a version of gethostbyname that
+		returns non-AF_INET addresses.
+	CONFIG: change default on prog mailer to keep upper case in
+		user names (i.e., in the program command line).
+	CONFIG: strip trailing dots off of hosts in uucp mailer before
+		convert to bang format.
+	CONFIG: create new "relay" mailer for $R (LOCAL_RELAY) and $H
+		(MAIL_HUB) delivery that doesn't add local domain.  Note
+		that this violates 821, but is probably "more correct"
+		for what we are trying to do.  Problem pointed out by
+		Michael Graff of Iowa State.
+
+6.41/6.18	93/03/18
+	Clean up unnecessary creates of queue ids (i.e., empty qf files)
+		when not needed, such as when starting up an SMTP
+		connection.
+	Fix problem where split envelopes aren't instantiated in the queue.
+		This is quite a serious bug.
+	Owner- aliases had problems with leading spaces causing a
+		premature delimitation.
+
+6.40/6.18	93/03/18
+	Have ending 250 (after DATA) include the id; suggested by
+		Brian Kantor of UC San Diego.
+	Add logging on envelope splitting.
+	Change queue ids to have one more letter encoding the hour of
+		the day so that during a single day there is a greater
+		likelihood of uniqueness; requested by Brian Kantor.
+
+6.39/6.18	93/03/18
+	Fix minor compile problem if LOCKF is defined.
+	Define size of tobuf in conf.h.  Observed by Toshinari Takahashi
+		of Toshiba.
+	Restore e_sender -- this is equivalent to e_from.q_paddr without
+		decorations such as angle brackets and comments.
+	OSF/1 on Alpha changes from Allan E Johannesen of WPI.
+	CONFIG: fix typo in S3 for list syntax (;: => :;).  Thanks to
+		Christopher Hoover for noting the problem.
+
+6.38/6.17	93/03/17
+	Pass envelope to disconnect to avoid another use of CurEnv, which
+		can apparently end up being null at inopportune times.
+	Log "received from" as "relay=" for consistency (suggested by
+		John Gardiner Myers).
+	Fix major bug in header handling:  if no From: line existed in
+		the header (so sendmail inserts one), and the sender is
+		an alias that has an owner, the From: line shows the
+		owner (as well as the envelope).  Fixed by early binding
+		the headers (which will change debugging output).
+	HPUX portability patches from Michael J. Corrigan of UC San Diego.
+	Some attempts to adapt better to out of open file conditions.
+	Some changes to ctladdr handling in queue files.
+
+6.37/6.17	93/03/16
+	MAJOR CHANGE:  delete e_sender and e_returnpath (why are these
+		different from e_from?) and $< macro.
+	Log correct IP address in relay= field even if the connection
+		times out.
+	Log "received from [RESPONSE]" on EF_RESPONSE messages (from
+		John Gardiner Myers).
+	Fixes to SysExMsg logging (sometimes just got "message: %s"
+		instead of "message: error message"), noted by Eric
+		Wassenaar.  Also reported by Motonori Nakamura.
+	Improvements to MX piggybacking code, from Motonori Nakamura.
+	Fix case where CurHostName points to an auto variable that has
+		been deallocated (from Motonori Nakamura).
+	Fix bug causing newlines to be included in aliases if option
+		"n" (check alias RHS) is set; bug noted by David Muir
+		Sharnoff.
+	Fix problem causing user names that should be mapped to lower
+		case to not be mapped if they are sent during a queue
+		run.  This greatly simplifies the case mapping code.
+		Problem noted by Allan E Johannesen of WPI.
+	Don't do recipient address rewriting in buildaddr.  This
+		improperly did recipient rewriting on sender addresses,
+		and just seems bogus in general -- but the change could
+		break some .cf files.
+	Pass TZ envariable to child processes for System V.
+	CONFIG: allow LOCAL_RULE_1 and LOCAL_RULE_2 if you want to
+		define those rulesets.
+	KNOWN PROBLEM:  I have seen some problems on SunOS that causes
+		the User Data Base to give errors on some addresses.  I
+		have tracked the problem back at least as far as 93.02.15
+		(version 6.22).  Running with debugging on makes it
+		go away, so I conclude that it is referencing uninitialized
+		stack data.  I haven't been able to track this down yet.
+
+6.36/6.16	93/03/08
+	Allow local mailer to specify $@host -- this lets you assign the
+		"foo" part of jgm+foo to $h for passing in to the local
+		mailer.
+	Additional debug printing in getcanonname (show query type).
+	Don't add the e_fromdomain on sender addresses -- this interacts
+		wierdly with the owner- code.
+	Improve delivery logging to not log obvious or meaningless stuff.
+	Include numeric IP address in Received: lines per RFC 1123 section
+		5.2.8.
+	Fixed a bug in checking stat() return value if restrictmailq is
+		set.  Also, check the entire group set instead of just the
+		primary group.  Both from John Gardiner Myers.
+	Don't have usrerr automatically print errno, since this is often
+		misleading.
+	Use transienterror() in makeconnection after connect() fails and
+		in openmailer after execve() fails (from Eric Wassenaar).
+		Also moved transienterror() from util.c to conf.c.
+	Clean up from= logging on response messages.
+	Undo patch allowing prescan to return a null vector -- it breaks
+		too many things.
+	Config: FEATURE(notsticky) lets you use UDB for everything coming
+		in to the machine, even if it is specifically targetted
+		to this machine.  Without it, UDB is bypassed if the user
+		name is fully qualified.
+	Config: fix another minor botch with <> (local mailer wasn't
+		mapping them properly).
+
+6.35/6.15	93/03/05
+	Fix getrealhostname to return null if sinlen <= 0 -- this can
+		occur if stdin is a pipe.
+	Avoid infinite loop in getcanonname if name server return
+		NO_DATA (for example).
+	Config: avoid having C flag qualify list syntax and error syntax.
+
+6.34/6.14	93/03/05
+	Fix logging in deliver to not pass too many parameters to Ultrix
+		versions of syslog.
+	Don't write the pid file until after the daemon has actually
+		opened and conditioned the connection.
+	Consider addresses "different" if their q_uids differ (so that
+		two users forwarding to the same program will be seen
+		as different, rather than the same).
+	Fix problem with bad parameters in main() -- they set ExitStat
+		but don't exit.
+	Fix null pointer references through RealHostName -- painfully
+		discovered by Allan E Johannesen of WPI.
+	Fix bug causing user@@localhost to core dump (yuch).
+	Config: don't put two @host.dom.ain on users in $=E in SMTP
+		mailer.  Also, catch user@ (no host) in ruleset 0.
+
+6.33/6.13	93/03/03
+	Config: add confCW_FILE as the name of the cw configuration file
+		(defaults to /etc/sendmail.cw).  From P{r Emanuelsson.
+	Allow prescan to return a pointer to an empty list -- this is
+		not an error.  Also, clean up error reporting to avoid
+		double errors (prescan reports once, then the caller
+		reports again).
+	Changes to avoid trusting T_ANY queries -- run them, but if you
+		don't get the info you expected, do T_A and T_MX queries
+		anyhow.  This also fixes an oversight where _res.options
+		bits were being ignored.
+	If PRIV_NOVRFY is set, use 252 response code instead of 502 per
+		RFC 1123 section 5.2.3.  It's not 100% clear that this
+		is correct, but it probably works better with stupid
+		mailers that do a VRFY and only check the first digit.
+
+6.32/6.12	93/03/02
+	Fix uninitialized variable "protocol" in smtp code.
+	Include <unistd.h> in sendmail.h -- move towards POSIX/ANSI.
+	Additional hooks for RFC 1427 (ESMTP SIZE extension).  This
+		includes requiring that enoughspace() know the system
+		block size, which will undoubtedly break most ports.
+	Trace flag 19 in use for srvrsmtp.c.
+	Additional logging -- notably the sending mailer name.  This
+		also changes the delivery logging to strict field=value
+		syntax.
+	Fix some problems with messages getting sent even to addresses
+		that had been marked bad -- from Eric Wassenaar.
+	More WIDE changes: accept host name inside [...] as non-MXed
+		host.  This is intended ONLY for use inside firewalled
+		environments, where the MX points at the gateway.
+	Change .cf file conventions so that mapping for <> addresses
+		don't have an @ in them (to avoid confusing the C mailer
+		flag).  Pointed out by Neil Rickert.
+	Config extensions for Sam Leffler's FlexFAX software.
+
+6.31/6.10	93/02/28
+	Fix some more bugs in alias owner code -- there were some wierd
+		cases where an error in a non-aliased name would override
+		the return info in an aliased name with an owner.
+	Changes from WIDE Project, forwarded to me by Motonori Nakamura:
+		Log actual delivery host (after MX et al); from
+			yasuhiro@dcl.co.jp.
+		Log daemon startup.
+		Deliver Postmaster copies without a body.
+		Better logging of SMTP senders.
+		Send all program email as daemon even when local.
+	As requested in various forms from many people, accept -qIstring
+		to limit queue runs to jobs with queue-id matching string.
+		Similarly for -qRstring for recipients, -qSstring for
+		senders.
+	Initial hooks for ESMTP support (see RFC 1425).
+	Fixed a syntax error in the UUCP mailer specification that caused
+		core dumps on startup.
+	Check for missing A= or P= arguments in mailer definitions.
+
+6.30/6.10	93/02/27
+	Require FROZENCONFIG compilation flag to include frozen
+		configuration code.  Frozen configuration is really
+		not a very good idea any more, particularly in shared
+		library environments.
+	Do better checking of errno after opens of :include: and .forward
+		files to defer delivery on network and other transient
+		errors.  Suggestion from Craig Everhart.
+	Fix minor botch in read timeout macro processing.
+	Add FEATURE(nouucp) to config files for sites that know absolutely
+		nothing about UUCP.
+	Add built cf files to distribution tape and clarify how to build
+		them if you don't have the Berkeley make.
+	Some sizeof(long) portability changes for the Alpha, from Allan
+		E Johannesen.
+	Add "restrictmailq" privacy flag -- if set, only people in the same
+		group as your queue directory can print the queue.  If you
+		set this, be sure you also restrict access to log files....
+	Fix another bug in owner-list stuff that can cause data files to
+		be "lost".
+	Fix a bug with queue runs that cause forwards to yourself to go
+		into alias/forwarding loops.  I'm still iffy about this
+		fix.
+	Fix from Eric Wassenaar for suppression of return message code.
+
+6.29/6.9	93/02/24
+	Fix yet another problem in alias owner code -- put the wrong return
+		address on the enclosed return-to-sender letter.
+
+6.28/6.9	93/02/24
+	Fix botch in alias owner code that caused it to not operate if the
+		error was detected locally.
+
+6.27/6.9	93/02/24
+	M_LOCAL => M_LOCALMAILER to avoid conflict with Ultrix include
+		file <sys/mount.h>.
+	Miscellaneous bug fixes from Eric Wassenaar:
+		sendmail -bv -t logs the from line even though in verify
+			mode only.
+		sendmail -v can go into queue mode if shouldqueue returns
+			TRUE.
+	Add route-addr pruning per RFC 1123 section 5.3.3.  This can be
+		disabled using the "R" option.
+	Delete (always undocumented) -R flag (save original recipients);
+		there are ways to syslog(3) these now.
+	Clean up SMTP reply codes -- specify them as needed in the code,
+		instead of in conf.c -- this was needed during the NCP to
+		TCP transition, but seems silly now.  This also changes
+		parameters to message and nmessage.
+	Have mailstats read the .cf file to find the sendmail.st file and
+		get text versions of mailer names.  An initial version of
+		this code was provided by Tuominen Keijo (although the
+		comments indicate the good bits were written by "E.V.").
+	Add yet more System V compatibility hacks.
+	Fix bug in VRFY code (assumes everything must be a local user).
+	Allow specification of any of the hard-wired pathnames in the
+		Makefile.
+	Delete concept of "trusted users" -- this really didn't provide
+		any security anyway, and caused some problems.
+	Delete last vestige of support for the word "at" as an equivalent
+		to the character "@".
+	Propagate owner-foo alias information into the envelope sender.
+		Based on code from John Gardiner Myers.  This is a major
+		semantic change -- beware!
+	Allow $@ on LHS to indicate "match zero" -- this is used to match
+		the null expression.
+
+6.26/6.8	93/02/21
+	Don't "lose" queue runs.  Very important fix from (who else?)
+		Eric Wassenaar.
+	Completely reset state on RSET command -- from Eric Wassenaar.
+	Send error messages and return receipts using an envelope sender
+		of <> regardless of the setting of $n.  Rewriting rules
+		can undo this if they feel the necessity, as might be
+		needed for networks that don't understand the syntax.
+		This is permitted by RFC 821 section 3.6 and required by
+		RFC 1123 section 5.3.3.  THIS REQUIRES VERSION 4 CONFIG
+		FILES because the rulesets must be able to parse <>
+		properly.
+	Don't ever send error messages to "<>" -- they will get sent to
+		the local postmaster or dumped in /usr/tmp/dead.letter
+		instead.  Per RFC 1123 section 5.3.3.
+	Explicitly check for email to yourself as a dotted quad.  You
+		have to call $[ [ ... ] $] to get this.
+	Up the message timeout to five days per RFC 1123 section 5.3.1.1.
+	Make all read timeouts individually configurable, as strongly
+		recommended by RFC 1123 section 5.3.2.
+	Use f_bavail (blocks available to regular users) instead of f_bfree
+		(blocks available to superuser) in free block checks.
+	Change $d macro to be the current time, not the origination time,
+		since this is consistent with how it is used now.
+	Generalization of enoughspace from Eric Wassenaar covering
+		SGI, Apollo, HPUX, Ultrix, and SunOS.
+	Ignore process group signals -- some front ends can do this if
+		you kill a window too quickly.  From Eric Wassenaar.
+	Change umask to 022.
+
+6.25/6.8	93/02/20
+	Close all cached connections before calling mailers and after
+		forking for delivery (caused double closes which resulted
+		in false errors).
+	Add FEATURE(redirect) in config files -- this allows you to alias
+		old addresses to a pointer to the new address that will
+		give a 551 error message, but not deliver the mail.
+	Some code changes to make the 551 errors look pretty.
+	Names of M4 program paths in config files have changed -- they
+		are all XXX_MAILER_PATH now, to match XXX_MAILER_FLAGS.
+	Fix a bug in the QSELFREF code having to do with empty .forward
+		files, reported by Eric Wassenaar.
+	Add option "p" (privacy flags); this allows you to tune how
+		picky the SMTP server will be.  This also adds the
+		confPRIVACY_FLAGS M4 macro in the config files.
+	Add option "b" (minimum blocks free).  If there are fewer than
+		this number of blocks free on the filesystem containing
+		the queue directory, the SMTP MAIL command will return
+		a 452 response and ask you to try again later.  This
+		also adds the confMIN_FREE_BLOCKS M4 macro in the config
+		files.
+	Made VRFY just verify (doesn't expand aliases and .forward files);
+		EXPN does full expansion.  RCPT in queue-only mode also
+		doesn't chase aliases and .forward.
+
+6.24/6.7	93/02/19
+	Increase the number of domain search entries in domain.c to allow
+		for the extra "" entry indicating the root domain.
+		Reported by Motonori Nakamura of Kyoto U.
+	Add a "SMART_HOST" in the configs for UUCP-connected sites that
+		want to forward all mail with extra "@"s to that site.
+		Also allows SMART_HOST, LOCAL_RELAY, and MAIL_HUB to
+		be specified as ``mailer:hostname'' to use an alternate
+		mailer.
+	Clarified and updated some wording in the Operations Guide.
+	Add the "c" mailer flag -- this suppresses all comment parts of
+		addresses (requested by John Curran of NEARnet).
+	Have -v print prompts in -bt mode even if stdin is not a terminal
+		(default behaviour is to be silent if not reading from
+		a terminal).  Suggested by Bryan Costales, ICSI.
+	Move the metacharacters from C0 space (\001-\037) into C1 space
+		(\201-\237).  This also fixes a bunch of potential bugs
+		with G1 characters (\240-\276) in headers relating to
+		negative numbers passed to isspace() et al.
+	Add YP_LAST_MODIFIED and YP_MASTER_NAME to DBM version of alias
+		database if YPCOMPAT is #defined.  Enhancement from
+		Takahiro Kanbe of Fuji Xerox Information Systems Co., Ltd.
+	Add "list" Precedence (-30); this can be used with old sendmails
+		which will map to precedence 0 (which will return error
+		messages).  Suggested by Stephen R. van den Berg.
+	Many bug fixes from Eric Wassenaar of the National Institute for
+			Nuclear and High-Energy Physics, Amsterdam:
+		Clear timeouts properly on open failures in include().
+		Don't dereference through NULL if no home directory found.
+		Re-establish SIGCHLD signal on System 5 in reapchild().
+		Avoid NULL pointer reference on -pFOO flag.
+		Properly handle backslash escapes in comments.
+		Correctly check reply status on SMTP NOOP command.
+		Properly save SMTP error message if peer gives
+			"Service Shutting Down" message.
+		Avoid writing to the transcript if it couldn't be opened.
+		Signal errors in SMTP children to parent properly.
+	Handle self references in a list more globally (include a
+		QSELFREF bit in the address flags).  This enhancement
+		was suggested by Eric Wassenaar.
+	Use initgroups() in hpux, even though it's System-V based.  The
+		HASINITGROUPS compile flag can set this on other systems.
+		This HPUX behaviour was pointed out by Eric Wassenaar.
+
+6.23/6.6	93/02/16
+	Clean up handling of LogLevel to make it easier to figure out
+		what's on what level.
+	Change log levels to have some consistency:
+		1    serious system failures, security problems
+		2    lost communications, protocol failures
+		3    other serious failures
+		4    minor errors
+		5    message collection
+		6    vrfy logging, creation of return-to-sender
+		7    delivery failures
+		8    delivery successes
+		9    delivery tempfails (queue ups)
+		10   database expansion
+		>64  debugging
+	Allow IDA-style separated processing on S= and R= in Mailer
+		definition lines.  Note that rulesets 1 and 2 are
+		still used for both addresses as before.  Bruce Lilly
+		gave a convincing argument that RFC976 insists on
+		this behaviour.
+	Added some time zones to arpatounix -- they may not be in the
+		standards, but they are in use.  However, I may delete
+		arpatounix entirely -- there appears to be no reason
+		for it to exist.
+	Change to UUCP mailer (in cf directory) to try to do a saner job.
+		I'm still not certain about this mailer in general.
+
+6.22/6.5	93/02/15
+	Fix bug that prevents saving letters in ~/dead.letter.
+	Don't add angle brackets in VRFY command if angle brackets already
+		exist in the address.
+	Fix bogus error message in udbexpand.
+	Null terminate host buffers in buildaddr (broken in 6.21) --
+		IMPORTANT FIX!!
+
+6.21/6.5	93/02/15
+	Fix another incorrect error message in alias.c, found by Azuma
+		Okamoto.
+	Fix a couple of problems in the more-configurable config files,
+		found by Tom Ivar Helbekkmo.
+	Fix problem with quoted :include: entries.
+	Don't duplicate the filename on verbose printing of .forward and
+		:include: contents.
+	Extend size of prescan buffer (to allow bigger addresses).  Also,
+		detect some buffer overflows.
+	Log user SMTP protocol errors (log level 4).
+
+6.20/6.4	93/02/14
+	Fix another problem in the MCI state machine caused when there
+		were errors generated from the other end to commands
+		other than RCPT.
+
+6.19/6.4	93/02/14
+	Include load average support for DEC Alpha running OSF/1.
+	Fix multiple-response problem with errors in MAIL From: line.
+	Fix SMTP reply codes for invalid address syntaxes (give 501;
+		never give multiple error messages for a single message).
+	Fix problem where a cached connection timeout rejects all
+		later connects to that host.
+	Fix incorrect error message if alias.c is compiled with DBM only.
+	Additional changes to fix nested conditionals (from Bruce Lilly).
+	Recover more gracefully from operating system failures, particularly
+		NULL returns from openmailer (from Noritoshi Demizu,
+		OMRON Corporation).
+	Log forward, alias, and userdb expand operations on log level 10;
+		concept suggested by P{r (Pell) Emanuelsson.
+	Changes for HPUX 8.07 compatibility.
+
+6.18/6.4	93/02/12
+	Allow any config option to be set using an M4 define.
+	Change UNAME compile flag to HASUNAME for IDA compatibility
+		(besides, it's a better name).
+	Note in README that on SunOS it must be linked -Bstatic.
+	Fairly major change in domain.c to handle wildcard MX records
+		more rationally.  NOTE: the "w" option (no wildcard MX
+		records match local domain) has been eliminated.
+	Fix some unset variable references pointed out by Bruce Lilly.
+	Fix host name in process titles when using cached connection.
+
+6.17/6.3	93/01/28
+	Fix System 5 compatibility changes to be compatible with the rest
+		of the world.
+
+6.16/6.3	93/01/28
+	Experimental fix for problem handling errors in the SMTP
+		protocol in conjunction with connection caching.
+	System 5 compatibility changes.
+
+6.15/6.3	93/01/26
+	Fix a bug that causes local mail delivered using -odq to be
+		eliminated as a duplicate (because it matched the
+		ctladdr, now passed in as a C line).  These changes
+		are pretty tricky......
+
+6.14/6.3	93/01/25
+	Add debugging for some MCI errors.
+
+6.13/6.3	93/01/22
+	Fix -e compatibility flag to take a value.
+	Fix a couple of minor compilation warnings on Sun cc.
+	Improve error messages in a few cases to be more self-explanatory.
+
+6.12/6.3	93/01/21
+	Fix yet-another problem with environment handling, pointed out
+		by Yoshitaka Tokugawa and Tom Ivar Helbekkmo.
+	Some heuristics to try to limit resource exhaustion problems
+		if a downstream host has been down for a long time.
+	Fix problem with incorrect host name being logged in "Connection
+		timed out" messages (from Tom Ivar Helbekkmo).
+	Fix some ANSI C problems (from Takahiro Kanbe).
+	Properly log message sender on returned mail during queue run.
+	Count number of recipients properly.
+	Fix a problem in yp map code.
+	Diagnose "message timed out" (from Motonori Nakamura).
+
+6.11/6.3	93/01/20
+	Fix problem with address delimitor inside quotes.
+	Define $k and $=k to be the UUCP name (from the uname call)
+		based on code from Bruce Lilly.
+
+6.10/6.2	93/01/18
+	Implement arpatounix (largely code from Bruce Lilly).
+	Log more info (suggested by John Myers).
+	Allow nested $?...$|...$. (inspired by code from Bruce Lilly of
+		Sony US).
+	POSIX compatibility (noted by Keith Bostic).
+	Handle SMTP MAIL command errors properly (urged by several people,
+		notably John Myers of CMU).
+	Do early diagnosis of .cf errors (notably referencing a RHS
+		substitution that isn't on the LHS).
+	Adjust checkpointing to better handle batched recipients, suggested
+		by John Myers.
+	Fix miscellaneous bugs.
+	(config files:)  Implement MAIL_HUB for all local mail (to handle
+		NFS-mounted directories) as urged by Tom Ivar Helbekkmo
+		of the Norwegian School of Economics.
+
+6.9/6.1 	93/01/13
+	Environment handling simplification/bug fix -- child processes
+		get a minimal, fixed environment.  This avoids different
+		behaviour in queue runs.
+	Handle commas inside comments properly.
+	Properly limit large messages submitted in -obq mode.
+
+6.8/6.1		93/01/10
+	Check mtime of thaw file against .cf and sendmail binary, based on
+		code from John Myers.
+
+6.7/6.1		93/01/10
+	MX piggybacking, based on code from John Myers@CMU.
+	Allow checkcompat to return -1 to mean tempfail.
+	Bug fix in m_mno computation.
+
+6.6/6.1		93/01/09
+	Tuning of queueing functions as recommended by John Gardiner Myers.
+	Return mail headers (no body) on messages with negative precedence.
+	Minor other bug fixes.
+
+6.5/6.1		93/01/03
+	Fix botch causing queued headers to have ?XX? prefixes.
+
+6.4/6.1		93/01/02
+	Changes to recognize special mailer types (e.g., file) early.
+
+6.3/6.1		93/01/01
+	Pass timeouts to sfgets.
+	Check for control characters in addresses.
+	Fixed deferred error reporting.
+	Report duplicate aliases.
+	Handle mixed case recursive aliases.
+	Misc bug fixes.
+
+6.2/6.1		92/12/30
+	Put return-receipt-to on a conf.c flag (but don't set it).
+	Fix minor syslog problem.
diff --git a/usr.sbin/sendmail/cf/README b/usr.sbin/sendmail/cf/README
new file mode 100644
index 00000000000..d20549739ce
--- /dev/null
+++ b/usr.sbin/sendmail/cf/README
@@ -0,0 +1,1232 @@
+
+
+		NEW SENDMAIL CONFIGURATION FILES
+
+		Eric Allman <eric@CS.Berkeley.EDU>
+
+		@(#)README	8.28 (Berkeley) 4/14/94
+
+
+This document describes the sendmail configuration files being used
+at Berkeley.  These use features in the new (R8) sendmail, and although
+there is an ``OLDSENDMAIL'' mode, they haven't really been tested on
+old versions of sendmail and cannot be expected to work well.
+
+These configuration files are probably not as general as previous
+versions, and don't handle as many of the weird cases automagically.
+I was able to simplify by them for two reasons.  First, the network
+has become more consistent -- for example, at this point, everyone
+on the internet is supposed to be running a name server, so hacks to
+handle NIC-registered hosts can go away.  Second, I assumed that a
+subdomain would be running SMTP internally -- UUCP is presumed to be
+a long-haul protocol.  I realize that this is not universal, but it
+does describe the vast majority of sites with which I am familiar,
+including those outside the US.
+
+Of course, the downside of this is that if you do live in a weird
+world, things are going to get weirder for you.  I'm sorry about that,
+but at the time we at Berkeley had a problem, and it seemed like the
+right thing to do.
+
+This package requires a post-V7 version of m4; if you are running the
+4.2bsd, SysV.2, or 7th Edition version, I suggest finding a friend with
+a newer version.  You can m4-expand on their system, then run locally.
+SunOS's /usr/5bin/m4 or BSD-Net/2's m4 both work.  GNU m4 version 1.1
+also works.  Unfortunately, I'm told that the M4 on BSDI 1.0 doesn't
+work -- you'll have to use a Net/2 or GNU version.
+
+IF YOU DON'T HAVE A BERKELEY MAKE, don't despair!  Just run
+"m4 foo.mc > foo.cf" -- that should be all you need.  There is also
+a fairly crude (but functional) Makefile.dist that works on the
+old version of make.
+
+To get started, you may want to look at tcpproto.mc (for TCP-only
+sites), uucpproto.mc (for UUCP-only sites), and clientproto.mc (for
+clusters of clients using a single mail host).  Others are versions
+that we use at Berkeley, although not all are in current use.  For
+example, ucbarpa has gone away, but I've left ucbarpa.mc in because
+it demonstrates some interesting techniques.
+
+I'm not pretending that this README describes everything that these
+configuration files can do; clever people can probably tweak them
+to great effect.  But it should get you started.
+
+*******************************************************************
+***  BE SURE YOU CUSTOMIZE THESE FILES!  They have some		***
+***  Berkeley-specific assumptions built in, such as the name	***
+***  of our UUCP-relay.  You'll want to create your own domain	***
+***  description, and use that in place of domain/Berkeley.m4.	***
+*******************************************************************
+
+
++--------------------------+
+| INTRODUCTION AND EXAMPLE |
++--------------------------+
+
+Configuration files are contained in the subdirectory "cf", with a
+suffix ".mc".  They must be run through "m4" to produce a ".cf" file.
+
+Let's examine a typical .mc file (cf/cs-exposed.mc):
+
+	divert(-1)
+	#
+	# Copyright (c) 1983 Eric P. Allman
+	# Copyright (c) 1988 The Regents of the University of California.
+	# All rights reserved.
+	#
+	# Redistribution and use in source and binary forms are permitted
+	# provided that the above copyright notice and this paragraph are
+	# duplicated in all such forms and that any documentation,
+	# advertising materials, and other materials related to such
+	# distribution and use acknowledge that the software was developed
+	# by the University of California, Berkeley.  The name of the
+	# University may not be used to endorse or promote products derived
+	# from this software without specific prior written permission.
+	# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+	# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+	# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+	#
+
+The divert(-1) will delete the crud in the resulting output file.
+The copyright notice is what your lawyers require.  Our lawyers require
+the one that I've included in my files. A copyleft is a copyright by
+another name.
+
+The next line MUST be
+
+	include(`../m4/cf.m4')
+
+This will pull in the M4 macros you will need to make sense of
+everything else.  As the saying goes, don't think about it, just
+do it.  If you don't do it, don't bother reading the rest of this
+file.
+
+	VERSIONID(`<SCCS or RCS version id>')
+
+VERSIONID is a macro that stuffs the version information into the
+resulting file.  We use SCCS; you could use RCS, something else, or
+omit it completely.  This is not the same as the version id included
+in SMTP greeting messages -- this is defined in m4/version.m4.
+
+	DOMAIN(cs.exposed)
+
+This example exposes the host inside of the CS subdomain -- that is,
+it doesn't try to hide the name of the workstation to the outside
+world.  Changing this to DOMAIN(cs.hidden) would have made outgoing
+messages refer to "<username>@CS.Berkeley.EDU" instead of using the
+local hostname.  Internally this is effected by using
+"MASQUERADE_AS(CS.Berkeley.EDU)".
+
+	MAILER(smtp)
+
+These describe the mailers used at the default CS site site.  The
+local mailer is always included automatically.
+
+
++--------+
+| OSTYPE |
++--------+
+
+Note that cf/cs-exposed.mc omits an OSTYPE macro -- this assumes
+default Computer Science Division environment.  There are several
+explicit environments available: bsd4.3, bsd4.4, hpux, irix, osf1,
+riscos4.5, sunos3.5, sunos4.1, and ultrix4.1.  These change things
+like the location of the alias file and queue directory.  Some of
+these files are identical to one another.
+
+Operating system definitions are easy to write.  They may define
+the following variables (everything defaults, so an ostype file
+may be empty).
+
+ALIAS_FILE		[/etc/aliases] The location of the text version
+			of the alias file(s).  It can be a comma-separated
+			list of names (but be sure you quote values with
+			comments in them -- for example, use
+				define(`ALIAS_FILE', `a,b')
+			to get "a" and "b" both listed as alias files;
+			otherwise the define() primitive only sees "a").
+HELP_FILE		[/usr/lib/sendmail.hf] The name of the file
+			containing information printed in response to
+			the SMTP HELP command.
+QUEUE_DIR		[/var/spool/mqueue] The directory containing
+			queue files.
+STATUS_FILE		[/etc/sendmail.st] The file containing status
+			information.
+LOCAL_MAILER_PATH	[/bin/mail] The program used to deliver local mail.
+LOCAL_MAILER_FLAGS	[rmn] The flags used by the local mailer.  The
+			flags lsDFM are always included.
+LOCAL_MAILER_ARGS	[mail -d $u] The arguments passed to deliver local
+			mail.
+LOCAL_SHELL_PATH	[/bin/sh] The shell used to deliver piped email.
+LOCAL_SHELL_FLAGS	[eu] The flags used by the shell mailer.  The
+			flags lsDFM are always included.
+LOCAL_SHELL_ARGS	[sh -c $u] The arguments passed to deliver "prog"
+			mail.
+USENET_MAILER_PATH	[/usr/lib/news/inews] The name of the program
+			used to submit news.
+USENET_MAILER_FLAGS	[rlsDFMmn] The mailer flags for the usenet mailer.
+USENET_MAILER_ARGS	[-m -h -n] The command line arguments for the
+			usenet mailer.
+USENET_MAILER_MAX	[100000] The maximum size of messages that will
+			be accepted by the usenet mailer.
+SMTP_MAILER_FLAGS	[undefined] Flags added to SMTP mailer.  Default
+			flags are `mDFMUX' (and `a' for esmtp mailer).
+SMTP_MAILER_MAX		[undefined] The maximum size of messages that will
+			be transported using the smtp or esmtp mailers.
+UUCP_MAILER_FLAGS	[undefined] Flags added to UUCP mailer.  Default
+			flags are `DFMhuU' (and `m' for suucp mailer, minus
+			`U' for uucp-dom mailer).
+UUCP_MAILER_ARGS	[uux - -r -z -a$f -gC $h!rmail ($u)] The arguments
+			passed to the UUCP mailer.
+UUCP_MAX_SIZE		[100000] The maximum size message accepted for
+			transmission by the UUCP mailers.
+FAX_MAILER_PATH		[/usr/local/lib/fax/mailfax] The program used to
+			submit FAX messages.
+FAX_MAILER_MAX		[100000] The maximum size message accepted for
+			transmission by FAX.
+
++---------+
+| DOMAINS |
++---------+
+
+You will probably want to collect domain-dependent defines into one
+file, referenced by the DOMAIN macro.  For example, our Berkeley
+domain file includes definitions for several internal distinguished
+hosts:
+
+UUCP_RELAY	The host that will forward UUCP-addressed email.
+		If not defined, all UUCP sites must be directly
+		connected.
+BITNET_RELAY	The host that will forward BITNET-addressed email.
+		If not defined, the .BITNET pseudo-domain won't work.
+LOCAL_RELAY	The site that will handle unqualified names -- that
+		is, names with out an @domain extension.  If not set,
+		they are assumed to belong on this machine.  This
+		allows you to have a central site to store a
+		company- or department-wide alias database.  This
+		only works at small sites, and there are better
+		methods.
+
+Each of these can be either ``mailer:hostname'' (in which case the
+mailer is the internal mailer name, such as ``suucp'' and the hostname
+is the name of the host as appropriate for that mailer) or just a
+``hostname'', in which case a default mailer type (usually ``relay'',
+a variant on SMTP) is used.  WARNING: if you have a wildcard MX
+record matching your domain, you probably want to define these to
+have a trailing dot so that you won't get the mail diverted back
+to yourself.
+
+The domain file can also be used to define a domain name, if needed
+(using "DD<domain>") and set certain site-wide features.  If all hosts
+at your site masquerade behind one email name, you could also use
+MASQUERADE_AS here.
+
+You do not have to define a domain -- in particular, if you are a
+single machine sitting off somewhere, it is probably more work than
+it's worth.  This is just a mechanism for combining "domain dependent
+knowledge" into one place.
+
++---------+
+| MAILERS |
++---------+
+
+There are fewer mailers supported in this version than the previous
+version, owing mostly to a simpler world.
+
+local		The local and prog mailers.  You will almost always
+		need these; the only exception is if you relay ALL
+		your mail to another site.  This mailer is included
+		automatically.
+
+smtp		The Simple Mail Transport Protocol mailer.  This does
+		not hide hosts behind a gateway or another other
+		such hack; it assumes a world where everyone is
+		running the name server.  This file actually defines
+		three mailers: "smtp" for regular (old-style) SMTP to
+		other servers, "esmtp" for extended SMTP to other
+		servers, and "relay" for transmission to our
+		RELAY_HOST or MAILER_HUB.
+
+uucp		The Unix-to-Unix Copy Program mailer.  Actually, this
+		defines two mailers, "uucp" and "suucp".  The latter
+		is for when you know that the UUCP mailer at the other
+		end can handle multiple recipients in one transfer.
+		When you invoke this, sendmail looks for all names in
+		the $=U class and sends them to the uucp-old mailer; all
+		names in the $=Y class are sent to uucp-new; and all
+		names in the $=Z class are sent to uucp-uudom.  Note that
+		this is a function of what version of rmail runs on
+		the receiving end, and hence may be out of your control.
+		If smtp is defined, it also defines "uucp-dom" and
+		"uucp-uudom" mailers that use domain-style rewriting.
+		See the section below describing UUCP mailers in more
+		detail.
+
+usenet		Usenet (network news) delivery.  If this is specified,
+		an extra rule is added to ruleset 0 that forwards all
+		local email for users named ``group.usenet'' to the
+		``inews'' program.  Note that this works for all groups,
+		and may be considered a security problem.
+
+fax		Facsimile transmission.  This is experimental and based
+		on Sam Leffler's FlexFAX software.  For more information,
+		see below.
+
+pop		Post Office Protocol.
+
+
++----------+
+| FEATURES |
++----------+
+
+Special features can be requested using the "FEATURE" macro.  For
+example, the .mc line:
+
+	FEATURE(use_cw_file)
+
+tells sendmail that you want to have it read an /etc/sendmail.cw
+file to get values for class $=w.  The FEATURE may contain a single
+optional parameter -- for example:
+
+	FEATURE(mailertable, dbm /usr/lib/mailertable)
+
+Available features are:
+
+use_cw_file	Read the file /etc/sendmail.cw file to get alternate
+		names for this host.  This might be used if you were
+		on a host that MXed for a dynamic set of other
+		hosts.  If the set is static, just including the line
+		"Cw<name1> <name2> ..." is probably superior.
+		The actual filename can be overridden by redefining
+		confCW_FILE.
+
+redirect	Reject all mail addressed to "address.REDIRECT" with
+		a ``551 User not local; please try <address>'' message.
+		If this is set, you can alias people who have left
+		to their new address with ".REDIRECT" appended.
+
+nouucp		Don't do anything special with UUCP addresses at all.
+
+nocanonify	Don't pass addresses to $[ ... $] for canonification.
+		This would generally only be used by sites that only
+		act as mail gateways or which have user agents that do
+		full canonification themselves.  You may also want to
+		use "define(`confBIND_OPTS',`-DNSRCH -DEFNAMES')" to
+		turn off the usual resolver options that do a similar
+		thing.
+
+notsticky	By default, email sent to "user@local.host" are marked
+		as "sticky" -- that is, the local addresses aren't
+		matched against UDB and don't go through ruleset 5.
+		This features disables this treatment.  It would
+		normally be used on network gateway machines.
+
+mailertable	Include a "mailer table" which can be used to override
+		routing for particular domains.  The argument of the
+		FEATURE may be the key definition.  If none is specified,
+		the definition used is:
+			hash -o /etc/mailertable
+		Keys in this database are fully qualified domain names
+		or partial domains preceded by a dot -- for example,
+		"vangogh.CS.Berkeley.EDU" or ".CS.Berkeley.EDU".
+		Values must be of the form:
+			mailer:domain
+		where "mailer" is the internal mailer name, and "domain"
+		is where to send the message.  These maps are not
+		reflected into the message header.
+
+domaintable	Include a "domain table" which can be used to provide
+		full domains on unqualified (single word) hosts.  The
+		argument of the FEATURE may be the key definition.  If
+		none is specified, the definition used is:
+			hash -o /etc/domaintable
+		The key in this table is the unqualified host name; the
+		value is the fully qualified domain.  Anything in the
+		domaintable is reflected into headers; that is, this
+		is done in ruleset 3.
+
+bitdomain	Look up bitnet hosts in a table to try to turn them into
+		internet addresses.  The table can be built using the
+		bitdomain program contributed by John Gardiner Myers.
+		The argument of the FEATURE may be the key definition; if
+		none is specified, the definition used is:
+			hash -o /etc/bitdomain.db
+		Keys are the bitnet hostname; values are the corresponding
+		internet hostname.
+
+uucpdomain	Similar feature for UUCP hosts.  The default map definition
+		is:
+			hash -o /etc/uudomain.db
+		At the moment there is no automagic tool to build this
+		database.
+
+always_add_domain
+		Include the local host domain even on locally delivered
+		mail.  Normally it is not added unless it is already
+		present.
+
+allmasquerade	If masquerading is enabled (using MASQUERADE_AS), this
+		feature will cause recipient addresses to also masquerade
+		as being from the masquerade host.  Normally they get
+		the local hostname.  Although this may be right for
+		ordinary users, it can break local aliases.  For example,
+		if you send to "localalias", the originating sendmail will
+		find that alias and send to all members, but send the
+		message with "To: localalias@masqueradehost".  Since that
+		alias likely does not exist, replies will fail.  Use this
+		feature ONLY if you can guarantee that the ENTIRE
+		namespace on your masquerade host supersets all the
+		local entries.
+
+nodns		We aren't running DNS at our site (for example,
+		we are UUCP-only connected).  It's hard to consider
+		this a "feature", but hey, it had to go somewhere.
+
+nullclient	This is a special case -- it creates a stripped down
+		configuration file containing nothing but support for
+		forwarding all mail to a central hub via a local
+		SMTP-based network.  The argument is the name of that
+		hub.
+		
+		The only other feature that should be used in conjunction
+		with this one is "nocanonify" (this causes addresses to
+		be sent unqualified via the SMTP connection; normally
+		they are qualifed with the masquerade name, which
+		defaults to the name of the hub machine).  No mailers
+		should be defined.  No aliasing or forwarding is done.
+
+
++-------+
+| HACKS |
++-------+
+
+Some things just can't be called features.  To make this clear,
+they go in the hack subdirectory and are referenced using the HACK
+macro.  These will tend to be site-dependent.  The release
+includes the Berkeley-dependent "cssubdomain" hack (that makes
+sendmail accept local names in either Berkeley.EDU or CS.Berkeley.EDU;
+this is intended as a short-term aid while we move hosts into
+subdomains.
+
+
++--------------------+
+| SITE CONFIGURATION |
++--------------------+
+
+Complex sites will need more local configuration information, such as
+lists of UUCP hosts they speak with directly.  This can get a bit more
+tricky.  For an example of a "complex" site, see cf/ucbvax.mc.
+
+If your host is known by several different names, you need to augment
+the $=w class.  This is a list of names by which you are known, and
+anything sent to an address using a host name in this list will be
+treated as local mail.  You can do this in two ways: either create
+the file /etc/sendmail.cw containing a list of your aliases (one per
+line), and use ``FEATURE(use_cw_file)'' in the .mc file, or add the
+line:
+
+	Cw alias.host.name
+
+at the end of that file.  See the ``vangogh.mc'' file for an example.
+Be sure you use the fully-qualified name of the host, rather than a
+short name.
+
+The SITECONFIG macro allows you to indirectly reference site-dependent
+configuration information stored in the siteconfig subdirectory.  For
+example, the line
+
+	SITECONFIG(uucp.ucbvax, ucbvax, U)
+
+reads the file uucp.ucbvax for local connection information.  The
+second parameter is the local name (in this case just "ucbvax" since
+it is locally connected, and hence a UUCP hostname).  The third
+parameter is the name of both a macro to store the local name (in
+this case, $U) and the name of the class (e.g., $=U) in which to store
+the host information read from the file.  Another SITECONFIG line reads
+
+	SITECONFIG(uucp.ucbarpa, ucbarpa.Berkeley.EDU, W)
+
+This says that the file uucp.ucbarpa contains the list of UUCP sites
+connected to ucbarpa.Berkeley.EDU.  The $=W class will be used to
+store this list, and $W is defined to be ucbarpa.Berkeley.EDU, that
+is, the name of the relay to which the hosts listed in uucp.ucbarpa
+are connected.  [The machine ucbarpa is gone now, but I've left
+this out-of-date configuration file around to demonstrate how you
+might do this.]
+
+Note that the case of SITECONFIG with a third parameter of ``U'' is
+special; the second parameter is assumed to be the UUCP name of the
+local site, rather than the name of a remote site, and the UUCP name
+is entered into $=w (the list of local hostnames) as $U.UUCP.
+
+The siteconfig file (e.g., siteconfig/uucp.ucbvax.m4) contains nothing
+more than a sequence of SITE macros describing connectivity.  For
+example:
+
+	SITE(cnmat)
+	SITE(sgi olympus)
+
+The second example demonstrates that you can use two names on the
+same line; these are usually aliases for the same host (or are at
+least in the same company).
+
+
++--------------------+
+| USING UUCP MAILERS |
++--------------------+
+
+It's hard to get UUCP mailers right because of the extremely ad hoc
+nature of UUCP addressing.  These config files are really designed
+for domain-based addressing, even for UUCP sites.
+
+There are four UUCP mailers available.  The choice of which one to
+use is partly a matter of local preferences and what is running at
+the other end of your UUCP connection.  Unlike good protocols that
+define what will go over the wire, UUCP uses the policy that you
+should do what is right for the other end; if they change, you have
+to change.  This makes it hard to do the right thing, and discourages
+people from updating their software.  In general, if you can avoid
+UUCP, please do.
+
+The major choice is whether to go for a domainized scheme or a
+non-domainized scheme.  This depends entirely on what the other
+end will recognize.  If at all possible, you should encourage the
+other end to go to a domain-based system -- non-domainized addresses
+don't work entirely properly.
+
+The four mailers are:
+
+    uucp-old (obsolete name: "uucp")
+	This is the oldest, the worst (but the closest to UUCP) way of
+	sending messages accros UUCP connections.  It does bangify
+	everything and prepends $U (your UUCP name) to the sender's
+	address (which can already be a bang path itself).  It can
+	only send to one address at a time, so it spends a lot of
+	time copying duplicates of messages.  Avoid this if at all
+	possible.
+
+    uucp-new (obsolete name: "suucp")
+	The same as above, except that it assumes that in one rmail
+	command you can specify several recipients.  It still has a
+	lot of other problems.
+
+    uucp-dom
+	This UUCP mailer keeps everything as domain addresses.
+	Basically, it uses the SMTP mailer rewriting rules.
+
+	Unfortunately, a lot of UUCP mailer transport agents require
+	bangified addresses in the envelope, although you can use
+	domain-based addresses in the message header.  (The envelope
+	shows up as the From_ line on UNIX mail.)  So....
+
+    uucp-uudom
+	This is a cross between uucp-new (for the envelope addresses)
+	and uucp-dom (for the header addresses).  It bangifies the
+	envelope sender (From_ line in messages) without adding the
+	local hostname, unless there is no host name on the address
+	at all (e.g., "wolf") or the host component is a UUCP host name
+	instead of a domain name ("somehost!wolf" instead of
+	"some.dom.ain!wolf").
+
+Examples:
+
+We are on host grasp.insa-lyon.fr (UUCP host name "grasp").  The
+following summarizes the sender rewriting for various mailers.
+
+Mailer          sender		rewriting in the envelope
+------		------		-------------------------
+uucp-{old,new}	wolf		grasp!wolf
+uucp-dom	wolf		wolf@grasp.insa-lyon.fr
+uucp-uudom	wolf		grasp.insa-lyon.fr!wolf
+
+uucp-{old,new}	wolf@fr.net	grasp!fr.net!wolf
+uucp-dom	wolf@fr.net	wolf@fr.net
+uucp-uudom	wolf@fr.net	fr.net!wolf
+
+uucp-{old,new}	somehost!wolf	grasp!somehost!wolf
+uucp-dom	somehost!wolf	somehost!wolf@grasp.insa-lyon.fr
+uucp-uudom	somehost!wolf	grasp.insa-lyon.fr!somehost!wolf
+
+If you are using one of the domainized UUCP mailers, you really want
+to convert all UUCP addresses to domain format -- otherwise, it will
+do it for you (and probably not the way you expected).  For example,
+if you have the address foo!bar!baz (and you are not sending to foo),
+the heuristics will add the @uucp.relay.name or @local.host.name to
+this address.  However, if you map foo to foo.host.name first, it
+will not add the local hostname.  You can do this using the uucpdomain
+feature.
+
+
++-------------------+
+| TWEAKING RULESETS |
++-------------------+
+
+For more complex configurations, you can define special rules.
+The macro LOCAL_RULE_3 introduces rules that are used in canonicalizing
+the names.  Any modifications made here are reflected in the header.
+
+A common use is to convert old UUCP addreses to SMTP addresses using
+the UUCPSMTP macro.  For example:
+
+	LOCAL_RULE_3
+	UUCPSMTP(decvax,	decvax.dec.com)
+	UUCPSMTP(research,	research.att.com)
+
+will cause addresses of the form "decvax!user" and "research!user"
+to be converted to "user@decvax.dec.com" and "user@research.att.com"
+respectively.
+
+This could also be used to look up hosts in a database map:
+
+	LOCAL_RULE_3
+	R$* < @ $+ > $*		$: $1 < @ $(hostmap $2 $) > $3
+
+This map would be defined in the LOCAL_CONFIG portion, as shown below.
+
+Similarly, LOCAL_RULE_0 can be used to introduce new parsing rules.
+For example, new rules are needed to parse hostnames that you accept
+via MX records.  For example, you might have:
+
+	LOCAL_RULE_0
+	R$+ <@ host.dom.ain.>	$#uucp $@ cnmat $: $1 < @ host.dom.ain.>
+
+You would use this if you had installed an MX record for cnmat.Berkeley.EDU
+pointing at this host; this rule catches the message and forwards it on
+using UUCP.
+
+You can also tweak rulesets 1 and 2 using LOCAL_RULE_1 and LOCAL_RULE_2.
+These rulesets are normally empty.
+
+A similar macro is LOCAL_CONFIG.  This introduces lines added after the
+boilerplate option setting but before rulesets, and can be used to
+declare local database maps or whatever.  For example:
+
+	LOCAL_CONFIG
+	Khostmap hash /etc/hostmap.db
+	Kyplocal nis -m hosts.byname
+
+
++---------------------------+
+| MASQUERADING AND RELAYING |
++---------------------------+
+
+You can have your host masquerade as another using
+
+	MASQUERADE_AS(host.domain)
+
+This causes outgoing SMTP mail to be labeled as coming from the
+indicated domain, rather than $j.  One normally masquerades as one
+of one's own subdomains (for example, it's unlikely that I would
+choose to masquerade as an MIT site).
+
+The masquerade name is not normally canonified, so it is important
+that it be your One True Name, that is, fully qualified and not a
+CNAME.
+
+there are always users that need to be "exposed" -- that is, their
+internal site name should be displayed instead of the masquerade name.
+Root is an example.  You can add users to this list using
+
+	EXPOSED_USER(usernames)
+
+This adds users to class E; you could also use something like
+
+	FE/etc/sendmail.cE
+
+You can also arrange to relay all unqualified names (that is, names
+without @host) to a relay host.  For example, if you have a central
+email server, you might relay to that host so that users don't have
+to have .forward files or aliases.  You can do this using
+
+	define(`LOCAL_RELAY', mailer:hostname)
+
+The ``mailer:'' can be omitted, in which case the mailer defaults to
+"smtp".  There are some user names that you don't want relayed, perhaps
+because of local aliases.  A common example is root, which may be
+locally aliased.  You can add entries to this list using
+
+	LOCAL_USER(usernames)
+
+This adds users to class L; you could also use something like
+
+	FL/etc/sendmail.cL
+
+If you want all incoming mail sent to a centralized hub, as for a
+shared /var/spool/mail scheme, use
+
+	define(`MAIL_HUB', mailer:hostname)
+
+Again, ``mailer:'' defaults to "smtp".  If you define both LOCAL_RELAY
+and MAIL_HUB, unqualified names will be sent to the LOCAL_RELAY and
+other local names will be sent to MAIL_HUB.  Names in $=L will be
+delivered locally, so you MUST have aliases or .forward files for them.
+
+For example, if are on machine mastodon.CS.Berkeley.EDU, the following
+combinations of settings will have the indicated effects:
+
+email sent to....	eric			  eric@mastodon.CS.Berkeley.EDU
+
+LOCAL_RELAY set to	mail.CS.Berkeley.EDU	  (delivered locally)
+mail.CS.Berkeley.EDU
+
+MAIL_HUB set to		mammoth.CS.Berkeley.EDU	  mammoth.CS.Berkeley.EDU
+mammoth.CS.Berkeley.EDU
+
+Both LOCAL_RELAY and	mail.CS.Berkeley.EDU	  mammoth.CS.Berkeley.EDU
+MAIL_HUB set as above
+
+If you want all outgoing mail to go to a central relay site, define
+SMART_HOST as well.  Briefly:
+
+	LOCAL_RELAY applies to unqualifed names (e.g., "eric").
+	MAIL_HUB applies to names qualified with the name of the
+		local host (e.g., "eric@mastodon.CS.Berkeley.EDU").
+	SMART_HOST applies to names qualified with other hosts.
+
+However, beware that other relays (e.g., UUCP_RELAY, BITNET_RELAY, and
+FAX_RELAY) take precedence over SMART_HOST, so if you really want
+absolutely everything to go to a single central site you will need to
+unset all the other relays -- or better yet, find or build a minimal
+config file that does this.
+
+
++-------------------------------+
+| NON-SMTP BASED CONFIGURATIONS |
++-------------------------------+
+
+These configuration files are designed primarily for use by SMTP-based
+sites.  I don't pretend that they are well tuned for UUCP-only or
+UUCP-primarily nodes (the latter is defined as a small local net
+connected to the rest of the world via UUCP).  However, there is one
+hook to handle some special cases.
+
+You can define a ``smart host'' that understands a richer address syntax
+using:
+
+	define(`SMART_HOST', mailer:hostname)
+
+In this case, the ``mailer:'' defaults to "relay".  Any messages that
+can't be handled using the usual UUCP rules are passed to this host.
+
+If you are on a local SMTP-based net that connects to the outside
+world via UUCP, you can use LOCAL_NET_CONFIG to add appropriate rules.
+For example:
+
+	define(`SMART_HOST', suucp:uunet)
+	LOCAL_NET_CONFIG
+	R$* < @ $* .$m. > $*	$#smtp $@ $2.$m. $: $1 < @ $2.$m. > $3
+
+This will cause all names that end in your domain name ($m) via
+SMTP; anything else will be sent via suucp (smart UUCP) to uunet.
+If you have FEATURE(nocanonify), you may need to omit the dots after
+the $m.  If you are running a local DNS inside your domain which is
+not otherwise connected to the outside world, you probably want to
+use:
+
+	define(`SMART_HOST', smtp:fire.wall.com)
+	LOCAL_NET_CONFIG
+	R$* < @ $* . > $*	$#smtp $@ $2. $: $1 < @ $2. > $3
+
+That is, send directly only to things you found in your DNS lookup;
+anything else goes through SMART_HOST.
+
+If you are not running DNS at all, it is important to use
+FEATURE(nodns) to avoid having sendmail queue everything waiting
+for the name server to come up.
+
+
++-----------+
+| WHO AM I? |
++-----------+
+
+Normally, the $j macro is automatically defined to be your fully
+qualified domain name (FQDN).  Sendmail does this by getting your
+host name using gethostname and then calling gethostbyname on the
+result.  For example, in some environments gethostname returns
+only the root of the host name (such as "foo"); gethostbyname is
+supposed to return the FQDN ("foo.bar.com").  In some (fairly rare)
+cases, gethostbyname may fail to return the FQDN.  In this case
+you MUST define confDOMAIN_NAME to be your fully qualified domain
+name.  This is usually done using:
+
+	Dmbar.com
+	define(`confDOMAIN_NAME', `$w.$m')dnl
+
+
++--------------------+
+| USING MAILERTABLES |
++--------------------+
+
+To use FEATURE(mailertable), you will have to create an external
+database containing the routing information for various domains.
+For example, a mailertable file in text format might be:
+
+	.my.domain		xnet:%1.my.domain
+	uuhost1.my.domain	suucp:uuhost1
+	.bitnet			smtp:relay.bit.net
+
+This should normally be stored in /etc/mailertable.  The actual
+database version of the mailertable is built using:
+
+	makemap hash /etc/mailertable.db < /etc/mailertable
+
+The semantics are simple.  Any LHS entry that does not begin with
+a dot matches the full host name indicated.  LHS entries beginning
+with a dot match anything ending with that domain name -- that is,
+they can be thought of as having a leading "*" wildcard.  Matching
+is done in order of most-to-least qualified -- for example, even
+though ".my.domain" is listed first in the above example, an entry
+of "uuhost1.my.domain" will match the second entry since it is
+more explicit.
+
+The RHS should always be a "mailer:host" pair.  The mailer is the
+configuration name of a mailer (that is, an `M' line in the
+sendmail.cf file).  The "host" will be the hostname passed to
+that mailer.  In domain-based matches (that is, those with leading
+dots) the "%1" may be used to interpolate the wildcarded part of
+the host name.  For example, the first line above sends everything
+addressed to "anything.my.domain" to that same host name, but using
+the (presumably experimental) xnet mailer.
+
+
++--------------------------------+
+| USING USERDB TO MAP FULL NAMES |
++--------------------------------+
+
+The user database was not originally intended for mapping full names
+to login names (e.g., Eric.Allman => eric), but some people are using
+it that way.  (I would recommend that you set up aliases for this
+purpose instead -- since you can specify multiple alias files, this
+is fairly easy.)  The intent was to locate the default maildrop at
+a site, but allow you to override this by sending to a specific host.
+
+If you decide to set up the user database in this fashion, it is
+imperative that you also specify FEATURE(notsticky) -- otherwise,
+e-mail sent to Full.Name@local.host.name will be rejected.
+
+To build the internal form of the user databae, use:
+
+	makemap btree /usr/data/base.db < /usr/data/base.txt
+
+
++------------------+
+| FlexFAX SOFTWARE |
++------------------+
+
+Sam Leffler's FlexFAX software is still in beta test -- but he expects a
+public version out "later this week" [as of 3/1/93].  The following
+blurb is direct from Sam:
+
+	Header: /usr/people/sam/fax/RCS/HOWTO,v 1.14 93/05/24 11:42:16 sam Exp 
+
+	How To Obtain This Software (in case all you get is this file)
+	--------------------------------------------------------------
+	The source code is available for public ftp on
+	    sgi.com			sgi/fax/v2.1.src.tar.Z
+		(192.48.153.1)
+
+	You can also obtain inst'able images for Silicon Graphics machines from
+	    sgi.com			sgi/fax/v2.1.inst.tar
+		(192.48.153.1)
+
+	For example,
+	    % ftp -n sgi.com
+	    ....
+	    ftp> user anonymous
+	    ... <type in password>
+	    ftp> cd sgi/fax
+	    ftp> binary
+	    ftp> get v2.1.src.tar.Z
+
+	In general, the latest version of the 2.1 release of the software is
+	always available as "v2.1.src.tar.Z" or "v2.1.inst.tar" in the ftp
+	directory.  This file is a link to the appropriate released version (so
+	don't waste your time retrieving the linked file as well!) Any files of
+	the form v2.1.*.patch are shell scripts that can be used to patch older
+	versions of the source code.  For example, the file v2.1.0.patch would
+	contain patches to update v2.1.0.tar.Z.  (Note to beta testers: this is
+	different than the naming conventions used during beta testing.) Patch
+	files only work to go between consecutive versions, so if you are
+	multiple versions behind the latest release, you will need to apply
+	each patch file between your current version and the latest.
+
+
+	Obtaining the Software by Electronic Mail
+	-----------------------------------------
+	Do not send me requests for the software; they will be ignored (without
+	response).  If you cannot use FTP at all, there is a service called
+	"ftpmail" available from gatekeeper.dec.com:  you can send e-mail to
+	this machine and it will use FTP to retrieve files for you and send you
+	the files back again via e-mail.  To find out more about the ftpmail
+	service, send a message to "ftpmail@gatekeeper.dec.com" whose body
+	consists of the single line "help".
+
+
+	Obtaining the Software Within Silicon Graphics
+	----------------------------------------------
+	Internal to Silicon Graphics there are inst'able images on the host
+	flake.asd in the directory /usr/dist.  Thus you can do something like:
+
+	    % inst -f flake.asd.sgi.com:/usr/dist/flexfax
+
+	to install the latest version of the software on your machine.
+
+
+	What to do Once You've Retrieved Stuff
+	--------------------------------------
+	The external distributions come in a compressed or uncompressed tar
+	file.  To extract the source distribution:
+
+	    % zcat v2.1.src.tar.Z | tar xf -
+
+	(uncompress and extract individual files in current directory).  To
+	unpack and install the client portion of the inst'able distribution:
+
+	    % mkdir dist
+	    % cd dist; tar xf ../v2.1.inst.tar; cd ..
+	    % inst -f dist/flexfax
+	    ...
+	    inst> go
+
+	(Note, the dist subdirectory is because some versions of inst fail if
+	the files are in the current directory.) Server binaries are also
+	included in the inst'able images as flexfax.server.*.  They are not
+	installed by default, so to get them also you need to do:
+
+	    % inst -f flexfax
+	    ...
+	    inst> install flexfax.server.*
+	    inst> go
+
+	The SGI binaries were built for Version 4.0.5H of the IRIX operating
+	system.  They should work w/o problem on earlier versions of the
+	system, but I have not fully tested this.  Also, note that to install a
+	server on an SGI machine, you need to have installed the Display
+	PostScript execution environment product (dps_eoe).  Otherwise, the fax
+	server will not be able to convert PostScript to facsimile for
+	transmission.
+
+	If you are working from the source distribution, look at the file
+	README in the top of the source tree.  If you are working from the inst
+	images, the subsystem flexfax.man.readme contains the README file and
+	other useful pieces of information--the installed files are placed in
+	the directory /usr/local/doc/flexfax).  Basically you will need to run
+	the faxaddmodem script to setup and configure your fax modem.  Consult
+	the README file and the manual page for faxaddmodem for information.
+
+
+	FlexFAX Mail List
+	-----------------
+	A mailing list for users of this software is located on sgi.com.
+	If you want to join this mailing list or have a list-related request
+	such as getting your name removed from it, send a request to
+
+	    majordomo@whizzer.wpd.sgi.com
+
+	For example, to subscribe, send the line "subscribe flexfax" in
+	the body of your message.  The line "help" will return a list of
+	the commands understood by the mailing list management software.
+
+	Submissions (including bug reports) should be directed to:
+
+	    flexfax@sgi.com
+
+	When corresponding about this software please always specify what
+	version you have, what system you're running on, and, if the problem is
+	specific to your modem, identify the modem and firmware revision.
+
+
++--------------------------------+
+| TWEAKING CONFIGURATION OPTIONS |
++--------------------------------+
+
+There are a large number of configuration options that don't normally
+need to be changed.  However, if you feel you need to tweak them, you
+can define the following M4 variables.  This list is shown in four
+columns:  the name you define, the default value for that definition,
+the option or macro that is affected (either Ox for an option or Dx
+for a macro), and a brief description.  Greater detail of the semantics
+can be found in the Installation and Operations Guide.
+
+Some options are likely to be deprecated in future versions -- that is,
+the option is only included to provide back-compatibility.  These are
+marked with "*".
+
+Remember that these options are M4 variables, and hence may need to
+be quoted.  In particular, arguments with commas will usually have to
+be ``double quoted, like this phrase'' to avoid having the comma
+confuse things.  This is common for alias file definitions and for
+the read timeout.
+
+M4 Variable Name	Default		Mac/Opt	Description
+================	=======		=======	===========
+confMAILER_NAME		MAILER-DAEMON	Dn	The sender name used for
+						internally generated
+						outgoing messages.
+confFROM_LINE		From $g  $d	Dl	The From_ line used when
+						sending to files or programs.
+confFROM_HEADER		$?x$x <$g>$|$g$.	The format of an internally
+					Dq	generated From: address.
+confOPERATORS		.:%@!^/[]	Do	Address operator characters.
+confSMTP_LOGIN_MSG	$j Sendmail $v/$Z ready at $b
+					De	The initial (spontaneous)
+						SMTP greeting message.
+confSEVEN_BIT_INPUT	False		O7	Force input to seven bits?
+confALIAS_WAIT		10		Oa	Wait (in minutes) for alias
+						file rebuild.
+confMIN_FREE_BLOCKS	4		Ob	Minimum number of free blocks
+						on queue filesystem to accept
+						SMTP mail.
+confBLANK_SUB		.		OB	Blank (space) substitution
+						character.
+confCON_EXPENSIVE	False		Oc	Avoid connecting immediately
+						to mailers marked expensive?
+confCHECKPOINT_INTERVAL	10		OC	Checkpoint queue files
+						every N recipients.
+confDELIVERY_MODE	background	Od	Default delivery mode.
+confAUTO_REBUILD	False		OD	Automatically rebuild
+						alias file if needed.
+confERROR_MODE		(undefined)	Oe	Error message mode.
+confERROR_MESSAGE	(undefined)	OE	Error message header/file.
+confSAVE_FROM_LINES	False		Of	Save extra leading
+						From_ lines.
+confTEMP_FILE_MODE	0600		OF	Temporary file mode.
+confDEF_GROUP_ID	1		Og	Default group id.
+confMATCH_GECOS		False		OG	Match GECOS field.
+confMAX_HOP		17		Oh	Maximum hop count.
+confIGNORE_DOTS		False		Oi *	Ignore dot as terminator
+						for incoming messages?
+confBIND_OPTS		(empty)		OI	Default options for BIND.
+confMIME_FORMAT_ERRORS	True		Oj *	Send error messages as MIME-
+						encapsulated messages per
+						RFC 1344.
+confFORWARD_PATH	(undefined)	OJ	The colon-separated list of
+						places to search for .forward
+						files.
+confMCI_CACHE_SIZE	2		Ok	Size of open connection cache.
+confMCI_CACHE_TIMEOUT	5m		OK	Open connection cache timeout.
+confUSE_ERRORS_TO	False		Ol *	Use the Errors-To: header to
+						deliver error messages.  This
+						should not be necessary because
+						of general acceptance of the
+						envelope/header distinction.
+confLOG_LEVEL		9		OL	Log level.
+confME_TOO		False		Om	Include sender in group
+						expansions.
+confCHECK_ALIASES	True		On	Check RHS of aliases when
+						running newaliases.
+confOLD_STYLE_HEADERS	True		Oo *	Assume that headers without
+						special chars are old style.
+confDAEMON_OPTIONS	(undefined)	OO	SMTP daemon options.
+confPRIVACY_FLAGS	authwarnings	Op	Privacy flags.
+confCOPY_ERRORS_TO	(undefined)	OP	Address for additional copies
+						of all error messages.
+confQUEUE_FACTOR	(undefined)	Oq	Slope of queue-only function
+confREAD_TIMEOUT	(undefined)	Or	SMTP read timeouts.
+confSAFE_QUEUE		True		Os *	Commit all messages to disk
+						before forking.
+confMESSAGE_TIMEOUT	5d/4h		OT	Timeout for messages before
+						sending error/warning message.
+confTIME_ZONE		USE_SYSTEM	Ot	Time zone info -- can be
+						USE_SYSTEM to use the system's
+						idea, USE_TZ to use the user's
+						TZ envariable, or something
+						else to force that value.
+confDEF_USER_ID		1		Ou	Default user id.
+confUSERDB_SPEC		(undefined)	OU	User database specification.
+confFALLBACK_MX		(undefined)	OV	Fallback MX host.
+confTRY_NULL_MX_LIST	False		Ow	If we are the best MX for a
+						host and haven't made other
+						arrangements, try connecting
+						to the host directly; normally
+						this would be a config error.
+confQUEUE_LA		8		Ox	Load average at which queue-only
+						function kicks in.
+confREFUSE_LA		12		OX	Load average at which incoming
+						SMTP connections are refused.
+confWORK_RECIPIENT_FACTOR
+			(undefined)	Oy	Cost of each recipient.
+confSEPARATE_PROC	False		OY	Run all deliveries in a
+						separate process.
+confWORK_CLASS_FACTOR	(undefined)	Oz	Priority multiplier for class.
+confWORK_TIME_FACTOR	(undefined)	OZ	Cost of each delivery attempt.
+confCW_FILE		/etc/sendmail.cw	Name of file used to get the
+					Fw	local additions to the $=w
+						class.
+confSMTP_MAILER		smtp		-	The mailer name used when
+						SMTP connectivity is required.
+						Either "smtp" or "esmtp".
+confLOCAL_MAILER	local		-	The mailer name used when
+						local connectivity is required.
+						Almost always "local".
+confRELAY_MAILER	relay		-	The default mailer name used
+						for relaying any mail (e.g.,
+						to a BITNET_RELAY, a
+						SMART_HOST, or whatever).
+						This can reasonably be "suucp"
+						if you are on a UUCP-connected
+						site.
+confDOMAIN_NAME		(undefined)	Dj	If defined, sets $j.
+
+
++-----------+
+| HIERARCHY |
++-----------+
+
+Within this directory are several subdirectories, to wit:
+
+m4		General support routines.  These are typically
+		very important and should not be changed without
+		very careful consideration.
+
+cf		The configuration files themselves.  They have
+		".mc" suffixes, and must be run through m4 to
+		become complete.  The resulting output should
+		have a ".cf" suffix.
+
+ostype		Definitions describing a particular operating
+		system type.  These should always be referenced
+		using the OSTYPE macro in the .mc file.  Examples
+		include "bsd4.3", "bsd4.4", "sunos3.5", and
+		"sunos4.1".
+
+domain		Definitions describing a particular domain, referenced
+		using the DOMAIN macro in the .mc file.  These are
+		site dependent; for example, we contribute "cs.exposed.m4"
+		and "cs.hidden.m4" which both describe hosts in the
+		CS.Berkeley.EDU subdomain; the former displays the local
+		hostname (e.g., mammoth.CS.Berkeley.EDU), whereas the
+		latter does its best to hide the identity of the local
+		workstation inside the CS subdomain.
+
+mailer		Descriptions of mailers.   These are referenced using
+		the MAILER macro in the .mc file.
+
+sh		Shell files used when building the .cf file from the
+		.mc file in the cf subdirectory.
+
+feature		These hold special orthogonal features that you might
+		want to include.  They should be referenced using
+		the FEATURE macro.
+
+hack		Local hacks.  These can be referenced using the HACK
+		macro.  They shouldn't be of more than voyeuristic
+		interest outside the .Berkeley.EDU domain, but who knows?
+		We've all got our own peccadillos.
+
+siteconfig	Site configuration -- e.g., tables of locally connected
+		UUCP sites.
+
+
++------------------------+
+| ADMINISTRATIVE DETAILS |
++------------------------+
+
+The following sections detail usage of certain internal parts of the
+sendmail.cf file.  Read them carefully if you are trying to modify
+the current model.  If you find the above descriptions adequate, these
+should be {boring, confusing, tedious, ridiculous} (pick one or more).
+
+RULESETS (* means built in to sendmail)
+
+   0 *	Parsing
+   1 *	Sender rewriting
+   2 *	Recipient rewriting
+   3 *	Canonicalization
+   4 *	Post cleanup
+   5 *	Local address rewrite (after aliasing)
+  1x	mailer rules (sender qualification)
+  2x	mailer rules (recipient qualification)
+  3x	mailer rules (sender header qualification)
+  4x	mailer rules (recipient header qualification)
+  5x	mailer subroutines (general)
+  6x	mailer subroutines (general)
+  7x	mailer subroutines (general)
+  8x	reserved
+  90	Mailertable host stripping
+  96	Bottom half of Ruleset 3 (ruleset 6 in old sendmail)
+  97	Hook for recursive ruleset 0 call (ruleset 7 in old sendmail)
+  98	Local part of ruleset 0 (ruleset 8 in old sendmail)
+
+
+MAILERS
+
+   0	local, prog	local and program mailers
+   1	[e]smtp, relay	SMTP channel
+   2	uucp-*		UNIX-to-UNIX Copy Program
+   3	netnews		Network News delivery
+   4	fax		Sam Leffler's FlexFAX software
+
+
+MACROS
+
+   A
+   B	Bitnet Relay
+   C
+   D	The local domain -- usually not needed
+   E
+   F	FAX Relay
+   G
+   H	mail Hub (for mail clusters)
+   I
+   J
+   K
+   L
+   M	Masquerade (who I claim to be)
+   N
+   O
+   P
+   Q
+   R	Relay (for unqualified names)
+   S	Smart Host
+   T
+   U	my UUCP name (if I have a UUCP connection)
+   V	UUCP Relay (class V hosts)
+   W	UUCP Relay (class W hosts)
+   X	UUCP Relay (class X hosts)
+   Y	UUCP Relay (all other hosts)
+   Z	Version number
+
+
+CLASSES
+
+   A
+   B
+   C
+   D
+   E	addresses that should not seem to come from $M
+   F	hosts we forward for
+   G
+   H
+   I
+   J
+   K
+   L	addresses that should not be forwarded to $R
+   M
+   N
+   O	operators that indicate network operations (cannot be in local names)
+   P	top level pseudo-domains: BITNET, FAX, UUCP, etc.
+   Q
+   R
+   S
+   T
+   U	locally connected UUCP hosts
+   V	UUCP hosts connected to relay $V
+   W	UUCP hosts connected to relay $W
+   X	UUCP hosts connected to relay $X
+   Y	locally connected smart UUCP hosts
+   Z	locally connected domain-ized UUCP hosts
+   .	the class containing only a dot
+
+
+M4 DIVERSIONS
+
+   1	Local host detection and resolution
+   2	Local Ruleset 3 additions
+   3	Local Ruleset 0 additions
+   4	UUCP Ruleset 0 additions
+   5	locally interpreted names (overrides $R)
+   6	local configuration (at top of file)
+   7	mailer definitions
+   8
+   9	special local rulesets (1 and 2)
diff --git a/usr.sbin/sendmail/cf/cf/Makefile b/usr.sbin/sendmail/cf/cf/Makefile
new file mode 100644
index 00000000000..f4be0a39879
--- /dev/null
+++ b/usr.sbin/sendmail/cf/cf/Makefile
@@ -0,0 +1,69 @@
+#	@(#)Makefile	8.5 (Berkeley) 12/1/93
+
+M4=	m4
+CHMOD=	chmod
+ROMODE=	444
+RM=	rm -f
+
+.SUFFIXES:  .mc .cf
+
+.mc.cf:
+	$(RM) $@
+	(cd ${.CURDIR} && $(M4) ${@:R}.mc > ${.OBJDIR}/$@)
+	$(CHMOD) $(ROMODE) $@
+
+ALL=	ucbarpa.cf ucbvax.cf vangogh.cf \
+	chez.cf python.cf \
+	boat-anchor.cf chimera.cf pain.cf sun-lamp.cf trinity.cf \
+	clientproto.cf netbsd-proto.cf tcpproto.cf uucpproto.cf
+
+all: $(ALL)
+
+clean cleandir:
+	$(RM) $(ALL) core
+
+depend install: 
+
+distribution:
+	install -c -o root -g wheel -m 444 netbsd-proto.cf \
+	    ${DESTDIR}/etc/sendmail.cf
+
+# this is overkill, but....
+M4FILES=\
+	../domain/Berkeley.m4 \
+	../domain/cs.exposed.m4 \
+	../domain/cs.hidden.m4 \
+	../domain/eecs.hidden.m4 \
+	../domain/s2k.m4 \
+	../feature/allmasquerade.m4 \
+	../feature/always_add_domain.m4 \
+	../feature/bitdomain.m4 \
+	../feature/domaintable.m4 \
+	../feature/mailertable.m4 \
+	../feature/nocanonify.m4 \
+	../feature/nodns.m4 \
+	../feature/notsticky.m4 \
+	../feature/nouucp.m4 \
+	../feature/nullclient.m4 \
+	../feature/redirect.m4 \
+	../feature/use_cw_file.m4 \
+	../feature/uucpdomain.m4 \
+	../hack/cssubdomain.m4 \
+	../m4/cf.m4 \
+	../m4/nullrelay.m4 \
+	../m4/proto.m4 \
+	../m4/version.m4 \
+	../mailer/fax.m4 \
+	../mailer/local.m4 \
+	../mailer/smtp.m4 \
+	../mailer/usenet.m4 \
+	../mailer/uucp.m4 \
+	../ostype/bsd4.4.m4 \
+	../siteconfig/uucp.cogsci.m4 \
+	../siteconfig/uucp.old.arpa.m4 \
+	../siteconfig/uucp.ucbarpa.m4 \
+	../siteconfig/uucp.ucbvax.m4 \
+
+$(ALL):  $(M4FILES)
+
+.include <bsd.prog.mk>
diff --git a/usr.sbin/sendmail/cf/cf/boat-anchor.mc b/usr.sbin/sendmail/cf/cf/boat-anchor.mc
new file mode 100644
index 00000000000..37417950d0e
--- /dev/null
+++ b/usr.sbin/sendmail/cf/cf/boat-anchor.mc
@@ -0,0 +1,47 @@
+divert(-1)
+#
+# Copyright (c) 1993 Adam Glass
+# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1988 The Regents of the University of California.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+
+include(`../m4/cf.m4')
+VERSIONID(`@(#)boat-anchor.mc	$Revision: 1.1 $')
+OSTYPE(bsd4.4)dnl
+MAILER(local)dnl
+MAILER(smtp)dnl
+define(`UUCP_RELAY', ucbvax.Berkeley.EDU)dnl
+define(`BITNET_RELAY', mailhost.Berkeley.EDU)dnl
+define(`CSNET_RELAY', mailhost.Berkeley.EDU)dnl
+define(`LOCAL_RELAY', sun-lamp.CS.Berkeley.EDU)
+define(`MAIL_HUB', sun-lamp.CS.Berkeley.EDU)
+define(`confCHECKPOINT_INTERVAL', 4)dnl
diff --git a/usr.sbin/sendmail/cf/cf/chez.mc b/usr.sbin/sendmail/cf/cf/chez.mc
new file mode 100644
index 00000000000..13f951977f0
--- /dev/null
+++ b/usr.sbin/sendmail/cf/cf/chez.mc
@@ -0,0 +1,44 @@
+divert(-1)
+#
+# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1988, 1993
+#	The Regents of the University of California.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+
+include(`../m4/cf.m4')
+VERSIONID(`@(#)chez.mc	8.1 (Berkeley) 6/7/93')
+OSTYPE(bsd4.4)dnl
+DOMAIN(cs.exposed)dnl
+define(`LOCAL_RELAY', vangogh.CS.Berkeley.EDU)dnl
+define(`MASQUERADE_NAME', vangogh.CS.Berkeley.EDU)dnl
+MAILER(local)dnl
+MAILER(smtp)dnl
+Fw/etc/sendmail.cw
diff --git a/usr.sbin/sendmail/cf/cf/chimera.mc b/usr.sbin/sendmail/cf/cf/chimera.mc
new file mode 100644
index 00000000000..6cfef390873
--- /dev/null
+++ b/usr.sbin/sendmail/cf/cf/chimera.mc
@@ -0,0 +1,48 @@
+divert(-1)
+#
+# Copyright (c) 1993, 1994, 1995 Adam Glass
+# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1988 The Regents of the University of California.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+#
+include(`../m4/cf.m4')
+VERSIONID(`@(#)pain.mc	$Revision: 1.1 $')
+OSTYPE(bsd4.4)dnl
+MAILER(local)dnl
+MAILER(smtp)dnl
+define(`MAIL_HUB', mail.netbsd.org)dnl
+define(`SMART_HOST', nobozo.cs.berkeley.edu)dnl
+define(`confCHECKPOINT_INTERVAL', 10)dnl
+define(`confAUTO_REBUILD', True)dnl
+define(`confMESSAGE_TIMEOUT', 3d/4h)dnl
+MASQUERADE_AS(netbsd.org)dnl
+LOCAL_USER(root)
diff --git a/usr.sbin/sendmail/cf/cf/clientproto.mc b/usr.sbin/sendmail/cf/cf/clientproto.mc
new file mode 100644
index 00000000000..902c1eb752e
--- /dev/null
+++ b/usr.sbin/sendmail/cf/cf/clientproto.mc
@@ -0,0 +1,49 @@
+divert(-1)
+#
+# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1988, 1993
+#	The Regents of the University of California.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+
+#
+#  This the prototype for a "null client" -- that is, a client that
+#  does nothing except forward all mail to a mail hub.
+#
+#  To use this, you MUST use the nullclient feature with the name of
+#  the mail hub as its argument.  You MAY also define an OSTYPE to
+#  define the location of the queue directories and the like.
+#  Other than these, it should never contain any other lines.
+#
+
+include(`../m4/cf.m4')
+VERSIONID(`@(#)clientproto.mc	8.2 (Berkeley) 8/21/93')
+
+FEATURE(nullclient, mailhost.$m)
diff --git a/usr.sbin/sendmail/cf/cf/netbsd-proto.mc b/usr.sbin/sendmail/cf/cf/netbsd-proto.mc
new file mode 100644
index 00000000000..8f12fc9b390
--- /dev/null
+++ b/usr.sbin/sendmail/cf/cf/netbsd-proto.mc
@@ -0,0 +1,50 @@
+divert(-1)
+#
+# Copyright (c) 1994 Adam Glass
+# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1988, 1993
+#	The Regents of the University of California.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+
+#
+#  This is the prototype file for a configuration that supports nothing
+#  but basic SMTP connections via TCP.
+#
+#  You may want to add an OSTYPE macro to get the location of various
+#  support files for your operating system environment.
+#
+
+include(`../m4/cf.m4')
+VERSIONID(`@(#)netbsd-proto.mc	$Revision: 1.1 $')
+OSTYPE(bsd4.4)dnl
+MAILER(local)dnl
+MAILER(smtp)dnl
+
diff --git a/usr.sbin/sendmail/cf/cf/pain.mc b/usr.sbin/sendmail/cf/cf/pain.mc
new file mode 100644
index 00000000000..b05ba46d2de
--- /dev/null
+++ b/usr.sbin/sendmail/cf/cf/pain.mc
@@ -0,0 +1,47 @@
+divert(-1)
+#
+# Copyright (c) 1993, 1994, 1995 Adam Glass
+# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1988 The Regents of the University of California.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+
+include(`../m4/cf.m4')
+VERSIONID(`@(#)pain.mc	$Revision: 1.1 $')
+OSTYPE(bsd4.4)dnl
+MAILER(local)dnl
+MAILER(smtp)dnl
+define(`MAIL_HUB', mail.netbsd.org)
+define(`SMART_HOST', mail.netbsd.org)
+define(`confCHECKPOINT_INTERVAL', 10)dnl
+define(`confAUTO_REBUILD', True)dnl
+define(`confMESSAGE_TIMEOUT', 3d/4h)dnl
+Cwftp.netbsd.org
diff --git a/usr.sbin/sendmail/cf/cf/python.mc b/usr.sbin/sendmail/cf/cf/python.mc
new file mode 100644
index 00000000000..ac23e613138
--- /dev/null
+++ b/usr.sbin/sendmail/cf/cf/python.mc
@@ -0,0 +1,52 @@
+divert(-1)
+#
+# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1988, 1993
+#	The Regents of the University of California.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+
+include(`../m4/cf.m4')
+VERSIONID(`@(#)python.mc	8.1 (Berkeley) 6/7/93')
+OSTYPE(bsd4.4)dnl
+DOMAIN(cs.exposed)dnl
+define(`LOCAL_RELAY', vangogh.CS.Berkeley.EDU)dnl
+define(`MASQUERADE_NAME', vangogh.CS.Berkeley.EDU)dnl
+MAILER(local)dnl
+MAILER(smtp)dnl
+
+# accept mail sent to the domain head
+DDBostic.COM
+
+LOCAL_RULE_0
+# accept mail sent to the domain head
+R< @ $D . > : $*		$@ $>7 $1		@here:... -> ...
+R$* $=O $* < @ $D . >		$@ $>7 $1 $2 $3		...@here -> ...
+R$* < @ $D . >			$#local $: $1		user@here -> user
diff --git a/usr.sbin/sendmail/cf/cf/sun-lamp.mc b/usr.sbin/sendmail/cf/cf/sun-lamp.mc
new file mode 100644
index 00000000000..29f0195edf6
--- /dev/null
+++ b/usr.sbin/sendmail/cf/cf/sun-lamp.mc
@@ -0,0 +1,52 @@
+divert(-1)
+#
+# Copyright (c) 1993, 1994 Adam Glass
+# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1988 The Regents of the University of California.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+
+include(`../m4/cf.m4')
+VERSIONID(`@(#)sun-lamp.mc	$Revision: 1.1 $')
+OSTYPE(bsd4.4)dnl
+MASQUERADE_AS(NetBSD.ORG)dnl
+MAILER(local)dnl
+MAILER(smtp)dnl
+define(`UUCP_RELAY', mailhost.Berkeley.EDU)dnl
+define(`BITNET_RELAY', mailhost.Berkeley.EDU)dnl
+define(`CSNET_RELAY', mailhost.Berkeley.EDU)dnl
+define(`confCHECKPOINT_INTERVAL', 10)dnl
+define(`confAUTO_REBUILD', True)dnl
+define(`confMESSAGE_TIMEOUT', 3d/4h)dnl
+Cw lamp.CS.Berkeley.EDU
+Cw mail.NetBSD.ORG
+Cw ftp.NetBSD.ORG
+Cw NetBSD.ORG
diff --git a/usr.sbin/sendmail/cf/cf/tcpproto.mc b/usr.sbin/sendmail/cf/cf/tcpproto.mc
new file mode 100644
index 00000000000..aa31ca152dc
--- /dev/null
+++ b/usr.sbin/sendmail/cf/cf/tcpproto.mc
@@ -0,0 +1,50 @@
+divert(-1)
+#
+# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1988, 1993
+#	The Regents of the University of California.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+
+#
+#  This is the prototype file for a configuration that supports nothing
+#  but basic SMTP connections via TCP.
+#
+#  You may want to add an OSTYPE macro to get the location of various
+#  support files for your operating system environment.
+#
+
+include(`../m4/cf.m4')
+VERSIONID(`@(#)tcpproto.mc	8.2 (Berkeley) 8/21/93')
+
+FEATURE(nouucp)
+
+MAILER(local)
+MAILER(smtp)
diff --git a/usr.sbin/sendmail/cf/cf/trinity.mc b/usr.sbin/sendmail/cf/cf/trinity.mc
new file mode 100644
index 00000000000..1ea8681e9ea
--- /dev/null
+++ b/usr.sbin/sendmail/cf/cf/trinity.mc
@@ -0,0 +1,45 @@
+divert(-1)
+#
+# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1988 The Regents of the University of California.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+
+include(`../m4/cf.m4')
+VERSIONID(`$Id: trinity.mc,v 1.1 1995/10/18 08:48:10 deraadt Exp $')
+OSTYPE(bsd4.4)dnl
+define(`UUCP_RELAY', life.ai.mit.edu)dnl
+define(`BITNET_RELAY', mitvma.mit.edu)dnl
+define(`LOCAL_RELAY', albert.gnu.ai.mit.edu)dnl
+MAILER(local)dnl
+MAILER(smtp)dnl
+define(`confCHECKPOINT_INTERVAL', 4)dnl
+define(`confAUTO_REBUILD', True)dnl
diff --git a/usr.sbin/sendmail/cf/cf/ucbarpa.mc b/usr.sbin/sendmail/cf/cf/ucbarpa.mc
new file mode 100644
index 00000000000..21f35fdaced
--- /dev/null
+++ b/usr.sbin/sendmail/cf/cf/ucbarpa.mc
@@ -0,0 +1,43 @@
+divert(-1)
+#
+# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1988, 1993
+#	The Regents of the University of California.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+
+include(`../m4/cf.m4')
+VERSIONID(`@(#)ucbarpa.mc	8.1 (Berkeley) 6/7/93')
+DOMAIN(cs.exposed)dnl
+OSTYPE(bsd4.4)dnl
+MAILER(local)dnl
+MAILER(smtp)dnl
+MAILER(uucp)dnl
+SITECONFIG(uucp.ucbarpa, ucbarpa, U)
diff --git a/usr.sbin/sendmail/cf/cf/ucbvax.mc b/usr.sbin/sendmail/cf/cf/ucbvax.mc
new file mode 100644
index 00000000000..249368febaa
--- /dev/null
+++ b/usr.sbin/sendmail/cf/cf/ucbvax.mc
@@ -0,0 +1,101 @@
+divert(-1)
+#
+# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1988, 1993
+#	The Regents of the University of California.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+
+include(`../m4/cf.m4')
+VERSIONID(`@(#)ucbvax.mc	8.1 (Berkeley) 6/7/93')
+OSTYPE(bsd4.4)
+DOMAIN(cs.hidden)
+FEATURE(notsticky)
+MAILER(local)
+MAILER(smtp)
+MAILER(uucp)
+undefine(`UUCP_RELAY')dnl
+DDBerkeley.EDU
+
+# names for which we act as a local forwarding agent
+CF CS
+FF/etc/sendmail.cw
+
+# local UUCP connections, and our local uucp name
+SITECONFIG(uucp.ucbvax, ucbvax, U)
+
+# remote UUCP connections, and the machine they are on
+SITECONFIG(uucp.ucbarpa, ucbarpa.Berkeley.EDU, W)
+
+SITECONFIG(uucp.cogsci, cogsci.Berkeley.EDU, X)
+
+LOCAL_RULE_3
+# map old UUCP names into Internet names
+UUCPSMTP(bellcore,	bellcore.com)
+UUCPSMTP(decvax,	decvax.dec.com)
+UUCPSMTP(decwrl,	decwrl.dec.com)
+UUCPSMTP(hplabs,	hplabs.hp.com)
+UUCPSMTP(lbl-csam,	lbl-csam.arpa)
+UUCPSMTP(pur-ee,	ecn.purdue.edu)
+UUCPSMTP(purdue,	purdue.edu)
+UUCPSMTP(research,	research.att.com)
+UUCPSMTP(sdcarl,	sdcarl.ucsd.edu)
+UUCPSMTP(sdcsvax,	sdcsvax.ucsd.edu)
+UUCPSMTP(ssyx,		ssyx.ucsc.edu)
+UUCPSMTP(sun,		sun.com)
+UUCPSMTP(ucdavis,	ucdavis.ucdavis.edu)
+UUCPSMTP(ucivax,	ics.uci.edu)
+UUCPSMTP(ucla-cs,	cs.ucla.edu)
+UUCPSMTP(ucla-se,	seas.ucla.edu)
+UUCPSMTP(ucsbcsl,	ucsbcsl.ucsb.edu)
+UUCPSMTP(ucscc,		c.ucsc.edu)
+UUCPSMTP(ucsd,		ucsd.edu)
+UUCPSMTP(ucsfcgl,	cgl.ucsf.edu)
+UUCPSMTP(unmvax,	unmvax.cs.unm.edu)
+UUCPSMTP(uwvax,		spool.cs.wisc.edu)
+
+LOCAL_RULE_0
+
+# make sure we handle the local domain as absolute
+R$* <  @ $* $D > $*		$: $1 < @ $2 $D . > $3
+
+# handle names we forward for as though they were local, so we will use UDB
+R< @ $=F . $D . > : $*		$@ $>7 $2		@here:... -> ...
+R< @ $D . > : $*		$@ $>7 $1		@here:... -> ...
+R$* $=O $* < @ $=F . $D . >	$@ $>7 $1 $2 $3		...@here -> ...
+R$* $=O $* < @ $D . >		$@ $>7 $1 $2 $3		...@here -> ...
+
+R$* < @ $=F . $D . >		$#local $: $1		use UDB
+
+# handle local UUCP connections in the Berkeley.EDU domain
+R$+<@cnmat.$D . >		$#uucp$@cnmat$:$1
+R$+<@cnmat.CS.$D . >		$#uucp$@cnmat$:$1
+R$+<@craig.$D . >		$#uucp$@craig$:$1
+R$+<@craig.CS.$D . >		$#uucp$@craig$:$1
diff --git a/usr.sbin/sendmail/cf/cf/uucpproto.mc b/usr.sbin/sendmail/cf/cf/uucpproto.mc
new file mode 100644
index 00000000000..c460d76b3cd
--- /dev/null
+++ b/usr.sbin/sendmail/cf/cf/uucpproto.mc
@@ -0,0 +1,49 @@
+divert(-1)
+#
+# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1988, 1993
+#	The Regents of the University of California.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+
+#
+#  This is the prototype for a configuration that only supports UUCP.
+#
+#  You may want to add an OSTYPE macro to get the location of various
+#  support files for your operating system environment.
+#
+
+include(`../m4/cf.m4')
+VERSIONID(`@(#)uucpproto.mc	8.3 (Berkeley) 8/21/93')
+
+FEATURE(nodns)dnl
+
+MAILER(local)dnl
+MAILER(uucp)dnl
diff --git a/usr.sbin/sendmail/cf/cf/vangogh.mc b/usr.sbin/sendmail/cf/cf/vangogh.mc
new file mode 100644
index 00000000000..2406364c5a8
--- /dev/null
+++ b/usr.sbin/sendmail/cf/cf/vangogh.mc
@@ -0,0 +1,44 @@
+divert(-1)
+#
+# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1988, 1993
+#	The Regents of the University of California.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+
+include(`../m4/cf.m4')
+VERSIONID(`@(#)vangogh.mc	8.2 (Berkeley) 1/26/94')
+DOMAIN(cs.exposed)dnl
+OSTYPE(bsd4.4)dnl
+MAILER(local)dnl
+MAILER(smtp)dnl
+define(`MCI_CACHE_SIZE', 5)
+Cw okeeffe.CS.Berkeley.EDU
+Cw python.CS.Berkeley.EDU
diff --git a/usr.sbin/sendmail/cf/domain/Berkeley.m4 b/usr.sbin/sendmail/cf/domain/Berkeley.m4
new file mode 100644
index 00000000000..4f572d6436a
--- /dev/null
+++ b/usr.sbin/sendmail/cf/domain/Berkeley.m4
@@ -0,0 +1,42 @@
+divert(-1)
+#
+# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1988, 1993
+#	The Regents of the University of California.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+divert(0)
+VERSIONID(`@(#)Berkeley.m4	8.5 (Berkeley) 2/18/94')
+define(`UUCP_RELAY', `ucbvax.Berkeley.EDU')dnl
+define(`BITNET_RELAY', `CMSA.Berkeley.EDU')dnl
+define(`confFORWARD_PATH', `$z/.forward.$w:$z/.forward')dnl
+define(`confCW_FILE', `-o /etc/sendmail.cw')dnl
+FEATURE(redirect)dnl
+FEATURE(use_cw_file)dnl
diff --git a/usr.sbin/sendmail/cf/domain/cs.exposed.m4 b/usr.sbin/sendmail/cf/domain/cs.exposed.m4
new file mode 100644
index 00000000000..43c07becdb8
--- /dev/null
+++ b/usr.sbin/sendmail/cf/domain/cs.exposed.m4
@@ -0,0 +1,40 @@
+divert(-1)
+#
+# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1988, 1993
+#	The Regents of the University of California.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+divert(0)
+VERSIONID(`@(#)cs.exposed.m4	8.1 (Berkeley) 6/7/93')
+DOMAIN(Berkeley)dnl
+HACK(cssubdomain)dnl
+define(`confUSERDB_SPEC',
+	`/usr/sww/share/lib/users.cs.db,/usr/sww/share/lib/users.eecs.db')dnl
diff --git a/usr.sbin/sendmail/cf/domain/cs.hidden.m4 b/usr.sbin/sendmail/cf/domain/cs.hidden.m4
new file mode 100644
index 00000000000..3d9721af7a6
--- /dev/null
+++ b/usr.sbin/sendmail/cf/domain/cs.hidden.m4
@@ -0,0 +1,38 @@
+divert(-1)
+#
+# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1988, 1993
+#	The Regents of the University of California.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+divert(0)
+VERSIONID(`@(#)cs.hidden.m4	8.1 (Berkeley) 6/7/93')
+DOMAIN(cs.exposed)dnl
+MASQUERADE_AS(CS.Berkeley.EDU)dnl
diff --git a/usr.sbin/sendmail/cf/domain/eecs.hidden.m4 b/usr.sbin/sendmail/cf/domain/eecs.hidden.m4
new file mode 100644
index 00000000000..bbdc01afb1a
--- /dev/null
+++ b/usr.sbin/sendmail/cf/domain/eecs.hidden.m4
@@ -0,0 +1,38 @@
+divert(-1)
+#
+# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1988, 1993
+#	The Regents of the University of California.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+divert(0)
+VERSIONID(`@(#)eecs.hidden.m4	8.1 (Berkeley) 6/7/93')
+DOMAIN(Berkeley)dnl
+MASQUERADE_AS(EECS.Berkeley.EDU)dnl
diff --git a/usr.sbin/sendmail/cf/domain/s2k.m4 b/usr.sbin/sendmail/cf/domain/s2k.m4
new file mode 100644
index 00000000000..25b931f5111
--- /dev/null
+++ b/usr.sbin/sendmail/cf/domain/s2k.m4
@@ -0,0 +1,38 @@
+divert(-1)
+#
+# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1988, 1993
+#	The Regents of the University of California.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+divert(0)
+VERSIONID(`@(#)s2k.m4	8.1 (Berkeley) 6/7/93')
+DOMAIN(cs.exposed)dnl
+MASQUERADE_AS(postgres.Berkeley.EDU)dnl
diff --git a/usr.sbin/sendmail/cf/feature/allmasquerade.m4 b/usr.sbin/sendmail/cf/feature/allmasquerade.m4
new file mode 100644
index 00000000000..c7cbffa78ea
--- /dev/null
+++ b/usr.sbin/sendmail/cf/feature/allmasquerade.m4
@@ -0,0 +1,41 @@
+divert(-1)
+#
+# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1988, 1993
+#	The Regents of the University of California.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+
+divert(0)
+VERSIONID(`@(#)allmasquerade.m4	8.2 (Berkeley) 1/22/94')
+divert(-1)
+
+
+define(`_ALL_MASQUERADE_', 1)
diff --git a/usr.sbin/sendmail/cf/feature/always_add_domain.m4 b/usr.sbin/sendmail/cf/feature/always_add_domain.m4
new file mode 100644
index 00000000000..dd572c8130d
--- /dev/null
+++ b/usr.sbin/sendmail/cf/feature/always_add_domain.m4
@@ -0,0 +1,40 @@
+divert(-1)
+#
+# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1988, 1993
+#	The Regents of the University of California.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+
+divert(0)
+VERSIONID(`@(#)always_add_domain.m4	8.1 (Berkeley) 6/7/93')
+divert(-1)
+
+define(`_ALWAYS_ADD_DOMAIN_', 1)
diff --git a/usr.sbin/sendmail/cf/feature/bitdomain.m4 b/usr.sbin/sendmail/cf/feature/bitdomain.m4
new file mode 100644
index 00000000000..85c8cf0017f
--- /dev/null
+++ b/usr.sbin/sendmail/cf/feature/bitdomain.m4
@@ -0,0 +1,49 @@
+divert(-1)
+#
+# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1988, 1993
+#	The Regents of the University of California.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+
+divert(0)
+VERSIONID(`@(#)bitdomain.m4	8.6 (Berkeley) 2/19/94')
+divert(-1)
+
+
+PUSHDIVERT(6)
+Kbitdomain ifelse(_ARG_, `', `hash -o /etc/bitdomain', `_ARG_')
+POPDIVERT
+
+
+PUSHDIVERT(2)
+# handle BITNET mapping
+R$* < @ $+ .BITNET > $*		$: $1 < @ $(bitdomain $2 $: $2.BITNET $) > $3
+POPDIVERT
diff --git a/usr.sbin/sendmail/cf/feature/domaintable.m4 b/usr.sbin/sendmail/cf/feature/domaintable.m4
new file mode 100644
index 00000000000..bfad1bcecc4
--- /dev/null
+++ b/usr.sbin/sendmail/cf/feature/domaintable.m4
@@ -0,0 +1,40 @@
+divert(-1)
+#
+# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1988, 1993
+#	The Regents of the University of California.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+
+divert(0)
+VERSIONID(`@(#)domaintable.m4	8.2 (Berkeley) 8/9/93')
+divert(-1)
+
+define(`DOMAIN_TABLE', ifelse(_ARG_, `', `hash -o /etc/domaintable', `_ARG_'))dnl
diff --git a/usr.sbin/sendmail/cf/feature/mailertable.m4 b/usr.sbin/sendmail/cf/feature/mailertable.m4
new file mode 100644
index 00000000000..fa399973bf7
--- /dev/null
+++ b/usr.sbin/sendmail/cf/feature/mailertable.m4
@@ -0,0 +1,40 @@
+divert(-1)
+#
+# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1988, 1993
+#	The Regents of the University of California.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+
+divert(0)
+VERSIONID(`@(#)mailertable.m4	8.3 (Berkeley) 8/7/93')
+divert(-1)
+
+define(`MAILER_TABLE', ifelse(_ARG_, `', `hash -o /etc/mailertable', `_ARG_'))dnl
diff --git a/usr.sbin/sendmail/cf/feature/nocanonify.m4 b/usr.sbin/sendmail/cf/feature/nocanonify.m4
new file mode 100644
index 00000000000..0157e6b9e48
--- /dev/null
+++ b/usr.sbin/sendmail/cf/feature/nocanonify.m4
@@ -0,0 +1,40 @@
+divert(-1)
+#
+# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1988, 1993
+#	The Regents of the University of California.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+
+divert(0)
+VERSIONID(`@(#)nocanonify.m4	8.1 (Berkeley) 6/7/93')
+divert(-1)
+
+define(`_NO_CANONIFY_', 1)
diff --git a/usr.sbin/sendmail/cf/feature/nodns.m4 b/usr.sbin/sendmail/cf/feature/nodns.m4
new file mode 100644
index 00000000000..465a5ae4653
--- /dev/null
+++ b/usr.sbin/sendmail/cf/feature/nodns.m4
@@ -0,0 +1,40 @@
+divert(-1)
+#
+# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1988, 1993
+#	The Regents of the University of California.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+
+divert(0)
+VERSIONID(`@(#)nodns.m4	8.1 (Berkeley) 8/6/93')
+divert(-1)
+
+undefine(`confBIND_OPTS')dnl
diff --git a/usr.sbin/sendmail/cf/feature/notsticky.m4 b/usr.sbin/sendmail/cf/feature/notsticky.m4
new file mode 100644
index 00000000000..51189236717
--- /dev/null
+++ b/usr.sbin/sendmail/cf/feature/notsticky.m4
@@ -0,0 +1,40 @@
+divert(-1)
+#
+# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1988, 1993
+#	The Regents of the University of California.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+
+divert(0)
+VERSIONID(`@(#)notsticky.m4	8.1 (Berkeley) 6/7/93')
+divert(-1)
+
+define(`_LOCAL_NOT_STICKY_', 1)
diff --git a/usr.sbin/sendmail/cf/feature/nouucp.m4 b/usr.sbin/sendmail/cf/feature/nouucp.m4
new file mode 100644
index 00000000000..8723437b3c7
--- /dev/null
+++ b/usr.sbin/sendmail/cf/feature/nouucp.m4
@@ -0,0 +1,40 @@
+divert(-1)
+#
+# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1988, 1993
+#	The Regents of the University of California.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+
+divert(0)
+VERSIONID(`@(#)nouucp.m4	8.1 (Berkeley) 6/7/93')
+divert(-1)
+
+define(`_NO_UUCP_', 1)
diff --git a/usr.sbin/sendmail/cf/feature/nullclient.m4 b/usr.sbin/sendmail/cf/feature/nullclient.m4
new file mode 100644
index 00000000000..930f265c4b8
--- /dev/null
+++ b/usr.sbin/sendmail/cf/feature/nullclient.m4
@@ -0,0 +1,61 @@
+PUSHDIVERT(-1)
+#
+# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1988, 1993
+#	The Regents of the University of California.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+ifdef(`SMTP_MAILER_FLAGS',,
+	`define(`SMTP_MAILER_FLAGS',
+		`ifdef(`_OLD_SENDMAIL_', `L', `')')')
+define(_NULL_CLIENT_ONLY_, `1')
+ifelse(_ARG_, `', `errprint(`Feature "nullclient" requires argument')',
+	`define(`MAIL_HUB', _ARG_)')
+POPDIVERT
+
+#
+#  This is used only for relaying mail from a client to a hub when
+#  that client does absolutely nothing else -- i.e., it is a "null
+#  mailer".  In this sense, it acts like the "R" option in Sun
+#  sendmail.
+#
+
+VERSIONID(`@(#)nullclient.m4	8.2 (Berkeley) 8/21/93')
+
+PUSHDIVERT(7)
+############################################
+###   Null Client Mailer specification   ###
+############################################
+
+ifdef(`confRELAY_MAILER',,
+	`define(`confRELAY_MAILER', `nullclient')')dnl
+
+Mnullclient,	P=[IPC], F=CONCAT(mDFMuXa, SMTP_MAILER_FLAGS), A=IPC $h
+POPDIVERT
diff --git a/usr.sbin/sendmail/cf/feature/redirect.m4 b/usr.sbin/sendmail/cf/feature/redirect.m4
new file mode 100644
index 00000000000..0f2199c9755
--- /dev/null
+++ b/usr.sbin/sendmail/cf/feature/redirect.m4
@@ -0,0 +1,48 @@
+divert(-1)
+#
+# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1988, 1993
+#	The Regents of the University of California.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+
+divert(0)
+VERSIONID(`@(#)redirect.m4	8.2 (Berkeley) 12/27/93')
+divert(-1)
+
+
+PUSHDIVERT(3)
+# addresses sent to foo@host.REDIRECT will give a 551 error code
+R$* < @ $+ .REDIRECT. >	$# error $@ NOUSER $: "551 User not local; please try " <$1@$2>
+POPDIVERT
+
+PUSHDIVERT(6)
+CPREDIRECT
+POPDIVERT
diff --git a/usr.sbin/sendmail/cf/feature/use_cw_file.m4 b/usr.sbin/sendmail/cf/feature/use_cw_file.m4
new file mode 100644
index 00000000000..33b5ad56ed0
--- /dev/null
+++ b/usr.sbin/sendmail/cf/feature/use_cw_file.m4
@@ -0,0 +1,46 @@
+divert(-1)
+#
+# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1988, 1993
+#	The Regents of the University of California.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+
+divert(0)
+VERSIONID(`@(#)use_cw_file.m4	8.1 (Berkeley) 6/7/93')
+divert(-1)
+
+# if defined, the sendmail.cf will read the /etc/sendmail.cw file
+# to find alternate names for this host.  Typically only used when
+# several hosts have been squashed into one another at high speed.
+
+define(`USE_CW_FILE', `')
+
+divert(0)
diff --git a/usr.sbin/sendmail/cf/feature/uucpdomain.m4 b/usr.sbin/sendmail/cf/feature/uucpdomain.m4
new file mode 100644
index 00000000000..77cc97bbe4a
--- /dev/null
+++ b/usr.sbin/sendmail/cf/feature/uucpdomain.m4
@@ -0,0 +1,49 @@
+divert(-1)
+#
+# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1988, 1993
+#	The Regents of the University of California.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+
+divert(0)
+VERSIONID(`@(#)uucpdomain.m4	8.6 (Berkeley) 2/19/94')
+divert(-1)
+
+
+PUSHDIVERT(6)
+Kuudomain ifelse(_ARG_, `', `hash -o /etc/uudomain', `_ARG_')
+POPDIVERT
+
+
+PUSHDIVERT(2)
+# handle UUCP mapping
+R$* < @ $+ .UUCP > $*		$: $1 < @ $(uudomain $2 $: $2.UUCP $) > $3
+POPDIVERT
diff --git a/usr.sbin/sendmail/cf/hack/cssubdomain.m4 b/usr.sbin/sendmail/cf/hack/cssubdomain.m4
new file mode 100644
index 00000000000..4f270c05f06
--- /dev/null
+++ b/usr.sbin/sendmail/cf/hack/cssubdomain.m4
@@ -0,0 +1,44 @@
+divert(-1)
+#
+# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1988, 1993
+#	The Regents of the University of California.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+divert(0)
+VERSIONID(`@(#)cssubdomain.m4	8.1 (Berkeley) 6/7/93')
+
+divert(2)
+# find possible (old & new) versions of our name via short circuit hack
+# (this code should exist ONLY during the transition from .Berkeley.EDU
+#  names to .CS.Berkeley.EDU names -- probably not more than a few months)
+R$* < @ $=w .CS.Berkeley.EDU > $*	$: $1 < @ $j > $3
+R$* < @ $=w .Berkeley.EDU> $*		$: $1 < @ $j > $3
+divert(0)
diff --git a/usr.sbin/sendmail/cf/m4/cf.m4 b/usr.sbin/sendmail/cf/m4/cf.m4
new file mode 100644
index 00000000000..528cbfffef9
--- /dev/null
+++ b/usr.sbin/sendmail/cf/m4/cf.m4
@@ -0,0 +1,149 @@
+divert(0)dnl
+#
+# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1988, 1993
+#	The Regents of the University of California.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+
+
+######################################################################
+######################################################################
+#####
+#####		SENDMAIL CONFIGURATION FILE
+#####
+define(`TEMPFILE', maketemp(/tmp/cfXXXXXX))dnl
+syscmd(sh ../sh/makeinfo.sh > TEMPFILE)dnl
+include(TEMPFILE)dnl
+syscmd(rm -f TEMPFILE)dnl
+#####
+######################################################################
+######################################################################
+
+divert(-1)
+
+changecom(
)
+undefine(`format')
+undefine(`hpux')
+ifdef(`pushdef', `',
+	`errprint(`You need a newer version of M4, at least as new as
+System V or GNU')
+	include(NoSuchFile)')
+define(`PUSHDIVERT', `pushdef(`__D__', divnum)divert($1)')
+define(`POPDIVERT', `divert(__D__)popdef(`__D__')')
+define(`OSTYPE', `PUSHDIVERT(-1)define(`_ARG_', $2)include(../ostype/$1.m4)POPDIVERT`'')
+define(`MAILER',
+`ifdef(`_MAILER_$1_', `dnl`'',
+`define(`_MAILER_$1_', `')PUSHDIVERT(7)include(../mailer/$1.m4)POPDIVERT`'')')
+define(`DOMAIN', `PUSHDIVERT(-1)define(`_ARG_', $2)include(../domain/$1.m4)POPDIVERT`'')
+define(`FEATURE', `PUSHDIVERT(-1)define(`_ARG_', $2)include(../feature/$1.m4)POPDIVERT`'')
+define(`HACK', `PUSHDIVERT(-1)define(`_ARG_', $2)include(../hack/$1.m4)POPDIVERT`'')
+define(`OLDSENDMAIL', `define(`_OLD_SENDMAIL_', `')')
+define(`VERSIONID', ``#####  $1  #####'')
+define(`LOCAL_RULE_0', `divert(3)')
+define(`LOCAL_RULE_1',
+`divert(9)dnl
+#######################################
+###  Ruleset 1 -- Sender Rewriting  ###
+#######################################
+
+S1
+')
+define(`LOCAL_RULE_2',
+`divert(9)dnl
+##########################################
+###  Ruleset 2 -- Recipient Rewriting  ###
+##########################################
+
+S2
+')
+define(`LOCAL_RULE_3', `divert(2)')
+define(`LOCAL_CONFIG', `divert(6)')
+define(`LOCAL_NET_CONFIG', `define(`_LOCAL_RULES_', 1)divert(1)')
+define(`UUCPSMTP', `R DOL(*) < @ $1 .UUCP > DOL(*)	DOL(1) < @ $2 > DOL(2)')
+define(`CONCAT', `$1$2$3$4$5$6$7')
+define(`DOL', ``$'$1')
+define(`SITECONFIG',
+`CONCAT(D, $3, $2)
+define(`_CLASS_$3_', `')dnl
+ifelse($3, U, Cw$2 $2.UUCP, `dnl')
+define(`SITE', `ifelse(CONCAT($'2`, $3), SU,
+		CONCAT(CY, $'1`),
+		CONCAT(C, $3, $'1`))')
+sinclude(../siteconfig/$1.m4)')
+define(`EXPOSED_USER', `PUSHDIVERT(5)CE$1
+POPDIVERT`'dnl')
+define(`LOCAL_USER', `PUSHDIVERT(5)CL$1
+POPDIVERT`'dnl')
+define(`MASQUERADE_AS', `define(`MASQUERADE_NAME', $1)')
+
+m4wrap(`include(`../m4/proto.m4')')
+
+# set up default values for options
+define(`confMAILER_NAME', ``MAILER-DAEMON'')
+define(`confFROM_LINE', `From $g  $d')
+define(`confOPERATORS', `.:%@!^/[]')
+define(`confSMTP_LOGIN_MSG', `$j Sendmail $v/$Z ready at $b')
+define(`confSEVEN_BIT_INPUT', `False')
+define(`confALIAS_WAIT', `10')
+define(`confMIN_FREE_BLOCKS', `4')
+define(`confBLANK_SUB', `.')
+define(`confCON_EXPENSIVE', `False')
+define(`confCHECKPOINT_INTERVAL', `10')
+define(`confDELIVERY_MODE', `background')
+define(`confAUTO_REBUILD', `False')
+define(`confSAVE_FROM_LINES', `False')
+define(`confTEMP_FILE_MODE', `0600')
+define(`confMATCH_GECOS', `False')
+define(`confDEF_GROUP_ID', `1')
+define(`confMAX_HOP', `17')
+define(`confIGNORE_DOTS', `False')
+define(`confBIND_OPTS', `')
+define(`confMCI_CACHE_SIZE', `2')
+define(`confMCI_CACHE_TIMEOUT', `5m')
+define(`confUSE_ERRORS_TO', `False')
+define(`confLOG_LEVEL', `9')
+define(`confME_TOO', `False')
+define(`confCHECK_ALIASES', `True')
+define(`confOLD_STYLE_HEADERS', `True')
+define(`confPRIVACY_FLAGS', `authwarnings')
+define(`confSAFE_QUEUE', `True')
+define(`confMESSAGE_TIMEOUT', `5d/4h')
+define(`confTIME_ZONE', `USE_SYSTEM')
+define(`confDEF_USER_ID', `1')
+define(`confQUEUE_LA', `8')
+define(`confREFUSE_LA', `12')
+define(`confSEPARATE_PROC', `False')
+define(`confCW_FILE', `/etc/sendmail.cw')
+define(`confMIME_FORMAT_ERRORS', `True')
+define(`confTRY_NULL_MX_LIST', `False')
+
+divert(0)dnl
+VERSIONID(`@(#)cf.m4	8.4 (Berkeley) 12/24/93')
diff --git a/usr.sbin/sendmail/cf/m4/nullrelay.m4 b/usr.sbin/sendmail/cf/m4/nullrelay.m4
new file mode 100644
index 00000000000..c79d1797f47
--- /dev/null
+++ b/usr.sbin/sendmail/cf/m4/nullrelay.m4
@@ -0,0 +1,302 @@
+divert(-1)
+#
+# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1988, 1993
+#	The Regents of the University of California.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+divert(0)
+
+VERSIONID(`@(#)nullrelay.m4	8.5 (Berkeley) 2/1/94')
+
+#
+#  This configuration applies only to relay-only hosts.  They send
+#  all mail to a hub without consideration of the address syntax
+#  or semantics, except for adding the hub qualification to the
+#  addresses.
+#
+#	This is based on a prototype done by Bryan Costales of ICSI.
+#
+
+# hub host (to which all mail is sent)
+DH`'ifdef(`MAIL_HUB', MAIL_HUB,
+	`errprint(`MAIL_HUB not defined for nullclient feature')')
+
+# name from which everyone will appear to come
+DM`'ifdef(`MASQUERADE_NAME', MASQUERADE_NAME, MAIL_HUB)
+
+# route-addr separators
+C: : ,
+
+undivert(6)dnl
+
+######################
+#   Special macros   #
+######################
+
+# SMTP initial login message
+De`'confSMTP_LOGIN_MSG
+
+# UNIX initial From header format
+Dl`'confFROM_LINE
+
+# my name for error messages
+Dn`'confMAILER_NAME
+
+# delimiter (operator) characters
+Do`'confOPERATORS
+
+# format of a total name
+Dq<$g>
+include(`../m4/version.m4')
+
+###############
+#   Options   #
+###############
+
+# strip message body to 7 bits on input?
+O7`'confSEVEN_BIT_INPUT
+
+# no aliases here
+
+# substitution for space (blank) characters
+OB`'confBLANK_SUB
+
+# default delivery mode
+Od`'confDELIVERY_MODE
+
+# error message header/file
+ifdef(`confERROR_MESSAGE',
+	OE`'confERROR_MESSAGE,
+	#OE/etc/sendmail.oE)
+
+# error mode
+ifdef(`confERROR_MODE',
+	Oe`'confERROR_MODE,
+	#Oep)
+
+# save Unix-style "From_" lines at top of header?
+Of`'confSAVE_FROM_LINES
+
+# temporary file mode
+OF`'confTEMP_FILE_MODE
+
+# default GID
+Og`'confDEF_GROUP_ID
+
+# maximum hop count
+Oh`'confMAX_HOP
+
+# location of help file
+OH`'ifdef(`HELP_FILE', HELP_FILE, /usr/lib/sendmail.hf)
+
+# ignore dots as terminators in incoming messages?
+Oi`'confIGNORE_DOTS
+
+# Insist that the BIND name server be running to resolve names
+ifdef(`confBIND_OPTS',
+	OI`'confBIND_OPTS,
+	#OI)
+
+# deliver MIME-encapsulated error messages?
+Oj`'confMIME_FORMAT_ERRORS
+
+# open connection cache size
+Ok`'confMCI_CACHE_SIZE
+
+# open connection cache timeout
+OK`'confMCI_CACHE_TIMEOUT
+
+# use Errors-To: header?
+Ol`'confUSE_ERRORS_TO
+
+# log level
+OL`'confLOG_LEVEL
+
+# send to me too, even in an alias expansion?
+Om`'confME_TOO
+
+# default messages to old style headers if no special punctuation?
+Oo`'confOLD_STYLE_HEADERS
+
+# SMTP daemon options
+ifdef(`confDAEMON_OPTIONS',
+	OO`'confDAEMON_OPTIONS,
+	#OOPort=esmtp)
+
+# privacy flags
+Op`'confPRIVACY_FLAGS
+
+# who (if anyone) should get extra copies of error messages
+ifdef(`confCOPY_ERRORS_TO',
+	OP`'confCOPY_ERRORS_TO,
+	#OPPostmaster)
+
+# slope of queue-only function
+ifdef(`confQUEUE_FACTOR',
+	Oq`'confQUEUE_FACTOR,
+	#Oq600000)
+
+# queue directory
+OQ`'ifdef(`QUEUE_DIR', QUEUE_DIR, /var/spool/mqueue)
+
+# read timeout -- now OK per RFC 1123 section 5.3.2
+ifdef(`confREAD_TIMEOUT',
+	Or`'confREAD_TIMEOUT,
+	#Ordatablock=10m)
+
+# queue up everything before forking?
+Os`'confSAFE_QUEUE
+
+# status file
+OS`'ifdef(`STATUS_FILE', STATUS_FILE, /etc/sendmail.st)
+
+# default message timeout interval
+OT`'confMESSAGE_TIMEOUT
+
+# time zone handling:
+#  if undefined, use system default
+#  if defined but null, use TZ envariable passed in
+#  if defined and non-null, use that info
+ifelse(confTIME_ZONE, `USE_SYSTEM', `#Ot',
+	confTIME_ZONE, `USE_TZ', `Ot',
+	`Ot`'confTIME_ZONE')
+
+# default UID
+Ou`'confDEF_USER_ID
+
+# deliver each queued job in a separate process?
+OY`'confSEPARATE_PROC
+
+# work class factor
+ifdef(`confWORK_CLASS_FACTOR',
+	Oz`'confWORK_CLASS_FACTOR,
+	#Oz1800)
+
+# work time factor
+ifdef(`confWORK_TIME_FACTOR',
+	OZ`'confWORK_TIME_FACTOR,
+	#OZ90000)
+
+###########################
+#   Message precedences   #
+###########################
+
+Pfirst-class=0
+Pspecial-delivery=100
+Plist=-30
+Pbulk=-60
+Pjunk=-100
+
+#####################
+#   Trusted users   #
+#####################
+
+Troot
+Tdaemon
+Tuucp
+
+#########################
+#   Format of headers   #
+#########################
+
+H?P?Return-Path: $g
+HReceived: $?sfrom $s $.$?_($_) $.by $j ($v/$Z)$?r with $r$. id $i$?u for $u$.; $b
+H?D?Resent-Date: $a
+H?D?Date: $a
+H?F?Resent-From: $q
+H?F?From: $q
+H?x?Full-Name: $x
+HSubject:
+# HPosted-Date: $a
+# H?l?Received-Date: $b
+H?M?Resent-Message-Id: <$t.$i@$j>
+H?M?Message-Id: <$t.$i@$j>
+#
+######################################################################
+######################################################################
+#####
+#####			REWRITING RULES
+#####
+######################################################################
+######################################################################
+
+###########################################
+###  Rulset 3 -- Name Canonicalization  ###
+###########################################
+S3
+
+# handle null input and list syntax (translate to <@> special case)
+R$@			$@ <@>
+R$*:;$*			$@ $1 :; <@>
+
+# basic textual canonicalization -- note RFC733 heuristic here
+R$*<$*>$*<$*>$*		$2$3<$4>$5			strip multiple <> <>
+R$*<$*<$+>$*>$*		<$3>$5				2-level <> nesting
+R$*<>$*			$@ <@>				MAIL FROM:<> case
+R$*<$+>$*		$2				basic RFC821/822 parsing
+
+ifdef(`_NO_CANONIFY_', `dnl',
+`# eliminate local host if present
+R@ $=w $=: $+		$@ @ $M $2 $3			@thishost ...
+R@ $+			$@ @ $1				@somewhere ...
+
+R$+ @ $=w		$@ $1 @ $M			...@thishost
+R$+ @ $+		$@ $1 @ $2			...@somewhere
+
+R$=w ! $+		$@ $2 @ $M			thishost!...
+R$+ ! $+		$@ $1 ! $2 @ $M			somewhere ! ...
+
+R$+ % $=w		$@ $1 @ $M			...%thishost
+R$+ % $+		$@ $1 @ $2			...%somewhere
+
+R$+			$@ $1 @ $M			unadorned user')
+
+
+######################################
+###   Ruleset 0 -- Parse Address   ###
+######################################
+
+S0
+
+R$*:;<@>		$#error $@ USAGE $: "list:; syntax illegal for recipient addresses"
+
+# pass everything else to a relay host
+R$*			$#_RELAY_ $@ $H $: $1
+
+#
+######################################################################
+######################################################################
+#####
+`#####			MAILER DEFINITIONS'
+#####
+######################################################################
+######################################################################
+undivert(7)dnl
diff --git a/usr.sbin/sendmail/cf/m4/proto.m4 b/usr.sbin/sendmail/cf/m4/proto.m4
new file mode 100644
index 00000000000..284572988f9
--- /dev/null
+++ b/usr.sbin/sendmail/cf/m4/proto.m4
@@ -0,0 +1,689 @@
+divert(-1)
+#
+# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1988, 1993
+#	The Regents of the University of California.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+divert(0)
+
+VERSIONID(`@(#)proto.m4	8.45 (Berkeley) 3/4/94')
+
+MAILER(local)dnl
+
+ifdef(`_OLD_SENDMAIL_',
+`define(`_SET_95_', 5)dnl
+define(`_SET_96_', 6)dnl
+define(`_SET_97_', 7)dnl
+define(`_SET_98_', 8)dnl
+define(`confDOMAIN_NAME',
+	`ifdef(`NEED_DOMAIN', `$w.$d', `$w')')dnl',
+`# level 5 config file format
+V5
+define(`_SET_95_', 95)dnl
+define(`_SET_96_', 96)dnl
+define(`_SET_97_', 97)dnl
+define(`_SET_98_', 98)dnl')
+ifdef(`confSMTP_MAILER',, `define(`confSMTP_MAILER', `smtp')')dnl
+ifdef(`confLOCAL_MAILER',, `define(`confLOCAL_MAILER', `local')')dnl
+ifdef(`confRELAY_MAILER',,
+	`define(`confRELAY_MAILER',
+		`ifdef(`_MAILER_smtp_', `relay',
+			`ifdef(`_MAILER_uucp', `suucp', `unknown')')')')dnl
+define(`_SMTP_', `confSMTP_MAILER')dnl		for readability only
+define(`_LOCAL_', `confLOCAL_MAILER')dnl	for readability only
+define(`_RELAY_', `confRELAY_MAILER')dnl	for readability only
+
+##################
+#   local info   #
+##################
+
+Cwlocalhost
+ifdef(`USE_CW_FILE',
+`# file containing names of hosts for which we receive email
+Fw`'confCW_FILE',
+	`dnl')
+ifdef(`confDOMAIN_NAME', `
+# my official domain name
+Dj`'confDOMAIN_NAME',
+	`dnl')
+
+ifdef(`_NULL_CLIENT_ONLY_',
+`include(../m4/nullrelay.m4)m4exit',
+	`dnl')
+
+CP.
+
+ifdef(`UUCP_RELAY',
+`# UUCP relay host
+DY`'UUCP_RELAY
+CPUUCP
+
+')dnl
+ifdef(`BITNET_RELAY',
+`#  BITNET relay host
+DB`'BITNET_RELAY
+CPBITNET
+
+')dnl
+ifdef(`FAX_RELAY',
+`# FAX relay host
+DF`'FAX_RELAY
+CPFAX
+
+')dnl
+# "Smart" relay host (may be null)
+DS`'ifdef(`SMART_HOST', SMART_HOST)
+
+ifdef(`MAILER_TABLE',
+`# Mailer table (overriding domains)
+Kmailertable MAILER_TABLE
+
+')dnl
+ifdef(`DOMAIN_TABLE',
+`# Domain table (adding domains)
+Kdomaintable DOMAIN_TABLE
+
+')dnl
+# who I send unqualified names to (null means deliver locally)
+DR`'ifdef(`LOCAL_RELAY', LOCAL_RELAY)
+
+# who gets all local email traffic ($R has precedence for unqualified names)
+DH`'ifdef(`MAIL_HUB', MAIL_HUB)
+
+# who I masquerade as (null for no masquerading)
+DM`'ifdef(`MASQUERADE_NAME', MASQUERADE_NAME)
+
+# class L: names that should be delivered locally, even if we have a relay
+# class E: names that should be exposed as from this host, even if we masquerade
+#CLroot
+CEroot
+undivert(5)dnl
+
+# operators that cannot be in local usernames (i.e., network indicators)
+CO @ % ifdef(`_NO_UUCP_', `', `!')
+
+# a class with just dot (for identifying canonical names)
+C..
+
+ifdef(`_OLD_SENDMAIL_', `dnl',
+`# dequoting map
+Kdequote dequote')
+
+undivert(6)dnl
+
+######################
+#   Special macros   #
+######################
+
+# SMTP initial login message
+De`'confSMTP_LOGIN_MSG
+
+# UNIX initial From header format
+Dl`'confFROM_LINE
+
+# my name for error messages
+Dn`'confMAILER_NAME
+
+# delimiter (operator) characters
+Do`'confOPERATORS
+
+# format of a total name
+Dq`'ifdef(`confFROM_HEADER', confFROM_HEADER,
+	ifdef(`_OLD_SENDMAIL_', `$g$?x ($x)$.', `$?x$x <$g>$|$g$.'))
+include(`../m4/version.m4')
+
+###############
+#   Options   #
+###############
+
+# strip message body to 7 bits on input?
+O7`'confSEVEN_BIT_INPUT
+
+# wait (in minutes) for alias file rebuild
+Oa`'confALIAS_WAIT
+
+# location of alias file
+OA`'ifdef(`ALIAS_FILE', `ALIAS_FILE', /etc/aliases)
+
+# minimum number of free blocks on filesystem
+Ob`'confMIN_FREE_BLOCKS
+
+# substitution for space (blank) characters
+OB`'confBLANK_SUB
+
+# avoid connecting to "expensive" mailers on initial submission?
+Oc`'confCON_EXPENSIVE
+
+# checkpoint queue runs after every N successful deliveries
+OC`'confCHECKPOINT_INTERVAL
+
+# default delivery mode
+Od`'confDELIVERY_MODE
+
+# automatically rebuild the alias database?
+OD`'confAUTO_REBUILD
+
+# error message header/file
+ifdef(`confERROR_MESSAGE',
+	OE`'confERROR_MESSAGE,
+	#OE/etc/sendmail.oE)
+
+# error mode
+ifdef(`confERROR_MODE',
+	Oe`'confERROR_MODE,
+	#Oep)
+
+# save Unix-style "From_" lines at top of header?
+Of`'confSAVE_FROM_LINES
+
+# temporary file mode
+OF`'confTEMP_FILE_MODE
+
+# match recipients against GECOS field?
+OG`'confMATCH_GECOS
+
+# default GID
+Og`'confDEF_GROUP_ID
+
+# maximum hop count
+Oh`'confMAX_HOP
+
+# location of help file
+OH`'ifdef(`HELP_FILE', HELP_FILE, /usr/lib/sendmail.hf)
+
+# ignore dots as terminators in incoming messages?
+Oi`'confIGNORE_DOTS
+
+# Insist that the BIND name server be running to resolve names
+ifdef(`confBIND_OPTS',
+	OI`'confBIND_OPTS,
+	#OI)
+
+# deliver MIME-encapsulated error messages?
+Oj`'confMIME_FORMAT_ERRORS
+
+# Forward file search path
+ifdef(`confFORWARD_PATH',
+	OJ`'confFORWARD_PATH,
+	#OJ/var/forward/$u:$z/.forward.$w:$z/.forward)
+
+# open connection cache size
+Ok`'confMCI_CACHE_SIZE
+
+# open connection cache timeout
+OK`'confMCI_CACHE_TIMEOUT
+
+# use Errors-To: header?
+Ol`'confUSE_ERRORS_TO
+
+# log level
+OL`'confLOG_LEVEL
+
+# send to me too, even in an alias expansion?
+Om`'confME_TOO
+
+# verify RHS in newaliases?
+On`'confCHECK_ALIASES
+
+# default messages to old style headers if no special punctuation?
+Oo`'confOLD_STYLE_HEADERS
+
+# SMTP daemon options
+ifdef(`confDAEMON_OPTIONS',
+	OO`'confDAEMON_OPTIONS,
+	#OOPort=esmtp)
+
+# privacy flags
+Op`'confPRIVACY_FLAGS
+
+# who (if anyone) should get extra copies of error messages
+ifdef(`confCOPY_ERRORS_TO',
+	OP`'confCOPY_ERRORS_TO,
+	#OPPostmaster)
+
+# slope of queue-only function
+ifdef(`confQUEUE_FACTOR',
+	Oq`'confQUEUE_FACTOR,
+	#Oq600000)
+
+# queue directory
+OQ`'ifdef(`QUEUE_DIR', QUEUE_DIR, /var/spool/mqueue)
+
+# read timeout -- now OK per RFC 1123 section 5.3.2
+ifdef(`confREAD_TIMEOUT',
+	Or`'confREAD_TIMEOUT,
+	#Ordatablock=10m)
+
+# queue up everything before forking?
+Os`'confSAFE_QUEUE
+
+# status file
+OS`'ifdef(`STATUS_FILE', STATUS_FILE, /etc/sendmail.st)
+
+# default message timeout interval
+OT`'confMESSAGE_TIMEOUT
+
+# time zone handling:
+#  if undefined, use system default
+#  if defined but null, use TZ envariable passed in
+#  if defined and non-null, use that info
+ifelse(confTIME_ZONE, `USE_SYSTEM', `#Ot',
+	confTIME_ZONE, `USE_TZ', `Ot',
+	`Ot`'confTIME_ZONE')
+
+# default UID
+Ou`'confDEF_USER_ID
+
+# list of locations of user database file (null means no lookup)
+OU`'ifdef(`confUSERDB_SPEC', `confUSERDB_SPEC')
+
+# fallback MX host
+ifdef(`confFALLBACK_MX',
+	OV`'confFALLBACK_MX,
+	#OVfall.back.host.net)
+
+# if we are the best MX host for a site, try it directly instead of config err
+Ow`'confTRY_NULL_MX_LIST
+
+# load average at which we just queue messages
+Ox`'confQUEUE_LA
+
+# load average at which we refuse connections
+OX`'confREFUSE_LA
+
+# work recipient factor
+ifdef(`confWORK_RECIPIENT_FACTOR',
+	Oy`'confWORK_RECIPIENT_FACTOR,
+	#Oy30000)
+
+# deliver each queued job in a separate process?
+OY`'confSEPARATE_PROC
+
+# work class factor
+ifdef(`confWORK_CLASS_FACTOR',
+	Oz`'confWORK_CLASS_FACTOR,
+	#Oz1800)
+
+# work time factor
+ifdef(`confWORK_TIME_FACTOR',
+	OZ`'confWORK_TIME_FACTOR,
+	#OZ90000)
+
+###########################
+#   Message precedences   #
+###########################
+
+Pfirst-class=0
+Pspecial-delivery=100
+Plist=-30
+Pbulk=-60
+Pjunk=-100
+
+#####################
+#   Trusted users   #
+#####################
+
+Troot
+Tdaemon
+Tuucp
+
+#########################
+#   Format of headers   #
+#########################
+
+H?P?Return-Path: $g
+HReceived: $?sfrom $s $.$?_($?s$|from $.$_) $.by $j ($v/$Z)$?r with $r$. id $i$?u for $u$.; $b
+H?D?Resent-Date: $a
+H?D?Date: $a
+H?F?Resent-From: $q
+H?F?From: $q
+H?x?Full-Name: $x
+HSubject:
+# HPosted-Date: $a
+# H?l?Received-Date: $b
+H?M?Resent-Message-Id: <$t.$i@$j>
+H?M?Message-Id: <$t.$i@$j>
+#
+######################################################################
+######################################################################
+#####
+#####			REWRITING RULES
+#####
+######################################################################
+######################################################################
+
+undivert(9)dnl
+
+###########################################
+###  Rulset 3 -- Name Canonicalization  ###
+###########################################
+S3
+
+# handle null input (translate to <@> special case)
+R$@			$@ <@>
+
+# basic textual canonicalization -- note RFC733 heuristic here
+R$*<$*>$*<$*>$*		$2$3<$4>$5			strip multiple <> <>
+R$*<$*<$+>$*>$*		<$3>$5				2-level <> nesting
+R$*<>$*			$@ <@>				MAIL FROM:<> case
+R$*<$+>$*		$2				basic RFC821/822 parsing
+
+# handle list:; syntax as special case
+R$*:;$*			$@ $1 :; <@>
+
+# make sure <@a,@b,@c:user@d> syntax is easy to parse -- undone later
+R@ $+ , $+		@ $1 : $2			change all "," to ":"
+
+# localize and dispose of route-based addresses
+R@ $+ : $+		$@ $>_SET_96_ < @$1 > : $2		handle <route-addr>
+
+# find focus for list syntax
+R $+ : $* ; @ $+	$@ $>_SET_96_ $1 : $2 ; < @ $3 >	list syntax
+R $+ : $* ;		$@ $1 : $2;			list syntax
+
+# find focus for @ syntax addresses
+R$+ @ $+		$: $1 < @ $2 >			focus on domain
+R$+ < $+ @ $+ >		$1 $2 < @ $3 >			move gaze right
+R$+ < @ $+ >		$@ $>_SET_96_ $1 < @ $2 >		already canonical
+
+# do some sanity checking
+R$* < @ $* : $* > $*	$1 < @ $2 $3 > $4		nix colons in addrs
+
+ifdef(`_NO_UUCP_', `dnl',
+`# convert old-style addresses to a domain-based address
+R$- ! $+		$@ $>_SET_96_ $2 < @ $1 .UUCP >	resolve uucp names
+R$+ . $- ! $+		$@ $>_SET_96_ $3 < @ $1 . $2 >		domain uucps
+R$+ ! $+		$@ $>_SET_96_ $2 < @ $1 .UUCP >	uucp subdomains')
+
+# if we have % signs, take the rightmost one
+R$* % $*		$1 @ $2				First make them all @s.
+R$* @ $* @ $*		$1 % $2 @ $3			Undo all but the last.
+R$* @ $*		$@ $>_SET_96_ $1 < @ $2 >		Insert < > and finish
+
+# else we must be a local name
+
+
+################################################
+###  Ruleset _SET_96_ -- bottom half of ruleset 3  ###
+################################################
+
+#  At this point, everything should be in a "local_part<@domain>extra" format.
+S`'_SET_96_
+
+# handle special cases for local names
+R$* < @ localhost > $*		$: $1 < @ $j . > $2		no domain at all
+R$* < @ localhost . $m > $*	$: $1 < @ $j . > $2		local domain
+ifdef(`_NO_UUCP_', `dnl',
+`R$* < @ localhost . UUCP > $*	$: $1 < @ $j . > $2		.UUCP domain')
+R$* < @ [ $+ ] > $*		$: $1 < @@ [ $2 ] > $3		mark [a.b.c.d]
+R$* < @@ $=w > $*		$: $1 < @ $j . > $3		self-literal
+R$* < @@ $+ > $*		$@ $1 < @ $2 > $3		canon IP addr
+ifdef(`DOMAIN_TABLE', `
+# look up unqualified domains in the domain table
+R$* < @ $- > $*			$: $1 < @ $(domaintable $2 $) > $3',
+`dnl')
+undivert(2)dnl
+
+ifdef(`_NO_UUCP_', `dnl',
+`ifdef(`UUCP_RELAY',
+`# pass UUCP addresses straight through
+R$* < @ $+ . UUCP > $*		$@ $1 < @ $2 . UUCP . > $3',
+`# if really UUCP, handle it immediately
+ifdef(`_CLASS_U_',
+`R$* < @ $=U . UUCP > $*	$@ $1 < @ $2 . UUCP . > $3', `dnl')
+ifdef(`_CLASS_V_',
+`R$* < @ $=V . UUCP > $*	$@ $1 < @ $2 . UUCP . > $3', `dnl')
+ifdef(`_CLASS_W_',
+`R$* < @ $=W . UUCP > $*	$@ $1 < @ $2 . UUCP . > $3', `dnl')
+ifdef(`_CLASS_X_',
+`R$* < @ $=X . UUCP > $*	$@ $1 < @ $2 . UUCP . > $3', `dnl')
+ifdef(`_CLASS_Y_',
+`R$* < @ $=Y . UUCP > $*	$@ $1 < @ $2 . UUCP . > $3', `dnl')
+
+# try UUCP traffic as a local address
+R$* < @ $+ . UUCP > $*		$: $1 < @ $[ $2 $] . UUCP . > $3
+ifdef(`_OLD_SENDMAIL_',
+`R$* < @ $+ . $+ . UUCP . > $*		$@ $1 < @ $2 . $3 . > $4',
+`R$* < @ $+ . . UUCP . > $*		$@ $1 < @ $2 . > $3')')
+')
+ifdef(`_NO_CANONIFY_', `dnl',
+`# pass to name server to make hostname canonical
+R$* < @ $* $~P > $*		$: $1 < @ $[ $2 $3 $] > $4')
+
+# local host aliases and pseudo-domains are always canonical
+R$* < @ $=w > $*		$: $1 < @ $2 . > $3
+R$* < @ $* $=P > $*		$: $1 < @ $2 $3 . > $4
+R$* < @ $* . . > $*		$1 < @ $2 . > $3
+
+# if this is the local hostname, make sure we treat is as canonical
+R$* < @ $j > $*			$: $1 < @ $j . > $2
+
+
+##################################################
+###  Ruleset 4 -- Final Output Post-rewriting  ###
+##################################################
+S4
+
+R$*<@>			$@ $1				handle <> and list:;
+
+# strip trailing dot off possibly canonical name
+R$* < @ $+ . > $*	$1 < @ $2 > $3
+
+# externalize local domain info
+R$* < $+ > $*		$1 $2 $3			defocus
+R@ $+ : @ $+ : $+	@ $1 , @ $2 : $3		<route-addr> canonical
+R@ $*			$@ @ $1				... and exit
+
+ifdef(`_NO_UUCP_', `dnl',
+`# UUCP must always be presented in old form
+R$+ @ $- . UUCP		$2!$1				u@h.UUCP => h!u')
+
+# delete duplicate local names
+R$+ % $=w @ $=w		$1 @ $j				u%host@host => u@host
+
+
+
+##############################################################
+###   Ruleset _SET_97_ -- recanonicalize and call ruleset zero   ###
+###		   (used for recursive calls)		   ###
+##############################################################
+
+S`'_SET_97_
+R$*			$: $>3 $1
+R$*			$@ $>0 $1
+
+
+######################################
+###   Ruleset 0 -- Parse Address   ###
+######################################
+
+S0
+
+R<@>			$#_LOCAL_ $: <>			special case error msgs
+R$* : $* ;		$#error $@ USAGE $: "list:; syntax illegal for recipient addresses"
+R<@ $+>			$#error $@ USAGE $: "user address required"
+R<$* : $* >		$#error $@ USAGE $: "colon illegal in host name part"
+
+ifdef(`_MAILER_smtp_',
+`# handle numeric address spec
+R$* < @ [ $+ ] > $*	$: $>_SET_98_ $1 < @ [ $2 ] > $3	numeric internet spec
+R$* < @ [ $+ ] > $*	$#_SMTP_ $@ [$2] $: $1 < @ [$2] > $3	still numeric: send',
+	`dnl')
+
+# now delete the local info -- note $=O to find characters that cause forwarding
+R$* < @ > $*		$@ $>_SET_97_ $1		user@ => user
+R< @ $=w . > : $*	$@ $>_SET_97_ $2		@here:... -> ...
+R$* $=O $* < @ $=w . >	$@ $>_SET_97_ $1 $2 $3		...@here -> ...
+
+# handle local hacks
+R$*			$: $>_SET_98_ $1
+
+# short circuit local delivery so forwarded email works
+ifdef(`_LOCAL_NOT_STICKY_',
+`R$=L < @ $=w . >		$#_LOCAL_ $: @ $1			special local names
+R$+ < @ $=w . >		$#_LOCAL_ $: $1			dispose directly',
+`R$+ < @ $=w . >		$: $1 < @ $2 . @ $H >		first try hub
+ifdef(`_OLD_SENDMAIL_',
+`R$+ < $+ @ $-:$+ >	$# $3 $@ $4 $: $1 < $2 >	yep ....
+R$+ < $+ @ $+ >		$#relay $@ $3 $: $1 < $2 >	yep ....
+R$+ < $+ @ >		$#_LOCAL_ $: $1			nope, local address',
+`R$+ < $+ @ $+ >		$#_LOCAL_ $: $1			yep ....
+R$+ < $+ @ >		$#_LOCAL_ $: @ $1			nope, local address')')
+ifdef(`MAILER_TABLE',
+`
+# not local -- try mailer table lookup
+R$* <@ $+ > $*		$: < $2 > $1 < @ $2 > $3	extract host name
+R< $+ . > $*		$: < $1 > $2			strip trailing dot
+R< $+ > $*		$: < $(mailertable $1 $) > $2	lookup
+R< $- : $+ > $*		$# $1 $@ $2 $: $3		check -- resolved?
+R< $+ > $*		$: $>90 <$1> $2			try domain',
+`dnl')
+undivert(4)dnl
+
+ifdef(`_NO_UUCP_', `dnl',
+`# resolve remotely connected UUCP links (if any)
+ifdef(`_CLASS_V_',
+`R$* < @ $=V . UUCP . > $*		$: $>_SET_95_ < $V > $1 <@$2.UUCP.> $3',
+	`dnl')
+ifdef(`_CLASS_W_',
+`R$* < @ $=W . UUCP . > $*		$: $>_SET_95_ < $W > $1 <@$2.UUCP.> $3',
+	`dnl')
+ifdef(`_CLASS_X_',
+`R$* < @ $=X . UUCP . > $*		$: $>_SET_95_ < $X > $1 <@$2.UUCP.> $3',
+	`dnl')')
+
+# resolve fake top level domains by forwarding to other hosts
+ifdef(`BITNET_RELAY',
+`R$*<@$+.BITNET.>$*	$: $>_SET_95_ < $B > $1 <@$2.BITNET.> $3	user@host.BITNET',
+	`dnl')
+ifdef(`_MAILER_pop_',
+`R$+ < @ POP. >		$#pop $: $1			user@POP',
+	`dnl')
+ifdef(`_MAILER_fax_',
+`R$+ < @ $+ .FAX. >	$#fax $@ $2 $: $1		user@host.FAX',
+`ifdef(`FAX_RELAY',
+`R$*<@$+.FAX.>$*		$: $>_SET_95_ < $F > $1 <@$2.FAX.> $3	user@host.FAX',
+	`dnl')')
+
+ifdef(`UUCP_RELAY',
+`# forward non-local UUCP traffic to our UUCP relay
+R$*<@$*.UUCP.>$*		$: $>_SET_95_ < $Y > $1 <@$2.UUCP.> $3	uucp mail',
+`ifdef(`_MAILER_uucp_',
+`# forward other UUCP traffic straight to UUCP
+R$* < @ $+ .UUCP. > $*		$#uucp $@ $2 $: $1 < @ $2 .UUCP. > $3	user@host.UUCP',
+	`dnl')')
+ifdef(`_MAILER_usenet_', `
+# addresses sent to net.group.USENET will get forwarded to a newsgroup
+R$+ . USENET		$#usenet $: $1',
+	`dnl')
+
+ifdef(`_LOCAL_RULES_',
+`# figure out what should stay in our local mail system
+undivert(1)', `dnl')
+
+# pass names that still have a host to a smarthost (if defined)
+R$* < @ $* > $*		$: $>_SET_95_ < $S > $1 < @ $2 > $3	glue on smarthost name
+
+# deal with other remote names
+ifdef(`_MAILER_smtp_',
+`R$* < @$* > $*		$#_SMTP_ $@ $2 $: $1 < @ $2 > $3		user@host.domain',
+`R$* < @$* > $*		$#error $@NOHOST $: Unrecognized host name $2')
+
+ifdef(`_OLD_SENDMAIL_',
+`# forward remaining names to local relay, if any
+R$=L			$#_LOCAL_ $: $1			special local names
+R$+			$: $>_SET_95_ < $R > $1			try relay
+R$+			$: $>_SET_95_ < $H > $1			try hub
+R$+			$#_LOCAL_ $: $1			no relay or hub: local',
+
+`# if this is quoted, strip the quotes and try again
+R$+			$: $(dequote $1 $)		strip quotes
+R$+ $=O $+		$@ $>_SET_97_ $1 $2 $3			try again
+
+# handle locally delivered names
+R$=L			$#_LOCAL_ $: @ $1			special local names
+R$+			$#_LOCAL_ $: $1			regular local names
+
+###########################################################################
+###   Ruleset 5 -- special rewriting after aliases have been expanded   ###
+###		   (new sendmail only)					###
+###########################################################################
+
+S5
+
+# see if we have a relay or a hub
+R$+			$: < $R > $1			try relay
+R< > $+			$: < $H > $1			try hub
+R< > $+			$@ $1				nope, give up
+R< $- : $+ > $+		$: $>_SET_95_ < $1 : $2 > $3 < @ $2 >
+R< $+ > $+		$@ $>_SET_95_ < $1 > $2 < @ $1 >')
+ifdef(`MAILER_TABLE',
+`
+
+###################################################################
+###  Ruleset 90 -- try domain part of mailertable entry 	###
+###		   (new sendmail only)				###
+###################################################################
+
+S90
+R$* <$- . $+ > $*	$: $1$2 < $(mailertable .$3 $@ $1$2 $@ $2 $) > $4
+R$* <$- : $+ > $*	$# $2 $@ $3 $: $4		check -- resolved?
+R$* < . $+ > $*		$@ $>90 $1 . <$2> $3		no -- strip & try again
+R$* < $* > $*		$: < $(mailertable . $@ $1$2 $) > $3	try "."
+R<$- : $+ > $*		$# $1 $@ $2 $: $3		"." found?
+R< $* > $*		$@ $2				no mailertable match',
+`dnl')
+
+###################################################################
+###  Ruleset _SET_95_ -- canonify mailer:host syntax to triple	###
+###################################################################
+
+S`'_SET_95_
+R< > $*			$@ $1				strip off null relay
+R< $- : $+ > $*		$# $1 $@ $2 $: $3		try qualified mailer
+R< $=w > $*		$@ $2				delete local host
+R< $+ > $*		$#_RELAY_ $@ $1 $: $2		use unqualified mailer
+
+###################################################################
+###  Ruleset _SET_98_ -- local part of ruleset zero (can be null)	###
+###################################################################
+
+S`'_SET_98_
+undivert(3)dnl
+#
+######################################################################
+######################################################################
+#####
+`#####			MAILER DEFINITIONS'
+#####
+######################################################################
+######################################################################
+undivert(7)dnl
diff --git a/usr.sbin/sendmail/cf/m4/version.m4 b/usr.sbin/sendmail/cf/m4/version.m4
new file mode 100644
index 00000000000..d7abdd6ac44
--- /dev/null
+++ b/usr.sbin/sendmail/cf/m4/version.m4
@@ -0,0 +1,39 @@
+divert(-1)
+#
+# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1988, 1993
+#	The Regents of the University of California.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+VERSIONID(`@(#)version.m4	8.6.12.1 (Berkeley) 3/28/95')
+#
+divert(0)
+# Configuration version number
+DZ8.6.12
diff --git a/usr.sbin/sendmail/cf/mailer/fax.m4 b/usr.sbin/sendmail/cf/mailer/fax.m4
new file mode 100644
index 00000000000..0c98a3bde19
--- /dev/null
+++ b/usr.sbin/sendmail/cf/mailer/fax.m4
@@ -0,0 +1,50 @@
+PUSHDIVERT(-1)
+#
+# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1988, 1993
+#	The Regents of the University of California.  All rights reserved.
+#
+#	This assumes you already have Sam Leffler's FAX software.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+
+ifdef(`FAX_MAILER_PATH',,
+	`define(`FAX_MAILER_PATH', /usr/local/lib/fax/mailfax)')
+ifdef(`FAX_MAILER_MAX',,
+	`define(`FAX_MAILER_MAX', 100000)')
+POPDIVERT
+####################################
+###   FAX Mailer specification   ###
+####################################
+
+VERSIONID(`@(#)fax.m4	8.2 (Berkeley) 1/24/94')
+
+Mfax,		P=FAX_MAILER_PATH, F=DFMhu, S=14, R=24, M=FAX_MAILER_MAX,
+		A=mailfax $u $h $f
diff --git a/usr.sbin/sendmail/cf/mailer/local.m4 b/usr.sbin/sendmail/cf/mailer/local.m4
new file mode 100644
index 00000000000..24a820413cb
--- /dev/null
+++ b/usr.sbin/sendmail/cf/mailer/local.m4
@@ -0,0 +1,66 @@
+PUSHDIVERT(-1)
+#
+# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1988, 1993
+#	The Regents of the University of California.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+ifdef(`LOCAL_MAILER_FLAGS',, `define(`LOCAL_MAILER_FLAGS', `rmn')')
+ifdef(`LOCAL_MAILER_PATH',, `define(`LOCAL_MAILER_PATH', /bin/mail)')
+ifdef(`LOCAL_MAILER_ARGS',, `define(`LOCAL_MAILER_ARGS', `mail -d $u')')
+ifdef(`LOCAL_SHELL_FLAGS',, `define(`LOCAL_SHELL_FLAGS', `eu')')
+ifdef(`LOCAL_SHELL_PATH',, `define(`LOCAL_SHELL_PATH', /bin/sh)')
+ifdef(`LOCAL_SHELL_ARGS',, `define(`LOCAL_SHELL_ARGS', `sh -c $u')')
+POPDIVERT
+
+##################################################
+###   Local and Program Mailer specification   ###
+##################################################
+
+VERSIONID(`@(#)local.m4	8.6 (Berkeley) 10/24/93')
+
+Mlocal,		P=LOCAL_MAILER_PATH, F=CONCAT(`lsDFM', LOCAL_MAILER_FLAGS), S=10, R=20/40,
+		A=LOCAL_MAILER_ARGS
+Mprog,		P=LOCAL_SHELL_PATH, F=CONCAT(`lsDFM', LOCAL_SHELL_FLAGS), S=10, R=20/40, D=$z:/,
+		A=LOCAL_SHELL_ARGS
+
+S10
+R<@>			$n			errors to mailer-daemon
+R$+			$: $>40 $1
+
+S20
+R$+ < @ $* >		$: $1			strip host part
+
+S40
+ifdef(`_ALWAYS_ADD_DOMAIN_',
+`R$* < @ $* > $*		$@ $1 < @ $2 > $3	already fully qualified
+R$*			$: $1 @ $M		add local qualification
+R$* @			$: $1 @ $j		if $M not defined',
+`dnl')
diff --git a/usr.sbin/sendmail/cf/mailer/pop.m4 b/usr.sbin/sendmail/cf/mailer/pop.m4
new file mode 100644
index 00000000000..92bcff9e790
--- /dev/null
+++ b/usr.sbin/sendmail/cf/mailer/pop.m4
@@ -0,0 +1,53 @@
+PUSHDIVERT(-1)
+#
+# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1988, 1993
+#	The Regents of the University of California.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+
+ifdef(`POP_MAILER_PATH',, `define(`POP_MAILER_PATH', /usr/lib/mh/spop)')
+ifdef(`POP_MAILER_FLAGS',, `define(`POP_MAILER_FLAGS', `eu')')
+ifdef(`POP_MAILER_ARGS',, `define(`POP_MAILER_ARGS', `pop $u')')
+
+POPDIVERT
+
+####################################
+###   POP Mailer specification   ###
+####################################
+
+VERSIONID(`@(#)pop.m4	8.2 (Berkeley) 2/19/94')
+
+Mpop,		P=POP_MAILER_PATH, F=CONCAT(`lsDFM', POP_MAILER_FLAGS), S=10, R=20/40,
+		A=POP_MAILER_ARGS
+
+LOCAL_CONFIG
+# POP mailer is a pseudo-domain
+CPPOP
diff --git a/usr.sbin/sendmail/cf/mailer/smtp.m4 b/usr.sbin/sendmail/cf/mailer/smtp.m4
new file mode 100644
index 00000000000..45efbd68a81
--- /dev/null
+++ b/usr.sbin/sendmail/cf/mailer/smtp.m4
@@ -0,0 +1,126 @@
+PUSHDIVERT(-1)
+#
+# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1988, 1993
+#	The Regents of the University of California.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+ifdef(`SMTP_MAILER_FLAGS',,
+	`define(`SMTP_MAILER_FLAGS',
+		`ifdef(`_OLD_SENDMAIL_', `L', `')')')
+POPDIVERT
+#####################################
+###   SMTP Mailer specification   ###
+#####################################
+
+VERSIONID(`@(#)smtp.m4	8.15 (Berkeley) 2/14/94')
+
+Msmtp,		P=[IPC], F=CONCAT(mDFMuX, SMTP_MAILER_FLAGS), S=11/31, R=ifdef(`_ALL_MASQUERADE_', `11/31', `21'), E=\r\n,
+		ifdef(`_OLD_SENDMAIL_',, `L=990, ')ifdef(`SMTP_MAILER_MAX', `M=SMTP_MAILER_MAX, ')A=IPC $h
+Mesmtp,		P=[IPC], F=CONCAT(mDFMuXa, SMTP_MAILER_FLAGS), S=11/31, R=ifdef(`_ALL_MASQUERADE_', `11/31', `21'), E=\r\n,
+		ifdef(`_OLD_SENDMAIL_',, `L=990, ')ifdef(`SMTP_MAILER_MAX', `M=SMTP_MAILER_MAX, ')A=IPC $h
+Mrelay,		P=[IPC], F=CONCAT(mDFMuXa, SMTP_MAILER_FLAGS), S=11/31, R=61, E=\r\n,
+		ifdef(`_OLD_SENDMAIL_',, `L=2040, ')A=IPC $h
+
+#
+#  envelope sender and masquerading recipient rewriting
+#
+S11
+R$+			$: $>51 $1			sender/recipient common
+R$* :; <@>		$@ $1 :;			list:; special case
+R$*			$@ $>61 $1			qualify unqual'ed names
+
+
+#
+#  header recipient rewriting if not masquerading recipients
+#
+S21
+
+# do sender/recipient common rewriting
+R$+			$: $>51 $1
+
+# unqualified names (e.g., "eric") are qualified by local host
+R$* < @ $* > $*		$@ $1 < @ $2 > $3		already qualified
+R$+			$: $1 < @ $j >			add local domain
+
+
+#
+#  header sender and masquerading recipient rewriting
+#
+S31
+R$+			$: $>51 $1			sender/recipient common
+R$* :; <@>		$@ $1 :;			list:; special case
+
+# do special header rewriting
+R$* <@> $*		$@ $1 <@> $2			pass null host through
+R< @ $* > $*		$@ < @ $1 > $2			pass route-addr through
+R$=E < @ $=w . >	$@ $1 < @ $2 >			exposed user as is
+R$* < @ $=w . >		$: $1 < @ $2 @ $M >		masquerade as domain
+R$* < @ $+ @ >		$@ $1 < @ $2 >			in case $M undefined
+R$* < @ $+ @ $+ >	$@ $1 < @ $3 >			$M is defined -- use it
+R$*			$@ $>61 $1			qualify unqual'ed names
+
+
+#
+#  convert pseudo-domain addresses to real domain addresses
+#
+S51
+
+# pass <route-addr>s through
+R< @ $+ > $*		$@ < @ $1 > $2			resolve <route-addr>
+
+# output fake domains as user%fake@relay
+ifdef(`BITNET_RELAY',
+`R$+ <@ $+ .BITNET. >	$: $1 % $2 .BITNET < @ $B >	user@host.BITNET
+R$+.BITNET <@ $+:$+ >	$: $1 .BITNET < @ $3 >		strip mailer: part',
+	`dnl')
+ifdef(`_NO_UUCP_', `dnl', `
+# do UUCP heuristics; note that these are shared with UUCP mailers
+R$+ < @ $+ .UUCP. >	$: < $2 ! > $1			convert to UUCP form
+R$+ < @ $* > $*		$@ $1 < @ $2 > $3		not UUCP form
+
+# leave these in .UUCP form to avoid further tampering
+R< $&h ! > $- ! $+	$@ $2 < @ $1 .UUCP. >
+R< $&h ! > $-.$+ ! $+	$@ $3 < @ $1.$2 >
+R< $&h ! > $+		$@ $1 < @ $&h .UUCP. >
+R< $+ ! > $+		$: $1 ! $2 < @ $Y >
+R$+ < @ >		$: $1 < @ $j >			in case $Y undefined
+R$+ < @ $+ : $+ >	$: $1 < @ $3 >			strip mailer: part')
+
+
+#
+#  common sender and masquerading recipient rewriting
+#
+S61
+
+R$* < @ $* > $*		$@ $1 < @ $2 > $3		already qualified
+R$=E			$@ $1 < @ $j>			show exposed names
+R$+			$: $1 < @ $M >			user w/o host
+R$+ <@>			$: $1 < @ $j >			in case $M undefined
diff --git a/usr.sbin/sendmail/cf/mailer/usenet.m4 b/usr.sbin/sendmail/cf/mailer/usenet.m4
new file mode 100644
index 00000000000..fe6ee3071f8
--- /dev/null
+++ b/usr.sbin/sendmail/cf/mailer/usenet.m4
@@ -0,0 +1,47 @@
+PUSHDIVERT(-1)
+#
+# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1988, 1993
+#	The Regents of the University of California.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+
+ifdef(`USENET_MAILER_PATH',, `define(`USENET_MAILER_PATH', /usr/lib/news/inews)')
+ifdef(`USENET_MAILER_FLAGS',, `define(`USENET_MAILER_FLAGS', `rlsDFMmn')')
+ifdef(`USENET_MAILER_ARGS',, `define(`USENET_MAILER_ARGS', `inews -m -h -n')')
+POPDIVERT
+####################################
+###  USENET Mailer specification ###
+####################################
+
+VERSIONID(`@(#)usenet.m4	8.3 (Berkeley) 1/24/94')
+
+Musenet,	P=USENET_MAILER_PATH, F=USENET_MAILER_FLAGS, S=10, R=20,ifdef(`USENET_MAILER_MAX', ` M=USENET_MAILER_MAX,')
+		A=USENET_MAILER_ARGS $u
diff --git a/usr.sbin/sendmail/cf/mailer/uucp.m4 b/usr.sbin/sendmail/cf/mailer/uucp.m4
new file mode 100644
index 00000000000..dd7aa87ff18
--- /dev/null
+++ b/usr.sbin/sendmail/cf/mailer/uucp.m4
@@ -0,0 +1,172 @@
+PUSHDIVERT(-1)
+#
+# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1988, 1993
+#	The Regents of the University of California.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+
+ifdef(`UUCP_MAILER_PATH',, `define(`UUCP_MAILER_PATH', /usr/bin/uux)')
+ifdef(`UUCP_MAILER_ARGS',, `define(`UUCP_MAILER_ARGS', `uux - -r -a$f -gC $h!rmail ($u)')')
+ifdef(`UUCP_MAILER_FLAGS',, `define(`UUCP_MAILER_FLAGS', `')')
+ifdef(`UUCP_MAX_SIZE',, `define(`UUCP_MAX_SIZE', 100000)')
+POPDIVERT
+#####################################
+###   UUCP Mailer specification   ###
+#####################################
+
+VERSIONID(`@(#)uucp.m4	8.16 (Berkeley) 4/14/94')
+
+#
+#  There are innumerable variations on the UUCP mailer.  It really
+#  is rather absurd.
+#
+
+# old UUCP mailer (two names)
+Muucp,		P=UUCP_MAILER_PATH, F=CONCAT(DFMhuU, UUCP_MAILER_FLAGS), S=12, R=22/42, M=UUCP_MAX_SIZE,
+		A=UUCP_MAILER_ARGS
+Muucp-old,	P=UUCP_MAILER_PATH, F=CONCAT(DFMhuU, UUCP_MAILER_FLAGS), S=12, R=22/42, M=UUCP_MAX_SIZE,
+		A=UUCP_MAILER_ARGS
+
+# smart UUCP mailer (handles multiple addresses) (two names)
+Msuucp,		P=UUCP_MAILER_PATH, F=CONCAT(mDFMhuU, UUCP_MAILER_FLAGS), S=12, R=22/42, M=UUCP_MAX_SIZE,
+		A=UUCP_MAILER_ARGS
+Muucp-new,	P=UUCP_MAILER_PATH, F=CONCAT(mDFMhuU, UUCP_MAILER_FLAGS), S=12, R=22/42, M=UUCP_MAX_SIZE,
+		A=UUCP_MAILER_ARGS
+
+ifdef(`_MAILER_smtp_',
+`# domain-ized UUCP mailer
+Muucp-dom,	P=UUCP_MAILER_PATH, F=CONCAT(mDFMhu, UUCP_MAILER_FLAGS), S=52/31, R=ifdef(`_ALL_MASQUERADE_', `11/31', `21'), M=UUCP_MAX_SIZE,
+		A=UUCP_MAILER_ARGS
+
+# domain-ized UUCP mailer with UUCP-style sender envelope
+Muucp-uudom,	P=UUCP_MAILER_PATH, F=CONCAT(mDFMhu, UUCP_MAILER_FLAGS), S=72/31, R=ifdef(`_ALL_MASQUERADE_', `11/31', `21'), M=UUCP_MAX_SIZE,
+		A=UUCP_MAILER_ARGS')
+
+
+#
+#  envelope and header sender rewriting
+#
+S12
+
+# handle error address as a special case
+R<@>				$n			errors to mailer-daemon
+
+# do not qualify list:; syntax
+R$* :; <@>			$@ $1 :;
+
+R$* < @ $* . >			$1 < @ $2 >		strip trailing dots
+R$* < @ $=w >			$1			strip local name
+R<@ $- . UUCP > : $+		$1 ! $2			convert to UUCP format
+R<@ $+ > : $+			$1 ! $2			convert to UUCP format
+R$* < @ $- . UUCP >		$2 ! $1			convert to UUCP format
+R$* < @ $+ >			$2 ! $1			convert to UUCP format
+R$&h ! $+ ! $+			$@ $1 ! $2		$h!...!user => ...!user
+R$&h ! $+			$@ $&h ! $1		$h!user => $h!user
+R$+				$: $U ! $1		prepend our name
+R! $+				$: $k ! $1		in case $U undefined
+
+#
+#  envelope recipient rewriting
+#
+S22
+
+# don't touch list:; syntax
+R$* :; <@>			$@ $1 :;
+
+R$* < @ $* . >			$1 < @ $2 >		strip trailing dots
+R$* < @ $j >			$1			strip local name
+R<@ $- . UUCP > : $+		$1 ! $2			convert to UUCP format
+R<@ $+ > : $+			$1 ! $2			convert to UUCP format
+R$* < @ $- . UUCP >		$2 ! $1			convert to UUCP format
+R$* < @ $+ >			$2 ! $1			convert to UUCP format
+
+#
+#  header recipient rewriting
+#
+S42
+
+# don't touch list:; syntax
+R$* :; <@>			$@ $1 :;
+
+R$* < @ $* . >			$1 < @ $2 >		strip trailing dots
+R$* < @ $j >			$1			strip local name
+R<@ $- . UUCP > : $+		$1 ! $2			convert to UUCP format
+R<@ $+ > : $+			$1 ! $2			convert to UUCP format
+R$* < @ $- . UUCP >		$2 ! $1			convert to UUCP format
+R$* < @ $+ >			$2 ! $1			convert to UUCP format
+R$&h ! $+ ! $+			$@ $1 ! $2		$h!...!user => ...!user
+R$&h ! $+			$@ $&h ! $1		$h!user => $h!user
+R$+				$: $U ! $1		prepend our name
+R! $+				$: $k ! $1		in case $U undefined
+
+
+ifdef(`_MAILER_smtp_',
+`#
+#  envelope sender rewriting for uucp-dom mailer
+#
+S52
+
+# handle error address as a special case
+R<@>				$n			errors to mailer-daemon
+
+# pass everything to standard SMTP mailer rewriting
+R$*				$@ $>11 $1
+
+#
+#  envelope sender rewriting for uucp-uudom mailer
+#
+S72
+
+# handle error address as a special case
+R<@>				$n			errors to mailer-daemon
+
+# do not qualify list:; syntax
+R$* :; <@>			$@ $1 :;
+
+R$* < @ $* . >			$1 < @ $2 >		strip trailing dots
+R$* < @ $=w >			$1			strip local name
+R<@ $- . UUCP > : $+		$1 ! $2			convert to UUCP format
+R<@ $+ > : $+			$1 ! $2			convert to UUCP format
+R$* < @ $- . UUCP >		$2 ! $1			convert to UUCP format
+R$* < @ $+ >			$@ $2 ! $1		convert to UUCP format
+
+R$&h ! $+ ! $+			$@ $1 ! $2		$h!...!user => ...!user
+R$&h ! $+			$@ $&h ! $1		$h!user => $h!user
+R$+				$: $M ! $1		prepend masquerade name
+R! $+				$: $j ! $1		in case $M undefined')
+
+
+PUSHDIVERT(4)
+# resolve locally connected UUCP links
+R$* < @ $=Z . UUCP. > $*	$#uucp-uudom $@ $2 $: $1 < @ $2 .UUCP. > $3
+R$* < @ $=Y . UUCP. > $*	$#uucp-new $@ $2 $: $1 < @ $2 .UUCP. > $3
+R$* < @ $=U . UUCP. > $*	$#uucp-old $@ $2 $: $1 < @ $2 .UUCP. > $3
+POPDIVERT
diff --git a/usr.sbin/sendmail/cf/ostype/bsd4.4.m4 b/usr.sbin/sendmail/cf/ostype/bsd4.4.m4
new file mode 100644
index 00000000000..1950528902b
--- /dev/null
+++ b/usr.sbin/sendmail/cf/ostype/bsd4.4.m4
@@ -0,0 +1,42 @@
+divert(-1)
+#
+# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1988, 1993
+#	The Regents of the University of California.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+#
+
+divert(0)
+VERSIONID(`@(#)bsd4.4.m4	8.2 (Berkeley) 2/10/94')
+define(`HELP_FILE', /usr/share/misc/sendmail.hf)dnl
+define(`STATUS_FILE', /var/log/sendmail.st)dnl
+define(`LOCAL_MAILER_PATH', /usr/libexec/mail.local)dnl
+define(`UUCP_MAILER_ARGS', `uux - -r -z -a$f $h!rmail ($u)')dnl
diff --git a/usr.sbin/sendmail/cf/sh/makeinfo.sh b/usr.sbin/sendmail/cf/sh/makeinfo.sh
new file mode 100644
index 00000000000..dd5044afe97
--- /dev/null
+++ b/usr.sbin/sendmail/cf/sh/makeinfo.sh
@@ -0,0 +1,77 @@
+#!/bin/sh
+#
+# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1988, 1993
+#	The Regents of the University of California.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+#	@(#)makeinfo.sh	8.4 (Berkeley) 3/4/94
+#
+
+usewhoami=0
+usehostname=0
+for p in `echo $PATH | sed 's/:/ /g'`
+do
+	if [ "x$p" = "x" ]
+	then
+		p="."
+	fi
+	if [ -f $p/whoami ]
+	then
+		usewhoami=1
+		if [ $usehostname -ne 0 ]
+		then
+			break;
+		fi
+	fi
+	if [ -f $p/hostname ]
+	then
+		usehostname=1
+		if [ $usewhoami -ne 0 ]
+		then
+			break;
+		fi
+	fi
+done
+if [ $usewhoami -ne 0 ]
+then
+	user=`whoami`
+else
+	user=$LOGNAME
+fi
+
+if [ $usehostname -ne 0 ]
+then
+	host=`hostname`
+else
+	host=`uname -n`
+fi
+echo '#####' built by $user@$host on `date`
+echo '#####' in `pwd` | sed 's/\/tmp_mnt//'
diff --git a/usr.sbin/sendmail/cf/siteconfig/uucp.cogsci.m4 b/usr.sbin/sendmail/cf/siteconfig/uucp.cogsci.m4
new file mode 100644
index 00000000000..33c71511781
--- /dev/null
+++ b/usr.sbin/sendmail/cf/siteconfig/uucp.cogsci.m4
@@ -0,0 +1,6 @@
+SITE(contessa)
+SITE(emind)
+SITE(hoptoad)
+SITE(nkainc)
+SITE(well)
+SITE(ferdy)
diff --git a/usr.sbin/sendmail/cf/siteconfig/uucp.old.arpa.m4 b/usr.sbin/sendmail/cf/siteconfig/uucp.old.arpa.m4
new file mode 100644
index 00000000000..81d5e9443d9
--- /dev/null
+++ b/usr.sbin/sendmail/cf/siteconfig/uucp.old.arpa.m4
@@ -0,0 +1,4 @@
+SITE(endotsew)
+SITE(fateman)
+SITE(interlan)
+SITE(metron)
diff --git a/usr.sbin/sendmail/cf/siteconfig/uucp.ucbarpa.m4 b/usr.sbin/sendmail/cf/siteconfig/uucp.ucbarpa.m4
new file mode 100644
index 00000000000..8b137891791
--- /dev/null
+++ b/usr.sbin/sendmail/cf/siteconfig/uucp.ucbarpa.m4
@@ -0,0 +1 @@
+
diff --git a/usr.sbin/sendmail/cf/siteconfig/uucp.ucbvax.m4 b/usr.sbin/sendmail/cf/siteconfig/uucp.ucbvax.m4
new file mode 100644
index 00000000000..ee2c34f60d9
--- /dev/null
+++ b/usr.sbin/sendmail/cf/siteconfig/uucp.ucbvax.m4
@@ -0,0 +1,73 @@
+SITE(Padova)
+SITE(Shasta)
+SITE(alice)
+SITE(allegra)
+SITE(amdcad)
+SITE(att)
+SITE(attunix)
+SITE(avsd)
+SITE(bellcore bellcor)
+SITE(calma)
+SITE(cithep)
+SITE(cnmat)
+SITE(craig)
+SITE(craylab)
+SITE(decusj)
+SITE(decvax, S)
+SITE(decwrl)
+SITE(dssovax)
+SITE(eagle)
+SITE(ecovax)
+SITE(floyd)
+SITE(franz)
+SITE(geoff)
+SITE(harpo)
+SITE(ho3e2)
+SITE(hpda)
+SITE(hplabs)
+SITE(ibmsupt ibmuupa ibmpa)
+SITE(iiasa70)
+SITE(imagen)
+SITE(isunix menlo70)
+SITE(kentmth)
+SITE(lbl-csam lbl-csa)
+SITE(lime)
+SITE(mothra)
+SITE(mseonyx)
+SITE(mtxinu)
+SITE(pixar)
+SITE(pur-ee)
+SITE(purdue)
+SITE(pwbd)
+SITE(sdcarl)
+SITE(sftig)
+SITE(sgi olympus)
+SITE(sii)
+SITE(srivisi)
+SITE(ssyx)
+SITE(sun)
+SITE(trwrb)
+SITE(twg)
+SITE(ucivax)
+SITE(ucla-se)
+SITE(ucla-cs)
+SITE(ucsbcsl ucsbhub)
+SITE(ucscc)
+SITE(ucsd)
+SITE(ucsfcgl)
+SITE(ucsfmis)
+SITE(ulysses)
+SITE(unisoft)
+SITE(unmvax)
+SITE(usenix)
+SITE(uw)
+SITE(uwvax)
+SITE(vax135)
+SITE(voder)
+SITE(wheps)
+SITE(whuxle)
+SITE(whuxlj)
+SITE(xicomp)
+SITE(xprin)
+SITE(zehntel)
+SITE(zilog)
diff --git a/usr.sbin/sendmail/contrib/README b/usr.sbin/sendmail/contrib/README
new file mode 100644
index 00000000000..dcf5c8fe7e0
--- /dev/null
+++ b/usr.sbin/sendmail/contrib/README
@@ -0,0 +1,10 @@
+Everything in this directory (except this file) has been contributed.
+We will not fix bugs in these programs.  Contact the original author
+for assistance.
+
+Some of these are patches to sendmail itself.  You may need to take
+care -- some of the patches may be out of date with the latest release
+of sendmail.  Also, the previous comment applies -- patches belong to
+the original author, not to me.
+
+Eric Allman, 26 May 1993
diff --git a/usr.sbin/sendmail/contrib/bitdomain.c b/usr.sbin/sendmail/contrib/bitdomain.c
new file mode 100644
index 00000000000..4fad7617549
--- /dev/null
+++ b/usr.sbin/sendmail/contrib/bitdomain.c
@@ -0,0 +1,409 @@
+/*
+ * By John G. Myers, jgm+@cmu.edu
+ * Version 1.1
+ *
+ * Process a BITNET "internet.listing" file, producing output
+ * suitable for input to makemap.
+ *
+ * The input file can be obtained via anonymous FTP to bitnic.educom.edu.
+ * Change directory to "netinfo" and get the file internet.listing
+ * The file is updated monthly.
+ *
+ * Feed the output of this program to "makemap hash /etc/bitdomain.db"
+ * to create the table used by the "FEATURE(bitdomain)" config file macro.
+ * If your sendmail does not have the db library compiled in, you can instead
+ * use "makemap dbm /etc/bitdomain" and
+ * "FEATURE(bitdomain,`dbm -o /etc/bitdomain')"
+ *
+ * The bitdomain table should be rebuilt monthly.
+ */
+
+#include <stdio.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <netinet/in.h>
+#include <arpa/nameser.h>
+#include <resolv.h>
+#include <netdb.h>
+#include <ctype.h>
+#include <string.h>
+
+/* don't use sizeof because sizeof(long) is different on 64-bit machines */
+#define SHORTSIZE	2	/* size of a short (really, must be 2) */
+#define LONGSIZE	4	/* size of a long (really, must be 4) */
+
+typedef union
+{
+	HEADER	qb1;
+	char	qb2[PACKETSZ];
+} querybuf;
+
+extern int h_errno;
+extern char *malloc();
+extern char *optarg;
+extern int optind;
+
+char *lookup();
+
+main(argc, argv)
+int argc;
+char **argv;
+{
+    int opt;
+
+    while ((opt = getopt(argc, argv, "o:")) != EOF) {
+	switch (opt) {
+	case 'o':
+	    if (!freopen(optarg, "w", stdout)) {
+		perror(optarg);
+		exit(1);
+	    }
+	    break;
+
+	default:
+	    fprintf(stderr, "usage: %s [-o outfile] [internet.listing]\n",
+		    argv[0]);
+	    exit(1);
+	}
+    }
+
+    if (optind < argc) {
+	if (!freopen(argv[optind], "r", stdin)) {
+	    perror(argv[optind]);
+	    exit(1);
+	}
+    }
+    readfile(stdin);
+    finish();
+    exit(0);
+}
+
+/*
+ * Parse and process an input file
+ */
+readfile(infile)
+FILE *infile;
+{
+    int skippingheader = 1;
+    char buf[1024], *node, *hostname, *p;
+
+    while (fgets(buf, sizeof(buf), infile)) {
+	for (p = buf; *p && isspace(*p); p++);
+	if (!*p) {
+	    skippingheader = 0;
+	    continue;
+	}
+	if (skippingheader) continue;
+
+	node = p;
+	for (; *p && !isspace(*p); p++) {
+	    if (isupper(*p)) *p = tolower(*p);
+	}
+	if (!*p) {
+	    fprintf(stderr, "%-8s: no domain name in input file\n", node);
+	    continue;
+	}
+	*p++ = '\0';
+
+	for (; *p && isspace(*p); p++) ;
+	if (!*p) {
+	    fprintf(stderr, "%-8s no domain name in input file\n", node);
+	    continue;
+	}
+
+	hostname = p;
+	for (; *p && !isspace(*p); p++) {
+	    if (isupper(*p)) *p = tolower(*p);
+	}
+	*p = '\0';
+
+	/* Chop off any trailing .bitnet */
+	if (strlen(hostname) > 7 &&
+	    !strcmp(hostname+strlen(hostname)-7, ".bitnet")) {
+	    hostname[strlen(hostname)-7] = '\0';
+	}
+	entry(node, hostname, sizeof(buf)-(hostname - buf));
+    }
+}
+
+/*
+ * Process a single entry in the input file.
+ * The entry tells us that "node" expands to "domain".
+ * "domain" can either be a domain name or a bitnet node name
+ * The buffer pointed to by "domain" may be overwritten--it
+ * is of size "domainlen".
+ */
+entry(node, domain, domainlen)
+char *node;
+char *domain;
+char *domainlen;
+{
+    char *otherdomain, *p, *err;
+
+    /* See if we have any remembered information about this node */
+    otherdomain = lookup(node);
+
+    if (otherdomain && strchr(otherdomain, '.')) {
+	/* We already have a domain for this node */
+	if (!strchr(domain, '.')) {
+	    /*
+	     * This entry is an Eric Thomas FOO.BITNET kludge.
+	     * He doesn't want LISTSERV to do transitive closures, so we
+	     * do them instead.  Give the the domain expansion for "node"
+	     * (which is in "otherdomian") to FOO (which is in "domain")
+	     * if "domain" doesn't have a domain expansion already.
+	     */
+	    p = lookup(domain);
+	    if (!p || !index(p, '.')) remember(domain, otherdomain);
+	}
+    }
+    else {
+	if (!strchr(domain, '.') || valhost(domain, domainlen)) {
+	    remember(node, domain);
+	    if (otherdomain) {
+		/*
+		 * We previously mapped the node "node" to the node
+		 * "otherdomain".  If "otherdomain" doesn't already
+		 * have a domain expansion, give it the expansion "domain".
+		 */
+		p = lookup(otherdomain);
+		if (!p || !index(p, '.')) remember(otherdomain, domain);
+	    }
+	}
+	else {
+	    switch (h_errno) {
+	    case HOST_NOT_FOUND:
+		err = "not registered in DNS";
+		break;
+
+	    case TRY_AGAIN:
+		err = "temporary DNS lookup failure";
+		break;
+
+	    case NO_RECOVERY:
+		err = "non-recoverable nameserver error";
+		break;
+
+	    case NO_DATA:
+		err = "registered in DNS, but not mailable";
+		break;
+		
+	    default:
+		err = "unknown nameserver error";
+		break;
+	    }
+
+	    fprintf(stderr, "%-8s %s %s\n", node, domain, err);
+	}
+    }
+}
+
+/*
+ * Validate whether the mail domain "host" is registered in the DNS.
+ * If "host" is a CNAME, it is expanded in-place if the expansion fits
+ * into the buffer of size "hbsize".  Returns nonzero if it is, zero
+ * if it is not.  A BIND error code is left in h_errno.
+ */
+int
+valhost(host, hbsize)
+	char *host;
+	int hbsize;
+{
+	register u_char *eom, *ap;
+	register int n; 
+	HEADER *hp;
+	querybuf answer;
+	int ancount, qdcount;
+	int ret;
+	int type;
+	int qtype;
+	char nbuf[1024];
+
+	if ((_res.options & RES_INIT) == 0 && res_init() == -1)
+		return (0);
+
+	_res.options &= ~(RES_DNSRCH|RES_DEFNAMES);
+	_res.retrans = 30;
+	_res.retry = 10;
+
+	qtype = T_ANY;
+
+	for (;;) {
+		h_errno = NO_DATA;
+		ret = res_querydomain(host, "", C_IN, qtype,
+				      &answer, sizeof(answer));
+		if (ret <= 0)
+		{
+			if (errno == ECONNREFUSED || h_errno == TRY_AGAIN)
+			{
+				/* the name server seems to be down */
+				h_errno = TRY_AGAIN;
+				return 0;
+			}
+
+			if (h_errno != HOST_NOT_FOUND)
+			{
+				/* might have another type of interest */
+				if (qtype == T_ANY)
+				{
+					qtype = T_A;
+					continue;
+				}
+				else if (qtype == T_A)
+				{
+					qtype = T_MX;
+					continue;
+				}
+			}
+
+			/* otherwise, no record */
+			return 0;
+		}
+
+		/*
+		**  This might be a bogus match.  Search for A, MX, or
+		**  CNAME records.
+		*/
+
+		hp = (HEADER *) &answer;
+		ap = (u_char *) &answer + sizeof(HEADER);
+		eom = (u_char *) &answer + ret;
+
+		/* skip question part of response -- we know what we asked */
+		for (qdcount = ntohs(hp->qdcount); qdcount--; ap += ret + QFIXEDSZ)
+		{
+			if ((ret = dn_skipname(ap, eom)) < 0)
+			{
+				return 0;		/* ???XXX??? */
+			}
+		}
+
+		for (ancount = ntohs(hp->ancount); --ancount >= 0 && ap < eom; ap += n)
+		{
+			n = dn_expand((u_char *) &answer, eom, ap,
+				      (u_char *) nbuf, sizeof nbuf);
+			if (n < 0)
+				break;
+			ap += n;
+			GETSHORT(type, ap);
+			ap += SHORTSIZE + LONGSIZE;
+			GETSHORT(n, ap);
+			switch (type)
+			{
+			  case T_MX:
+			  case T_A:
+				return 1;
+
+			  case T_CNAME:
+				/* value points at name */
+				if ((ret = dn_expand((u_char *)&answer,
+				    eom, ap, (u_char *)nbuf, sizeof(nbuf))) < 0)
+					break;
+				if (strlen(nbuf) < hbsize) {
+				    (void)strcpy(host, nbuf);
+				}
+				return 1;
+
+			  default:
+				/* not a record of interest */
+				continue;
+			}
+		}
+
+		/*
+		**  If this was a T_ANY query, we may have the info but
+		**  need an explicit query.  Try T_A, then T_MX.
+		*/
+
+		if (qtype == T_ANY)
+			qtype = T_A;
+		else if (qtype == T_A)
+			qtype = T_MX;
+		else
+			return 0;
+	}
+}
+
+struct entry {
+    struct entry *next;
+    char *node;
+    char *domain;
+};
+struct entry *firstentry;
+
+/*
+ * Find any remembered information about "node"
+ */
+char *lookup(node)
+char *node;
+{
+    struct entry *p;
+
+    for (p = firstentry; p; p = p->next) {
+	if (!strcmp(node, p->node)) {
+	    return p->domain;
+	}
+    }
+    return 0;
+}
+
+/*
+ * Mark the node "node" as equivalent to "domain".  "domain" can either
+ * be a bitnet node or a domain name--if it is the latter, the mapping
+ * will be written to stdout.
+ */
+remember(node, domain)
+char *node;
+char *domain;
+{
+    struct entry *p;
+
+    if (strchr(domain, '.')) {
+	fprintf(stdout, "%-8s %s\n", node, domain);
+    }
+
+    for (p = firstentry; p; p = p->next) {
+	if (!strcmp(node, p->node)) {
+	    p->domain = malloc(strlen(domain)+1);
+	    if (!p->domain) {
+		goto outofmemory;
+	    }
+	    strcpy(p->domain, domain);
+	    return;
+	}
+    }
+
+    p = (struct entry *)malloc(sizeof(struct entry));
+    if (!p) goto outofmemory;
+
+    p->next = firstentry;
+    firstentry = p;
+    p->node = malloc(strlen(node)+1);
+    p->domain = malloc(strlen(domain)+1);
+    if (!p->node || !p->domain) goto outofmemory;
+    strcpy(p->node, node);
+    strcpy(p->domain, domain);
+    return;
+
+  outofmemory:
+    fprintf(stderr, "Out of memory\n");
+    exit(1);
+}
+
+/*
+ * Walk through the database, looking for any cases where we know
+ * node FOO is equivalent to node BAR and node BAR has a domain name.
+ * For those cases, give FOO the same domain name as BAR.
+ */
+finish()
+{
+    struct entry *p;
+    char *domain;
+
+    for (p = firstentry; p; p = p->next) {
+	if (!strchr(p->domain, '.') && (domain = lookup(p->domain))) {
+	    remember(p->node, domain);
+	}
+    }
+}
+	    
diff --git a/usr.sbin/sendmail/contrib/converting.sun.configs b/usr.sbin/sendmail/contrib/converting.sun.configs
new file mode 100644
index 00000000000..0fcd9196730
--- /dev/null
+++ b/usr.sbin/sendmail/contrib/converting.sun.configs
@@ -0,0 +1,446 @@
+
+		     Converting Standard Sun Config
+		      Files to Sendmail Version 8
+
+			      Rick McCarty
+			 Texas Instruments Inc.
+		     Latest Update: 08/25/93 - RJMc
+
+This document details the changes necessary to continue using your
+current SunOS sendmail.cf with sendmail version 8.  In the longer term,
+it is recommended that one move to using an m4 based configuration such
+as those shipped with sendmail, but if you're like me and have made
+enough modifications to your .cf file that you'd rather put that task
+off until later, here's the sum total of my experience to get you to
+version 8 with minimal pain.  I'll cover .cf as well as build issues.
+
+Some background - as many are surely aware, Sun has some "special"
+features in the sendmail they ship ($%x, %y LHS lookup, NIS alias DB
+search, etc.).  (Some of those features can be had in alternative forms
+in IDA sendmail, but v8 has picked up some IDA capabilities as well as
+new ones, making it IMHO a most desirable version to go to.)  What I
+will explain below includes v8 functional "equivalences" to these Sun
+sendmail features.
+
+So with that out of the way, let's begin.
+
+First, some assumptions:
+
+	1) I'm going to assume you've got sendmail version 8.6 or
+	   later in hand - if not, grab it from ftp.cs.berkeley.edu
+	   in the ucb/sendmail directory.  There are bugs in earlier
+	   versions which affect some of the needed functionality.
+
+	2) Second, I'm going to detail this based upon the
+	   "sendmail.main.cf" configuration.  (BTW, if you attempt
+	   to move to using an m4 generated config in the future,
+	   MAIL_HUB is the feature which should provide similar
+	   functionality).
+
+	   In general, the changes will be similar for a subsidiary
+	   file, but since we (my TI group) funnel all non-local mail
+	   through our mailhost, we're not as interested in getting v8
+	   to run on such systems and I haven't tried it.
+
+	3) You're using DNS and sendmail.mx.  If you're not, you ought
+	   to be, even if you're also running it along with NIS (which
+	   we do - except for gethostbyxxx() lookups, which I'll be
+	   talking about later).  I would imagine you could get things
+	   running OK without DNS support, but I haven't tried it myself.
+
+	4) You're not mounting /var/spool/mail from other systems.
+	   I haven't found a v8 feature to guarantee this will work
+	   correctly.  Anyway, in the past, we've tried doing that
+	   here and found it to be a rather "ugly" feature, though
+	   Sun ostensibly supports it ("R" option).  Perhaps v8
+	   will one day have a similar feature, but for now, bottom
+	   line, I would recommend against it.
+
+	5) You're not on Solaris or using NIS+.  I'm on 4.1.3.  I've
+	   looked at Solaris briefly and have noted that things are
+	   pretty much similar there except that they've moved some
+	   things into the /etc/mail directory.  I'd guess the
+	   executables aren't functionally all that different from
+	   what they had before - the configs are roughly the same.
+	   So I'd bet most of what I say in here will apply to
+	   Solaris.
+
+OK, let's configure our sendmail.cf!  I'll just go from the top down...
+
+			  VARIOUS DECLARATIONS
+
+1) For v8, you need to define your .cf as AT LEAST a version level 4
+   configuration.  Add the following line:
+
+	V4
+
+   There are some issues regarding certain predefined macros - $w, $j, and
+   $m.  With a V4 configuration:
+
+	$w is defined to be the hostname, which will usually be fully
+	qualified (i.e. "firefly.add.itg.ti.com").
+
+	$j should have the same value as $w.
+
+	$m will be predefined as the domain portion of $w
+	(ex. "add.itg.ti.com").
+
+   One note about this - if your configuration relies on the "w" macro to
+   be the "simple" hostname (as mine does)...
+
+   If the configuration version is 5 or larger:
+
+	$w is supposed to be the "simple" name (ex. "firefly")
+
+	$j should be the fully qualified name (i.e. "firefly.add.itg.ti.com")
+
+	$m will be predefined as the domain portion of $j
+	(ex. "add.itg.ti.com").
+
+   I have not experimented with the various combinations, so I cannot
+   guarantee you that the above definitions will always come out as
+   expected.  Bottom line:  if your sendmail.cf depends on $w being the
+   simple hostname, test it carefully or define the name explicitly,
+   for example:
+
+	Dwfirefly
+
+2) To replace the Sun's "%y" feature, we must use a hostname mapping
+   feature in v8.  If you want to do similar lookups with v8, you need
+   to define the following map (we'll go over the rules that use this
+   map later):
+
+	Khostlookup host -f -m -a.
+
+   This will define a "lookup only" map that is otherwise the same as
+   sendmail version 8's built-in "host" map (see the "Sendmail
+   Installation and Operation Guide" for details on this map.).
+
+   An important note:  Whether or not these lookups will be done via
+   NIS is a function of what gethostbyxxx() functions you link into
+   your sendmail.  DO NOT redefine your host mapping to use NIS
+   explicitly within sendmail - there can be unexpected behaviour if
+   you do so (if you do any canonicalization in your .cf, you can get
+   incorrect results, for one thing).
+
+   For example, DO NOT TRY:
+
+	Khost nis -f -a. hosts.byname
+
+3) If you're doing reverse alias mapping as done in ruleset 22, instead of:
+
+	DZmail.byaddr
+
+   you'll need to declare the following:
+
+	Kaliasrev nis -f -N mail.byaddr
+
+4) If you are doing any other NIS map lookups, you'll need to define the
+   map as done in the below example.  I have a "mailhosts" map, which I
+   use to distinguish between local and non-local hosts.  Look at the
+   sendmail doc for details on this stuff.
+
+	Kmailhosts nis -f -m -a. mailhosts 
+
+5) You might wish to add the following line to support Errors-To: headers.
+   I don't.
+
+	Ol
+
+6) Comment out/remove the following line:
+
+	OR
+
+   The R option means something different under v8 - check the documentation
+   if you're interested in using it.
+
+7) If you're running NIS and have a separate alias map, BELOW the
+   following line where the alias file is declared:
+
+	OA/etc/aliases
+
+   ADD the following:
+
+	OAnis:mail.aliases
+
+   This will set things up so v8 will look at the local alias DB first,
+   then the NIS map, just as Sun sendmail does.
+
+8) Though you don't have to, I'd suggest changing:
+
+	OT3d
+
+   to use v8's warning feature, which allows a warning message to be
+   sent if a message cannot be delivered within a specified period.
+   I use:
+
+	OT5d/4h
+
+   which says - bounce after 5 days, warn after 4 hours.
+
+9) I set the following option to be explicit about how I want DNS
+    handled:
+
+	OI +DNSRCH +DEFNAMES
+
+10) The following line:
+
+	T root daemon uucp
+
+    may be deleted, though it will be ignored if you leave it around.
+
+11) It would probably be good to change the version macro value (which
+    shows up in "Received:" headers) so no one debugging mail problems
+    gets the wrong idea about what config you're running under.  Look
+    for something like:
+
+	DVSMI-4.1
+
+    Mine, for example is:
+
+	DVADD-HUB-2.1
+
+				RULESETS
+
+1)  In ruleset 3, BELOW this rule:
+
+	# basic textual canonicalization
+	R$*<$+>$*		$2			basic RFC822 parsing
+
+
+I add the following rule to remove a trailing dot in the domain spec so
+it won't interfere with v8 mapping features, etc.  (Having a trailing dot is
+not RFC-compliant anyway.):
+
+	R$+.			$1
+
+2) Because ruleset 5 is special in v8, I rename it to S95 and also change
+   all RHS expressions containing ">5" to use ">95" instead.  In v8,
+   5 is executed against addresses which resolve to the local mailer and
+   are not an alias.  If you don't change S5 to something else, you might
+   get a surprise!
+
+3) If you're doing any lookups via the generalized NIS "$%x/$!x"
+   mechanisms (such as with the mailhost map I referred to earlier) it's
+   done differently under v8.  For example:
+
+	DMmailhosts
+	...
+	R$*<@$%M.uucp>$*	$#ether $@$2 $:$1<@$2>$3
+
+   takes a different map definition and two rules under version 8:
+
+	Kmailhosts nis -f -m -a. mailhosts
+	...
+	R$*<@$+.uucp>$*		$: $1<@$(mailhosts $2 $).uucp>$3
+	R$*<@$+..uucp>$*	$#ether $@$2 $:$1<@$2>$3
+
+4) Sun has a special case of the "$%x" feature for host lookups - "%y" is
+   automagically defined to do an NIS "hosts.byname" search with no other
+   definition, as done in the below example:
+
+	R$*<@$%y.LOCAL>$*	$#ether $@$2 $:$1<@$2>$3
+
+   (Sun does this in more than one place.  But the above syntax is almost
+    identical in each - mostly a case of changing names to protect the
+    innocent.)
+
+   In version 8, the predefined "host" map can be used to do essentially
+   the same thing.  (However, whether or not it does an NIS lookup is
+   a function of what gethostbyxxx() functions are linked in.)
+
+   Recall the map definition I mentioned earlier in the DECLARATIONS
+   section:
+
+	Khostlookup host -f -m -a.
+
+   Here's where we will use it.  It will take two rules:
+
+	R$*<@$+.LOCAL>$*	$: $1<@$(hostlookup $2 $).LOCAL>$3
+	R$*<@$+..LOCAL>$*	$#ether $@$2 $:$1<@$2>$3
+
+   Note that this is almost verbatim the same change as was used in the
+   previous "mailhosts" example.
+
+5) Although Sun's default configs don't do this, because I mentioned
+   canonicalization earlier, it deserves an example, as it's illustrative
+   of the functional difference in the map definitions I discussed before.
+   This stuff is also convered in the "Sendmail Installation and Operation
+   Guide".
+
+   Remember the built-in "host" map definition?  As you'll recall, unlike
+   the "hostlookup" map we defined, "host" will actually CHANGE the
+   hostname in addition to appending a dot.  "hostlookup" only appends a
+   dot if the name is found and doesn't change it otherwise.  Anyway,
+   here's the example:
+
+	R$*<@$+>$*	$: $1<@$(host $2 $)>$3		canonicalize
+	R$*<@$+.>$*	$1<@$2>$3			remove trailing dot
+
+   Using the above, say you had input of:
+
+	joe<@tilde>
+
+	OR
+
+	joe<@[128.247.160.56]>
+
+	Assuming "tilde" or the IP address is found, it might be
+        canonicalized as:
+
+	joe<@tilde.csc.ti.com>
+
+6) As another instance of the NIS lookup feature, with a slightly
+   different twist, Sun implements reverse alias mapping in ruleset 22
+   with the below:
+
+	DZmail.byaddr
+	...
+	R$-<@$->		$:$>3${Z$1@$2$}			invert aliases
+
+   To use this feature under v8, change the above rule a (remember to
+   define the alias map as I showed earlier):
+
+	R$-<@$->		$:$>3$(aliasrev $1@$2 $)	invert aliases
+
+
+			   MAILER DEFINITIONS
+
+1) Where "TCP" is defined in the "P=" and "A=" parameters of mailers, I
+   changed it to "IPC".  Version 8 will accept "TCP", but "IPC" is
+   preferred.
+
+2) On all IPC mailers, I also defined "E=\r\n" and added an "L=1000" as
+   in the below example:
+
+	Mether,	P=[IPC], F=mDFMuCX, S=11, R=21, L=1000, E=\r\n, A=IPC $h
+
+   The "E=\r\n" will save you headaches interoperating with such things as
+   VMS TCP products.
+
+   The "L=1000" is for RFC821 compatibility.  Not strictly necessary.
+
+   I also removed the "s" (strip quotes) mailer flag Sun puts in for
+   these mailers.  Stripping quotes violates protocols, which say
+   clearly that you can't touch the local-part (left hand side of
+   the @) until you are on the delivering host.
+
+NOW.  If I haven't left anything out, you should be able to run through
+your Sun sendmail.cf file and convert it to run under v8.
+
+			      BUILD ISSUES
+
+Some important notes on building v8 on SunOS:
+
+Makefile
+
+The default makefile in the version 8 source (src) directory assumes the
+new Berkeley make.  Unless you want to go to the trouble of building it,
+you can use your regular make, but you need to use a different makefile.
+You can use "Makefile.dist" or "Makefile.SunOS" in the src directory.  I
+made changes to get it to build so it is as compatible as possible with
+the file/directory locations Sun uses.  Here are some relevant sections
+out of my makefile:
+
+	CC=gcc
+
+	# use O=-O (usual) or O=-g (debugging)
+	O=	-O
+
+	# define the database mechanisms available for map & alias lookups:
+	#	-DNDBM -- use new DBM
+	#	-DNEWDB -- use new Berkeley DB
+	#	-DNDBM -DNEWDB -DYPCOMPAT -- use both plus YP compatility
+	#	-DNIS -- include client NIS support
+	# The really old (V7) DBM library is no longer supported.
+	# See READ_ME for a description of how these flags interact.
+	#DBMDEF= -DNDBM -DNEWDB
+	DBMDEF=	-DNDBM -DNIS
+
+	# environment definitions (e.g., -D_AIX3)
+	ENVDEF=
+
+	# see also conf.h for additional compilation flags
+
+	# library directories
+	LIBDIRS=-L/usr/local/lib
+
+	# libraries required on your system
+	#LIBS=	-ldb -ldbm
+	LIBS=	-ldbm -lresolv
+
+	# location of sendmail binary (usually /usr/sbin or /usr/lib)
+	BINDIR=	${DESTDIR}/usr/lib
+
+	# location of sendmail.st file (usually /var/log or /usr/lib)
+	STDIR=	${DESTDIR}/etc
+
+	# location of sendmail.hf file (usually /usr/share/misc or /usr/lib)
+	HFDIR=	${DESTDIR}/usr/lib
+
+For the resolver library, you can use the one shipped with Sun if you
+want.  But I'd recommend using another version of the resolver library
+(such as the one with Bind 4.8.3 or 4.9).  Sun's resolver stuff (at
+least with 4.1.x) is quite old - I believe it is of 4.3.1 vintage.  (Do
+you get the impression I don't TRUST what Sun ships with their systems?)
+
+If you want NIS host lookup while maintaining DNS capability, you might
+take a look at resolv+, which has NIS capable gethostbyxxx() functions
+in it.  My recommendation, however, is to avoid doing NIS host lookups
+in sendmail altogether, and to use a "pure" version of the resolver
+library.
+
+There are probably no situations (at least I think so) where it makes
+any sense to link in Sun's NIS gethostbyxxx() functions from libc.
+You could, I guess do it (I haven't tried it) and wind up with a
+sendmail equivalent to the non-mx version Sun ships.  You'd need to
+insure that NAMED_BIND is not defined in the build.  (If you do
+this and have the "-b" DNS passthru option set in NIS, remember that
+while you have some DNS functionality you'll not have any MX support.
+(This, IMO, is what makes this a non-optimal choice.)
+
+		      INSTALLATION/TESTING ISSUES
+
+The sendmail.hf file in the src directory should replace the one currently
+in /usr/lib.  You also might choose to edit it a bit to "localize" what it
+says.
+
+The sendmail executable goes, of course, in /usr/lib in place of the current
+one.  What I did was create a subdirectory in /usr/lib and put all of the
+Sun sendmail stuff in there.  I named the v8 sendmail executable to be
+sendmail.v8.mx and then symbolically linked it to sendmail.
+
+One other thing.  If you use address test mode, keep in mind that
+Version 8 is like IDA in that it does not automatically execute ruleset
+3 first.  So say you're playing around with things testing addresses and
+you're used to things like:
+
+	0 jimbob@good.old.boy.com
+
+under v8 you need to say instead:
+
+	3,0 jimbob@good.old.boy.com
+
+	      INTEROPERABILITY ISSUES YOU MIGHT ENCOUNTER
+
+Be aware that sendmail v8 issues a multi-line SMTP welcome (220)
+response upon a client connection.  Most systems in your network should
+handle it OK, but there are some that choke on it, because whoever wrote
+the clients assumed only a single line.  THIS IS NOT SENDMAIL's FAULT.
+A multi-line 220 response is perfectly valid.  A likely place you'll
+encounter this problem is with non-Un*x SMTP clients.  If you do run
+into it, you should report it to the vendor.
+
+A final note about version 8 - if you follow the above configuration
+scenario, you'll notice it doesn't like to get envelope sender
+addresses it doesn't know how to get back to.  Sun sendmail would take
+anything, even though it might not be able to bounce the message back
+should something happen downstream.  So if another sendmail on a host
+that's not locally known is trying to pump mail through your v8 host,
+the ENVELOPE sender it gives had better be fully qualified.  This is
+a GREAT thing, because it helps clear up problems we've had with not
+being able to get things back to the sender, resulting in an
+overburdened postmaster.
+
+I hope this helps those running Sun sendmail feel more at ease with moving
+on to v8.  It's really worth going to.
diff --git a/usr.sbin/sendmail/contrib/expn.pl b/usr.sbin/sendmail/contrib/expn.pl
new file mode 100644
index 00000000000..a08f8d7e979
--- /dev/null
+++ b/usr.sbin/sendmail/contrib/expn.pl
@@ -0,0 +1,1365 @@
+#!/usr/local/bin/perl
+'di ';
+'ds 00 \\"';
+'ig00 ';
+#
+#       THIS PROGRAM IS ITS OWN MANUAL PAGE.  INSTALL IN man & bin.
+#
+
+# hardcoded constants, should work fine for BSD-based systems
+$AF_INET = 2;
+$SOCK_STREAM = 1;
+$sockaddr = 'S n a4 x8';
+
+# system requirements:
+# 	must have 'nslookup' and 'hostname' programs.
+
+# Header: /home/muir/bin/RCS/expn,v 3.6 1994/02/23 22:26:19 muir Exp muir 
+
+# TODO:
+#	less magic should apply to command-line addresses
+#	less magic should apply to local addresses
+#	add magic to deal with cross-domain cnames
+
+# Checklist: (hard addresses)
+#	250 Kimmo Suominen <"|/usr/local/mh/lib/slocal -user kim"@grendel.tac.nyc.ny.us>
+#	harry@hofmann.cs.Berkeley.EDU -> harry@tenet (.berkeley.edu)  [dead]
+#	bks@cs.berkeley.edu -> shiva.CS (.berkeley.edu)		      [dead]
+#	dan@tc.cornell.edu -> brown@tiberius (.tc.cornell.edu)
+
+#############################################################################
+#
+#  Copyright (c) 1993 David Muir Sharnoff
+#  All rights reserved.
+#
+#  Redistribution and use in source and binary forms, with or without
+#  modification, are permitted provided that the following conditions
+#  are met:
+#  1. Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+#  2. Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#  3. All advertising materials mentioning features or use of this software
+#     must display the following acknowledgement:
+#       This product includes software developed by the David Muir Sharnoff.
+#  4. The name of David Sharnoff may not be used to endorse or promote products
+#     derived from this software without specific prior written permission.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE DAVID MUIR SHARNOFF ``AS IS'' AND
+#  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+#  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+#  ARE DISCLAIMED.  IN NO EVENT SHALL DAVID MUIR SHARNOFF BE LIABLE
+#  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+#  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+#  OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+#  HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+#  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+#  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+#  SUCH DAMAGE.
+#
+# This copyright notice derrived from material copyrighted by the Regents
+# of the University of California.
+#
+# Contributions accepted.
+#
+#############################################################################
+
+# overall structure:
+#	in an effort to not trace each address individually, but rather
+#	ask each server in turn a whole bunch of questions, addresses to
+#	be expanded are queued up.
+#
+#	This means that all account w.r.t. an address must be stored in
+#	various arrays.  Generally these arrays are indexed by the
+#	string "$addr *** $server" where $addr is the address to be
+#	expanded "foo" or maybe "foo@bar" and $server is the hostname
+#	of the SMTP server to contact.
+#
+
+# important global variables:
+#
+# @hosts : list of servers still to be contacted
+# $server : name of the current we are currently looking at
+# @users = $users{@hosts[0]} : addresses to expand at this server
+# $u = $users[0] : the current address being expanded
+# $names{"$users[0] *** $server"} : the 'name' associated with the address
+# $mxbacktrace{"$users[0] *** $server"} : record of mx expansion
+# $mx_secondary{$server} : other mx relays at the same priority
+# $domainify_fallback{"$users[0] *** $server"} : alternative names to try 
+#	instead of $server if $server doesn't work
+# $temporary_redirect{"$users[0] *** $server"} : when trying alternates,
+#	temporarily channel all tries along current path
+# $giveup{$server} : do not bother expanding addresses at $server
+# $verbose : -v
+# $watch : -w
+# $vw : -v or -w
+# $debug : -d
+# $valid : -a
+# $levels : -1
+# S : the socket connection to $server
+
+$have_nslookup = 1;	# we have the nslookup program
+$port = 'smtp';
+$av0 = $0;
+$0 = "$av0 - running hostname";
+$ENV{'PATH'} .= ":/usr/etc" unless $ENV{'PATH'} =~ m,/usr/etc,;
+chop($hostname = `hostname`);
+select(STDERR);
+
+$usage = "Usage: $av0 [-1avwd] user[@host] [user2[host2] ...]";
+$0 = "$av0 - parsing args";
+for $a (@ARGV) {
+	die $usage if $a eq "-";
+	while ($a =~ s/^(-.*)([1avwd])/$1/) {
+		eval '$'."flag_$2 += 1";
+	}
+	next if $a eq "-";
+	die $usage if $a =~ /^-/;
+	&expn(&parse($a,$hostname,undef,1));
+}
+$verbose = $flag_v;
+$watch = $flag_w;
+$vw = $flag_v + $flag_w;
+$debug = $flag_d;
+$valid = $flag_a;
+$levels = $flag_1;
+
+die $usage unless @hosts;
+if ($valid) {
+	if ($valid == 1) {
+		$validRequirement = 0.8;
+	} elsif ($valid == 2) {
+		$validRequirement = 1.0;
+	} elsif ($valid == 3) {
+		$validRequirement = 0.9;
+	} else {
+		$validRequirement = (1 - (1/($valid-3)));
+		print "validRequirement = $validRequirement\n" if $debug;
+	}
+}
+
+$0 = "$av0 - building local socket";
+($name,$aliases,$proto) = getprotobyname('tcp');
+($name,$aliases,$port) = getservbyname($port,'tcp')
+	unless $port =~ /^\d+/;
+($name,$aliases,$type,$len,$thisaddr) = gethostbyname($hostname);
+$this = pack($sockaddr, $AF_INET, 0, $thisaddr);
+
+HOST:
+while (@hosts) {
+	$server = shift(@hosts);
+	@users = split(' ',$users{$server});
+	delete $users{$server};
+
+	# is this server already known to be bad?
+	$0 = "$av0 - looking up $server";
+	if ($giveup{$server}) {
+		&giveup('mx domainify',$giveup{$server});
+		next;
+	}
+
+	# do we already have an mx record for this host?
+	next HOST if &mxredirect($server,*users);
+
+	# look it up, or try for an mx.
+	$0 = "$av0 - gethostbyname($server)";
+
+	($name,$aliases,$type,$len,$thataddr) = gethostbyname($server);
+	# if we can't get an A record, try for an MX record.
+	unless($thataddr) {
+		&mxlookup(1,$server,"$server: could not resolve name",*users);
+		next HOST;
+	}
+				
+	# get a connection, or look for an mx
+	$0 = "$av0 - socket to $server";
+	$that = pack($sockaddr, $AF_INET, $port, $thataddr);
+	socket(S, $AF_INET, $SOCK_STREAM, $proto)
+		|| die "socket: $!";
+	$0 = "$av0 - bind to $server";
+	bind(S, $this) 
+		|| die "bind $hostname,0: $!";
+	$0 = "$av0 - connect to $server";
+	print "debug = $debug server = $server\n" if $debug > 8;
+	if (! connect(S, $that) || ($debug == 10 && $server =~ /relay\d.UU.NET$/i)) {
+		$0 = "$av0 - $server: could not connect: $!\n";
+		$emsg = $!;
+		unless (&mxlookup(0,$server,"$server: could not connect: $!",*users)) {
+			&giveup('mx',"$server: Could not connect: $emsg");
+		}
+		next HOST;
+	}
+	select((select(S),$| = 1)[0]); # don't buffer output to S
+
+	# read the greeting
+	$0 = "$av0 - talking to $server";
+	&alarm("greeting with $server",'');
+	while(<S>) {
+		alarm(0);
+		print if $watch;
+		if (/^(\d+)([- ])/) {
+			if ($1 != 220) {
+				$0 = "$av0 - bad numeric responce from $server";
+				&alarm("giving up after bet responce from $server",'');
+				&read_response($2,$watch);
+				alarm(0);
+				print STDERR "$server: NOT 220 greeting: $_"
+					if ($debug || $vw);
+				if (&mxlookup(0,$server,"$server: did not respond with a 220 greeting",*users)) {
+					close(S);
+					next HOST;
+				}
+			}
+			last if ($2 eq " ");
+		} else {
+			$0 = "$av0 - bad responce from $server";
+			print STDERR "$server: NOT 220 greeting: $_"
+				if ($debug || $vw);
+			unless (&mxlookup(0,$server,"$server: did not respond with SMTP codes",*users)) {
+				&giveup('',"$server: did not talk SMTP");
+			}
+			close(S);
+			next HOST;
+		}
+		&alarm("greeting with $server",'');
+	}
+	alarm(0);
+	
+	# if this causes problems, remove it
+	$0 = "$av0 - sending helo to $server";
+	&alarm("sending helo to $server","");
+	&ps("helo $hostname");
+	while(<S>) {
+		print if $watch;
+		last if /^\d+ /;
+	}
+	alarm(0);
+
+	# try the users, one by one
+	USER:
+	while(@users) {
+		$u = shift(@users);
+		$0 = "$av0 - expanding $u [\@$server]";
+
+		# do we already have a name for this user?
+		$oldname = $names{"$u *** $server"};
+
+		print &compact($u,$server)." ->\n" if ($verbose && ! $valid);
+		if ($valid) {
+			#
+			# when running with -a, we delay taking any action 
+			# on the results of our query until we have looked
+			# at the complete output.  @toFinal stores expansions
+			# that will be final if we take them.  @toExpn stores
+			# expnansions that are not final.  @isValid keeps
+			# track of our ability to send mail to each of the
+			# expansions.
+			#
+			@isValid = ();
+			@toFinal = ();
+			@toExpn = ();
+		}
+
+		($ecode,@expansion) = &expn_vrfy($u,$server);
+		if ($ecode) {
+			&giveup('',$ecode,$u);
+			last USER;
+		}
+
+		for $s (@expansion) {
+			$s =~ s/[\n\r]//g;
+			$0 = "$av0 - parsing $server: $s";
+
+			$skipwatch = $watch;
+
+			if ($s =~ /^[25]51([- ]).*<(.+)>/) {
+				print "$s" if $watch;
+				print "(pretending 250$1<$2>)" if ($debug && $watch);
+				print "\n" if $watch;
+				$s = "250$1<$2>";
+				$skipwatch = 0;
+			}
+
+			if ($s =~ /^250([- ])(.+)/) {
+				print "$s\n" if $skipwatch;
+				($done,$addr) = ($1,$2);
+				($newhost, $newaddr, $newname) =  &parse($addr,$server,$oldname, $#expansion == 0);
+				print "($newhost, $newaddr, $newname) = &parse($addr, $server, $oldname)\n" if $debug;
+				if (! $newhost) {
+					# no expansion is possible w/o a new server to call
+					if ($valid) {
+						push(@isValid, &validAddr($newaddr));
+						push(@toFinal,$newaddr,$server,$newname);
+					} else {
+						&verbose(&final($newaddr,$server,$newname));
+					}
+				} else {
+					$newmxhost = &mx($newhost,$newaddr);
+					print "$newmxhost = &mx($newhost)\n" 
+						if ($debug && $newhost ne $newmxhost);
+					$0 = "$av0 - parsing $newaddr [@$newmxhost]";
+					print "levels = $levels, level{$u *** $server} = ".$level{"$u *** $server"}."\n" if ($debug > 1);
+					# If the new server is the current one, 
+					# it would have expanded things for us
+					# if it could have.  Mx records must be
+					# followed to compare server names.
+					# We are also done if the recursion
+					# count has been exceeded.
+					if (&trhost($newmxhost) eq &trhost($server) || ($levels && $level{"$u *** $server"} >= $levels)) {
+						if ($valid) {
+							push(@isValid, &validAddr($newaddr));
+							push(@toFinal,$newaddr,$newmxhost,$newname);
+						} else {
+							&verbose(&final($newaddr,$newmxhost,$newname));
+						}
+					} else {
+						# more work to do...
+						if ($valid) {
+							push(@isValid, &validAddr($newaddr));
+							push(@toExpn,$newmxhost,$newaddr,$newname,$level{"$u *** $server"});
+						} else {
+							&verbose(&expn($newmxhost,$newaddr,$newname,$level{"$u *** $server"}));
+						}
+					}
+				}
+				last if ($done eq " ");
+				next;
+			}
+			# 550 is a known code...  Should the be
+			# included in -a output?  Might be a bug
+			# here.  Does it matter?  Can assume that
+			# there won't be UNKNOWN USER responces 
+			# mixed with valid users?
+			if ($s =~ /^(550)([- ])/) {
+				if ($valid) {
+					print STDERR "\@$server:$u ($oldname) USER UNKNOWN\n";
+				} else {
+					&verbose(&final($u,$server,$oldname,"USER UNKNOWN"));
+				}
+				last if ($2 eq " ");
+				next;
+			} 
+			# 553 is a known code...  
+			if ($s =~ /^(553)([- ])/) {
+				if ($valid) {
+					print STDERR "\@$server:$u ($oldname) USER AMBIGUOUS\n";
+				} else {
+					&verbose(&final($u,$server,$oldname,"USER AMBIGUOUS"));
+				}
+				last if ($2 eq " ");
+				next;
+			} 
+			# 252 is a known code...  
+			if ($s =~ /^(252)([- ])/) {
+				if ($valid) {
+					print STDERR "\@$server:$u ($oldname) REFUSED TO VRFY\n";
+				} else {
+					&verbose(&final($u,$server,$oldname,"REFUSED TO VRFY"));
+				}
+				last if ($2 eq " ");
+				next;
+			} 
+			&giveup('',"$server: did not grok '$s'",$u);
+			last USER;
+		}
+
+		if ($valid) {
+			#
+			# now we decide if we are going to take these
+			# expansions or roll them back.
+			#
+			$avgValid = &average(@isValid);
+			print "avgValid = $avgValid\n" if $debug;
+			if ($avgValid >= $validRequirement) {
+				print &compact($u,$server)." ->\n" if $verbose;
+				while (@toExpn) {
+					&verbose(&expn(splice(@toExpn,0,4)));
+				}
+				while (@toFinal) {
+					&verbose(&final(splice(@toFinal,0,3)));
+				}
+			} else {
+				print "Tossing some valid to avoid invalid ".&compact($u,$server)."\n" if ($avgValid > 0.0 && ($vw || $debug));
+				print &compact($u,$server)." ->\n" if $verbose;
+				&verbose(&final($u,$server,$newname));
+			}
+		}
+	}
+
+	&alarm("sending 'quit' to $server",'');
+	$0 = "$av0 - sending 'quit' to $server";
+	&ps("quit");
+	while(<S>) {
+		print if $watch;
+		last if /^\d+ /;
+	}
+	close(S);
+	alarm(0);
+}
+
+$0 = "$av0 - printing final results";
+print "----------\n" if $vw;
+select(STDOUT);
+for $f (sort @final) {
+	print "$f\n";
+}
+unlink("/tmp/expn$$");
+exit(0);
+
+
+# abandon all attempts deliver to $server
+# register the current addresses as the final ones
+sub giveup
+{
+	local($redirect_okay,$reason,$user) = @_;
+	local($us,@so,$nh,@remaining_users);
+
+	$0 = "$av0 - giving up on $server: $reason";
+	#
+	# add back a user if we gave up in the middle
+	#
+	push(@users,$user) if $user;
+	#
+	# don't bother with this system anymore
+	#
+	unless ($giveup{$server}) {
+		$giveup{$server} = $reason;
+		print STDERR "$reason\n";
+	}
+	print "Giveup!!! redirect okay = $redirect_okay; $reason\n" if $debug;
+	#
+	# Wait!
+	# Before giving up, see if there is a chance that
+	# there is another host to redirect to!
+	# (Kids, don't do this at home!  Hacking is a dangerous
+	# crime and you could end up behind bars.)
+	#
+	for $u (@users) {
+		if ($redirect_okay =~ /\bmx\b/) {
+			next if &try_fallback('mx',$u,*server,
+				*mx_secondary,
+				*already_mx_fellback);
+		}
+		if ($redirect_okay =~ /\bdomainify\b/) {
+			next if &try_fallback('domainify',$u,*server,
+				*domainify_fallback,
+				*already_domainify_fellback);
+		}
+		push(@remaining_users,$u);
+	}
+	@users = @remaining_users;
+	for $u (@users) {
+		print &compact($u,$server)." ->\n" if ($verbose && $valid && $u);
+		&verbose(&final($u,$server,$names{"$u *** $server"},$reason));
+	}
+}
+#
+# This routine is used only within &giveup.  It checks to
+# see if we really have to giveup or if there is a second
+# chance because we did something before that can be 
+# backtracked.
+#
+# %fallback{"$user *** $host"} tracks what is able to fallback
+# %fellback{"$user *** $host"} tracks what has fallen back
+#
+# If there is a valid backtrack, then queue up the new possibility
+#
+sub try_fallback
+{
+	local($method,$user,*host,*fall_table,*fellback) = @_;
+	local($us,$fallhost,$oldhost,$ft,$i);
+
+	if ($debug > 8) {
+		print "Fallback table $method:\n";
+		for $i (sort keys %fall_table) {
+			print "\t'$i'\t\t'$fall_table{$i}'\n";
+		}
+		print "Fellback table $method:\n";
+		for $i (sort keys %fellback) {
+			print "\t'$i'\t\t'$fellback{$i}'\n";
+		}
+		print "U: $user H: $host\n";
+	}
+	
+	$us = "$user *** $host";
+	if (defined $fellback{$us}) {
+		#
+		# Undo a previous fallback so that we can try again
+		# Nest fallbacks are avoided because they could
+		# lead to infinite loops
+		#
+		$fallhost = $fellback{$us};
+		print "Already $method fell back from $us -> \n" if $debug;
+		$us = "$user *** $fallhost";
+		$oldhost = $fallhost;
+	} elsif (($method eq 'mx') && (defined $mxbacktrace{$us}) && (defined $mx_secondary{$mxbacktrace{$us}})) {
+		print "Fallback an MX expansion $us -> \n" if $debug;
+		$oldhost = $mxbacktrace{$us};
+	} else {
+		print "Oldhost($host, $us) = " if $debug;
+		$oldhost = $host;
+	}
+	print "$oldhost\n" if $debug;
+	if (((defined $fall_table{$us}) && ($ft = $us)) || ((defined $fall_table{$oldhost}) && ($ft = $oldhost))) {
+		print "$method Fallback = ".$fall_table{$ft}."\n" if $debug;
+		local(@so,$newhost);
+		@so = split(' ',$fall_table{$ft});
+		$newhost = shift(@so);
+		print "Falling back ($method) $us -> $newhost (from $oldhost)\n" if $debug;
+		if ($method eq 'mx') {
+			if (! defined ($mxbacktrace{"$user *** $newhost"})) {
+				if (defined $mxbacktrace{"$user *** $oldhost"}) {
+					print "resetting oldhost $oldhost to the original: " if $debug;
+					$oldhost = $mxbacktrace{"$user *** $oldhost"};
+					print "$oldhost\n" if $debug;
+				}
+				$mxbacktrace{"$user *** $newhost"} = $oldhost;
+				print "mxbacktrace $user *** $newhost -> $oldhost\n" if $debug;
+			}
+			$mx{&trhost($oldhost)} = $newhost;
+		} else {
+			$temporary_redirect{$us} = $newhost;
+		}
+		if (@so) {
+			print "Can still $method  $us: @so\n" if $debug;
+			$fall_table{$ft} = join(' ',@so);
+		} else {
+			print "No more fallbacks for $us\n" if $debug;
+			delete $fall_table{$ft};
+		}
+		if (defined $create_host_backtrack{$us}) {
+			$create_host_backtrack{"$user *** $newhost"} 
+				= $create_host_backtrack{$us};
+		}
+		$fellback{"$user *** $newhost"} = $oldhost;
+		&expn($newhost,$user,$names{$us},$level{$us});
+		return 1;
+	}
+	delete $temporary_redirect{$us};
+	$host = $oldhost;
+	return 0;
+}
+# return 1 if you could send mail to the address as is.
+sub validAddr
+{
+	local($addr) = @_;
+	$res = &do_validAddr($addr);
+	print "validAddr($addr) = $res\n" if $debug;
+	$res;
+}
+sub do_validAddr
+{
+	local($addr) = @_;
+	local($urx) = "[-A-Za-z_.0-9+]+";
+
+	# \u
+	return 0 if ($addr =~ /^\\/);
+	# ?@h
+	return 1 if ($addr =~ /.\@$urx$/);
+	# @h:?
+	return 1 if ($addr =~ /^\@$urx\:./);
+	# h!u
+	return 1 if ($addr =~ /^$urx!./);
+	# u
+	return 1 if ($addr =~ /^$urx$/);
+	# ?
+	print "validAddr($addr) = ???\n" if $debug;
+	return 0;
+}
+# Some systems use expn and vrfy interchangeably.  Some only
+# implement one or the other.  Some check expn against mailing
+# lists and vrfy against users.  It doesn't appear to be
+# consistent.
+#
+# So, what do we do?  We try everything!
+#
+#
+# Ranking of result codes: good: 250, 251/551, 252, 550, anything else
+#
+# Ranking of inputs: best: user@host.domain, okay: user
+#
+# Return value: $error_string, @responces_from_server
+sub expn_vrfy
+{
+	local($u,$server) = @_;
+	local(@c) = ('expn', 'vrfy');
+	local(@try_u) = $u;
+	local(@ret,$code);
+
+	if (($u =~ /(.+)@(.+)/) && (&trhost($2) eq &trhost($server))) {
+		push(@try_u,$1);
+	}
+
+	TRY:
+	for $c (@c) {
+		for $try_u (@try_u) {
+			&alarm("$c'ing $try_u on $server",'',$u);
+			&ps("$c $try_u");
+			alarm(0);
+			$s = <S>;
+			if ($s eq '') {
+				return "$server: lost connection";
+			}
+			if ($s !~ /^(\d+)([- ])/) {
+				return "$server: garbled reply to '$c $try_u'";
+			}
+			if ($1 == 250) {
+				$code = 250;
+				@ret = ("",$s);
+				push(@ret,&read_response($2,$debug));
+				return @ret;
+			} 
+			if ($1 == 551 || $1 == 251) {
+				$code = $1;
+				@ret = ("",$s);
+				push(@ret,&read_response($2,$debug));
+				next;
+			}
+			if ($1 == 252 && ($code == 0 || $code == 550)) {
+				$code = 252;
+				@ret = ("",$s);
+				push(@ret,&read_response($2,$watch));
+				next;
+			}
+			if ($1 == 550 && $code == 0) {
+				$code = 550;
+				@ret = ("",$s);
+				push(@ret,&read_response($2,$watch));
+				next;
+			}
+			&read_response($2,$watch);
+		}
+	}
+	return "$server: expn/vrfy not implemented" unless @ret;
+	return @ret;
+}
+# sometimes the old parse routine (now parse2) didn't
+# reject funky addresses. 
+sub parse
+{
+	local($oldaddr,$server,$oldname,$one_to_one) = @_;
+	local($newhost, $newaddr, $newname, $um) =  &parse2($oldaddr,$server,$oldname,$one_to_one);
+	if ($newaddr =~ m,^["/],) {
+		return (undef, $oldaddr, $newname) if $valid;
+		return (undef, $um, $newname);
+	}
+	return ($newhost, $newaddr, $newname);
+}
+
+# returns ($new_smtp_server,$new_address,$new_name)
+# given a responce from a SMTP server ($newaddr), the 
+# current host ($server), the old "name" and a flag that
+# indicates if it is being called during the initial 
+# command line parsing ($parsing_args)
+sub parse2
+{
+	local($newaddr,$context_host,$old_name,$parsing_args) = @_;
+	local(@names) = $old_name;
+	local($urx) = "[-A-Za-z_.0-9+]+";
+	local($unmangle);
+
+	#
+	# first, separate out the address part.
+	#
+
+	#
+	# [NAME] <ADDR [(NAME)]>
+	# [NAME] <[(NAME)] ADDR
+	# ADDR [(NAME)]
+	# (NAME) ADDR
+	# [(NAME)] <ADDR>
+	#
+	if ($newaddr =~ /^\<(.*)\>$/) {
+		print "<A:$1>\n" if $debug;
+		$newaddr = &trim($1);
+		print "na = $newaddr\n" if $debug;
+	}
+	if ($newaddr =~ /^([^\<\>]*)\<([^\<\>]*)\>([^\<\>]*)$/) {
+		# address has a < > pair in it.
+		print "N:$1 <A:$2> N:$3\n" if $debug;
+		$newaddr = &trim($2);
+		unshift(@names, &trim($3,$1));
+		print "na = $newaddr\n" if $debug;
+	}
+	if ($newaddr =~ /^([^\(\)]*)\(([^\(\)]*)\)([^\(\)]*)$/) {
+		# address has a ( ) pair in it.
+		print "A:$1 (N:$2) A:$3\n" if $debug;
+		unshift(@names,&trim($2));
+		local($f,$l) = (&trim($1),&trim($3));
+		if (($f && $l) || !($f || $l)) {
+			# address looks like:
+			# foo (bar) baz  or (bar)
+			# not allowed!
+			print STDERR "Could not parse $newaddr\n" if $vw;
+			return(undef,$newaddr,&firstname(@names));
+		}
+		$newaddr = $f if $f;
+		$newaddr = $l if $l;
+		print "newaddr now = $newaddr\n" if $debug;
+	}
+	#
+	# @foo:bar
+	# j%k@l
+	# a@b
+	# b!a
+	# a
+	#
+	$unmangle = $newaddr;
+	if ($newaddr =~ /^\@($urx)\:(.+)$/) {
+		print "(\@:)" if $debug;
+		# this is a bit of a cheat, but it seems necessary
+		return (&domainify($1,$context_host,$2),$2,&firstname(@names),$unmangle);
+	}
+	if ($newaddr =~ /^(.+)\@($urx)$/) {
+		print "(\@)" if $debug;
+		return (&domainify($2,$context_host,$newaddr),$newaddr,&firstname(@names),$unmangle);
+	}
+	if ($parsing_args) {
+		if ($newaddr =~ /^($urx)\!(.+)$/) {
+			return (&domainify($1,$context_host,$newaddr),$newaddr,&firstname(@names),$unmangle);
+		}
+		if ($newaddr =~ /^($urx)$/) {
+			return ($context_host,$newaddr,&firstname(@names),$unmangle);
+		}
+		print STDERR "Could not parse $newaddr\n";
+	}
+	print "(?)" if $debug;
+	return(undef,$newaddr,&firstname(@names),$unmangle);
+}
+# return $u (@$server) unless $u includes reference to $server
+sub compact
+{
+	local($u, $server) = @_;
+	local($se) = $server;
+	local($sp);
+	$se =~ s/(\W)/\\$1/g;
+	$sp = " (\@$server)";
+	if ($u !~ /$se/i) {
+		return "$u$sp";
+	}
+	return $u;
+}
+# remove empty (spaces don't count) members from an array
+sub trim
+{
+	local(@v) = @_;
+	local($v,@r);
+	for $v (@v) {
+		$v =~ s/^\s+//;
+		$v =~ s/\s+$//;
+		push(@r,$v) if ($v =~ /\S/);
+	}
+	return(@r);
+}
+# using the host part of an address, and the server name, add the
+# servers' domain to the address if it doesn't already have a 
+# domain.  Since this sometimes failes, save a back reference so
+# it can be unrolled.
+sub domainify
+{
+	local($host,$domain_host,$u) = @_;
+	local($domain,$newhost);
+
+	# cut of trailing dots 
+	$host =~ s/\.$//;
+	$domain_host =~ s/\.$//;
+
+	if ($domain_host !~ /\./) {
+		#
+		# domain host isn't, keep $host whatever it is
+		#
+		print "domainify($host,$domain_host) = $host\n" if $debug;
+		return $host;
+	}
+
+	# 
+	# There are several weird situtations that need to be 
+	# accounted for.  They have to do with domain relay hosts.
+	#
+	# Examples: 
+	#	host		server		"right answer"
+	#	
+	#	shiva.cs	cs.berkeley.edu	shiva.cs.berkeley.edu
+	#	shiva		cs.berkeley.edu	shiva.cs.berekley.edu
+	#	cumulus		reed.edu	@reed.edu:cumulus.uucp
+	# 	tiberius	tc.cornell.edu	tiberius.tc.cornell.edu
+	#
+	# The first try must always be to cut the domain part out of 
+	# the server and tack it onto the host.
+	#
+	# A reasonable second try is to tack the whole server part onto
+	# the host and for each possible repeated element, eliminate 
+	# just that part.
+	#
+	# These extra "guesses" get put into the %domainify_fallback
+	# array.  They will be used to give addresses a second chance
+	# in the &giveup routine
+	#
+
+	local(%fallback);
+
+	local($long); 
+	$long = "$host $domain_host";
+	$long =~ tr/A-Z/a-z/;
+	print "long = $long\n" if $debug;
+	if ($long =~ s/^([^ ]+\.)([^ ]+) \2(\.[^ ]+\.[^ ]+)/$1$2$3/) {
+		# matches shiva.cs cs.berkeley.edu and returns shiva.cs.berkeley.edu
+		print "condensed fallback $host $domain_host -> $long\n" if $debug;
+		$fallback{$long} = 9;
+	}
+
+	local($fh);
+	$fh = $domain_host;
+	while ($fh =~ /\./) {
+		print "FALLBACK $host.$fh = 1\n" if $debug > 7;
+		$fallback{"$host.$fh"} = 1;
+		$fh =~ s/^[^\.]+\.//;
+	}
+
+	$fallback{"$host.$domain_host"} = 2;
+
+	($domain = $domain_host) =~ s/^[^\.]+//;
+	$fallback{"$host$domain"} = 6
+		if ($domain =~ /\./);
+
+	if ($host =~ /\./) {
+		#
+		# Host is already okay, but let's look for multiple
+		# interpretations
+		#
+		print "domainify($host,$domain_host) = $host\n" if $debug;
+		delete $fallback{$host};
+		$domainify_fallback{"$u *** $host"} = join(' ',sort {$fallback{$b} <=> $fallback{$a};} keys %fallback) if %fallback;
+		return $host;
+	}
+
+	$domain = ".$domain_host"
+		if ($domain !~ /\..*\./);
+	$newhost = "$host$domain";
+
+	$create_host_backtrack{"$u *** $newhost"} = $domain_host;
+	print "domainify($host,$domain_host) = $newhost\n" if $debug;
+	delete $fallback{$newhost};
+	$domainify_fallback{"$u *** $newhost"} = join(' ',sort {$fallback{$b} <=> $fallback{$a};} keys %fallback) if %fallback;
+	if ($debug) {
+		print "fallback = ";
+		print $domainify_fallback{"$u *** $newhost"} 
+			if defined($domainify_fallback{"$u *** $newhost"});
+		print "\n";
+	}
+	return $newhost;
+}
+# return the first non-empty element of an array
+sub firstname
+{
+	local(@names) = @_;
+	local($n);
+	while(@names) {
+		$n = shift(@names);
+		return $n if $n =~ /\S/;
+	}
+	return undef;
+}
+# queue up more addresses to expand
+sub expn
+{
+	local($host,$addr,$name,$level) = @_;
+	if ($host) {
+		$host = &trhost($host);
+
+		if (($debug > 3) || (defined $giveup{$host})) {
+			unshift(@hosts,$host) unless $users{$host};
+		} else {
+			push(@hosts,$host) unless $users{$host};
+		}
+		$users{$host} .= " $addr";
+		$names{"$addr *** $host"} = $name;
+		$level{"$addr *** $host"} = $level + 1;
+		print "expn($host,$addr,$name)\n" if $debug;
+		return "\t$addr\n";
+	} else {
+		return &final($addr,'NONE',$name);
+	}
+}
+# compute the numerical average value of an array
+sub average
+{
+	local(@e) = @_;
+	return 0 unless @e;
+	local($e,$sum);
+	for $e (@e) {
+		$sum += $e;
+	}
+	$sum / @e;
+}
+# print to the server (also to stdout, if -w)
+sub ps
+{
+	local($p) = @_;
+	print ">>> $p\n" if $watch;
+	print S "$p\n";
+}
+# return case-adjusted name for a host (for comparison purposes)
+sub trhost 
+{
+	# treat foo.bar as an alias for Foo.BAR
+	local($host) = @_;
+	local($trhost) = $host;
+	$trhost =~ tr/A-Z/a-z/;
+	if ($trhost{$trhost}) {
+		$host = $trhost{$trhost};
+	} else {
+		$trhost{$trhost} = $host;
+	}
+	$trhost{$trhost};
+}
+# re-queue users if an mx record dictates a redirect
+# don't allow a user to be redirected more than once
+sub mxredirect
+{
+	local($server,*users) = @_;
+	local($u,$nserver,@still_there);
+
+	$nserver = &mx($server);
+
+	if (&trhost($nserver) ne &trhost($server)) {
+		$0 = "$av0 - mx redirect $server -> $nserver\n";
+		for $u (@users) {
+			if (defined $mxbacktrace{"$u *** $nserver"}) {
+				push(@still_there,$u);
+			} else {
+				$mxbacktrace{"$u *** $nserver"} = $server;
+				print "mxbacktrace{$u *** $nserver} = $server\n"
+					if ($debug > 1);
+				&expn($nserver,$u,$names{"$u *** $server"});
+			}
+		}
+		@users = @still_there;
+		if (! @users) {
+			return $nserver;
+		} else {
+			return undef;
+		}
+	}
+	return undef;
+}
+# follow mx records, return a hostname
+# also follow temporary redirections comming from &domainify and
+# &mxlookup
+sub mx
+{
+	local($h,$u) = @_;
+
+	for (;;) {
+		if (defined $mx{&trhost($h)} && $h ne $mx{&trhost($h)}) {
+			$0 = "$av0 - mx expand $h";
+			$h = $mx{&trhost($h)};
+			return $h;
+		}
+		if ($u) {
+			if (defined $temporary_redirect{"$u *** $h"}) {
+				$0 = "$av0 - internal redirect $h";
+				print "Temporary redirect taken $u *** $h -> " if $debug;
+				$h = $temporary_redirect{"$u *** $h"};
+				print "$h\n" if $debug;
+				next;
+			}
+			$htr = &trhost($h);
+			if (defined $temporary_redirect{"$u *** $htr"}) {
+				$0 = "$av0 - internal redirect $h";
+				print "temporary redirect taken $u *** $h -> " if $debug;
+				$h = $temporary_redirect{"$u *** $htr"};
+				print "$h\n" if $debug;
+				next;
+			}
+		}
+		return $h;
+	}
+}
+# look up mx records with the name server.
+# re-queue expansion requests if possible
+# optionally give up on this host.
+sub mxlookup 
+{
+	local($lastchance,$server,$giveup,*users) = @_;
+	local(*T);
+	local(*NSLOOKUP);
+	local($nh, $pref,$cpref);
+	local($o0) = $0;
+	local($nserver);
+	local($name,$aliases,$type,$len,$thataddr);
+	local(%fallback);
+
+	return 1 if &mxredirect($server,*users);
+
+	if ((defined $mx{$server}) || (! $have_nslookup)) {
+		return 0 unless $lastchance;
+		&giveup('mx domainify',$giveup);
+		return 0;
+	}
+
+	$0 = "$av0 - nslookup of $server";
+	open(T,">/tmp/expn$$") || die "open > /tmp/expn$$: $!\n";
+	print T "set querytype=MX\n";
+	print T "$server\n";
+	close(T);
+	$cpref = 1.0E12;
+	undef $nserver;
+	open(NSLOOKUP,"nslookup < /tmp/expn$$ 2>&1 |") || die "open nslookup: $!";
+	while(<NSLOOKUP>) {
+		print if ($debug > 2);
+		if (/mail exchanger = ([-A-Za-z_.0-9+]+)/) {
+			$nh = $1;
+			if (/preference = (\d+)/) {
+				$pref = $1;
+				if ($pref < $cpref) {
+					$nserver = $nh;
+					$cpref = $pref;
+				} elsif ($pref) {
+					$fallback{$pref} .= " $nh";
+				}
+			}
+		}
+		if (/Non-existent domain/) {
+			#
+			# These addresss are hosed.  Kaput!  Dead! 
+			# However, if we created the address in the
+			# first place then there is a chance of 
+			# salvation.
+			#
+			1 while(<NSLOOKUP>);	
+			close(NSLOOKUP);
+			return 0 unless $lastchance;
+			&giveup('domainify',"$server: Non-existent domain",undef,1);
+			return 0;	
+		}
+				
+	}
+	close(NSLOOKUP);
+	unlink("/tmp/expn$$");
+	unless ($nserver) {
+		$0 = "$o0 - finished mxlookup";
+		return 0 unless $lastchance;
+		&giveup('mx domainify',"$server: Could not resolve address");
+		return 0;
+	}
+
+	# provide fallbacks in case $nserver doesn't work out
+	if (defined $fallback{$cpref}) {
+#		for $u (@users) {
+#			print "mx_secondary{$u *** $nserver} = ".$fallback{$cpref}."\n"
+#				if $debug;
+#			$mx_secondary{"$u *** $nserver"} = $fallback{$cpref};
+#		}
+		$mx_secondary{$server} = $fallback{$cpref};
+	}
+
+	$0 = "$av0 - gethostbyname($nserver)";
+	($name,$aliases,$type,$len,$thataddr) = gethostbyname($nserver);
+
+	unless ($thataddr) {
+		$0 = $o0;
+		return 0 unless $lastchance;
+		&giveup('mx domainify',"$nserver: could not resolve address");
+		return 0;
+	}
+	print "MX($server) = $nserver\n" if $debug;
+	print "$server -> $nserver\n" if $vw && !$debug;
+	$mx{&trhost($server)} = $nserver;
+	# redeploy the users
+	unless (&mxredirect($server,*users)) {
+		return 0 unless $lastchance;
+		&giveup('mx domainify',"$nserver: only one level of mx redirect allowed");
+		return 0;
+	}
+	$0 = "$o0 - finished mxlookup";
+	return 1;
+}
+# if mx expansion did not help to resolve an address
+# (ie: foo@bar became @baz:foo@bar, then undo the 
+# expansion).
+# this is only used by &final
+sub mxunroll
+{
+	local(*host,*addr) = @_;
+	local($r) = 0;
+	print "looking for mxbacktrace{$addr *** $host}\n"
+		if ($debug > 1);
+	while (defined $mxbacktrace{"$addr *** $host"}) {
+		print "Unrolling MX expnasion: \@$host:$addr -> " 
+			if ($debug || $verbose);
+		$host = $mxbacktrace{"$addr *** $host"};
+		print "\@$host:$addr\n" 
+			if ($debug || $verbose);
+		$r = 1;
+	}
+	return 1 if $r;
+	$addr = "\@$host:$addr"
+		if ($host =~ /\./);
+	return 0;
+}
+# register a completed expnasion.  Make the final address as 
+# simple as possible.
+sub final
+{
+	local($addr,$host,$name,$error) = @_;
+	local($he);
+	local($hb,$hr);
+	local($au,$ah);
+
+	if ($error =~ /Non-existent domain/) {
+		# 
+		# If we created the domain, then let's undo the
+		# damage...
+		#
+		if (defined $create_host_backtrack{"$addr *** $host"}) {
+			while (defined $create_host_backtrack{"$addr *** $host"}) {
+				print "Un&domainifying($host) = " if $debug;
+				$host = $create_host_backtrack{"$addr *** $host"};
+				print "$host\n" if $debug;
+			}
+			$error = "$host: could not locate";
+		} else {
+			# 
+			# If we only want valid addresses, toss out
+			# bad host names.
+			#
+			if ($valid) {
+				print STDERR "\@$host:$addr ($name) Non-existent domain\n";
+				return "";
+			}
+		}
+	}
+
+	MXUNWIND: {
+		$0 = "$av0 - final parsing of \@$host:$addr";
+		($he = $host) =~ s/(\W)/\\$1/g;
+		if ($addr !~ /@/) {
+			# addr does not contain any host
+			$addr = "$addr@$host";
+		} elsif ($addr !~ /$he/i) {
+			# if host part really something else, use the something
+			# else.
+			if ($addr =~ m/(.*)\@([^\@]+)$/) {
+				($au,$ah) = ($1,$2);
+				print "au = $au ah = $ah\n" if $debug;
+				if (defined $temporary_redirect{"$addr *** $ah"}) {
+					$addr = "$au\@".$temporary_redirect{"$addr *** $ah"};
+					print "Rewrite! to $addr\n" if $debug;
+					next MXUNWIND;
+				}
+			}
+			# addr does not contain full host
+			if ($valid) {
+				if ($host =~ /^([^\.]+)(\..+)$/) {
+					# host part has a . in it - foo.bar
+					($hb, $hr) = ($1, $2);
+					if ($addr =~ /\@([^\.\@]+)$/ && ($1 eq $hb)) {
+						# addr part has not . 
+						# and matches beginning of
+						# host part -- tack on a 
+						# domain name.
+						$addr .= $hr;
+					} else {
+						&mxunroll(*host,*addr) 
+							&& redo MXUNWIND;
+					}
+				} else {
+					&mxunroll(*host,*addr) 
+						&& redo MXUNWIND;
+				}
+			} else {
+				$addr = "${addr}[\@$host]"
+					if ($host =~ /\./);
+			}
+		}
+	}
+	$name = "$name " if $name;
+	$error = " $error" if $error;
+	if ($valid) {
+		push(@final,"$name<$addr>");
+	} else {
+		push(@final,"$name<$addr>$error");
+	}
+	"\t$name<$addr>$error\n";
+}
+
+sub alarm
+{
+	local($alarm_action,$alarm_redirect,$alarm_user) = @_;
+	alarm(3600);
+	$SIG{ALRM} = 'handle_alarm';
+}
+# this involves one GREAT hack.
+# the "next HOST" has to unwind the stack!
+sub handle_alarm
+{
+	&giveup($alarm_redirect,"Timed out during $alarm_action",$alarm_user);
+	next HOST;
+}
+
+# read the rest of the current smtp daemon's responce (and toss it away)
+sub read_response
+{
+	local($done,$watch) = @_;
+	local(@resp);
+	print $s if $watch;
+	while(($done eq "-") && ($s = <S>) && ($s =~ /^\d+([- ])/)) {
+		print $s if $watch;
+		$done = $1;
+		push(@resp,$s);
+	}
+	return @resp;
+}
+# print args if verbose.  Return them in any case
+sub verbose
+{
+	local(@tp) = @_;
+	print "@tp" if $verbose;
+}
+# to pass perl -w:
+@tp;
+$flag_a;
+$flag_d;
+$flag_1;
+%already_domainify_fellback;
+%already_mx_fellback;
+&handle_alarm;
+################### BEGIN PERL/TROFF TRANSITION 
+.00;	
+
+'di		\\ " finish diversion--previous line must be blank
+.nr nl 0-1	\\ " fake up transition to first page again
+.nr % 0		\\ " start at page 1
+.\\"'; __END__ 
+.\" ############## END PERL/TROFF TRANSITION
+.TH EXPN 1 "March 11, 1993"
+.AT 3
+.SH NAME
+expn \- recursively expand mail aliases
+.SH SYNOPSIS
+.B expn
+.RI [ -a ]
+.RI [ -v ]
+.RI [ -w ]
+.RI [ -d ]
+.RI [ -1 ]
+.IR user [@ hostname ]
+.RI [ user [@ hostname ]]...
+.SH DESCRIPTION
+.B expn
+will use the SMTP
+.B expn
+and 
+.B vrfy
+commands to expand mail aliases.  
+It will first look up the addresses you provide on the command line.
+If those expand into addresses on other systems, it will 
+connect to the other systems and expand again.  It will keep 
+doing this until no further expansion is possible.
+.SH OPTIONS
+The default output of 
+.B expn
+can contain many lines which are not valid
+email addresses.  With the 
+.I -aa
+flag, only expansions that result in legal addresses
+are used.  Since many mailing lists have an illegal
+address or two, the single
+.IR -a ,
+address, flag specifies that a few illegal addresses can
+be mixed into the results.   More 
+.I -a
+flags vary the ratio.  Read the source to track down
+the formula.  With the
+.I -a
+option, you should be able to construct a new mailing
+list out of an existing one.
+.LP
+If you wish to limit the number of levels deep that 
+.B expn
+will recurse as it traces addresses, use the
+.I -1
+option.  For each 
+.I -1
+another level will be traversed.  So, 
+.I -111
+will traverse no more than three levels deep.
+.LP
+The normal mode of operation for
+.B expn
+is to do all of its work silently.
+The following options make it more verbose.
+It is not necessary to make it verbose to see what it is
+doing because as it works, it changes its 
+.BR argv [0]
+variable to reflect its current activity.
+To see how it is expanding things, the 
+.IR -v ,
+verbose, flag will cause 
+.B expn 
+to show each address before
+and after translation as it works.
+The 
+.IR -w ,
+watch, flag will cause
+.B expn
+to show you its conversations with the mail daemons.
+Finally, the 
+.IR -d ,
+debug, flag will expose many of the inner workings so that
+it is possible to eliminate bugs.
+.SH ENVIRONMENT
+No enviroment variables are used.
+.SH FILES
+.PD 0
+.B /tmp/expn$$
+.B temporary file used as input to 
+.BR nslookup .
+.SH SEE ALSO
+.BR aliases (5), 
+.BR sendmail (8),
+.BR nslookup (8),
+RFC 823, and RFC 1123.
+.SH BUGS
+Not all mail daemons will implement 
+.B expn
+or
+.BR vrfy .
+It is not possible to verify addresses that are served
+by such daemons.
+.LP
+When attempting to connect to a system to verify an address,
+.B expn
+only tries one IP address.  Most mail daemons
+will try harder.
+.LP
+It is assumed that you are running domain names and that 
+the 
+.BR nslookup (8) 
+program is available.  If not, 
+.B expn
+will not be able to verify many addresses.  It will also pause
+for a long time unless you change the code where it says
+.I $have_nslookup = 1
+to read
+.I $have_nslookup = 
+.IR 0 .
+.LP
+Lastly, 
+.B expn
+does not handle every valid address.  If you have an example,
+please submit a bug report.
+.SH CREDITS
+In 1986 or so, Jon Broome wrote a program of the same name
+that did about the same thing.  It has since suffered bit rot
+and Jon Broome has dropped off the face of the earth!
+(Jon, if you are out there, drop me a line)
+.SH AVAILABILITY
+The latest version of 
+.B expn
+is available through anonymous ftp to
+.IR idiom.berkeley.ca.us .
+.SH AUTHOR
+.I David Muir Sharnoff\ \ \ \ <muir@idiom.berkeley.ca.us>
diff --git a/usr.sbin/sendmail/contrib/mh.patch b/usr.sbin/sendmail/contrib/mh.patch
new file mode 100644
index 00000000000..7b23a5b71dd
--- /dev/null
+++ b/usr.sbin/sendmail/contrib/mh.patch
@@ -0,0 +1,193 @@
+Message-Id: <199309031900.OAA19417@ignatz.acs.depaul.edu>
+To: bug-mh@ics.uci.edu
+cc: mh-users@ics.uci.edu, eric@cs.berkeley.edu
+Subject: MH-6.8.1/Sendmail 8.X (MH patch) updated
+Date: Fri, 03 Sep 1993 14:00:46 -0500
+From: Dave Nelson <dcn@ignatz.acs.depaul.edu>
+
+
+	This patch will fix the "X-auth..." warnings from the newer
+Sendmails (8.X) while continuing to work with the old sendmails.
+
+	I think the following patch will make everyone happy.
+
+	1)  Anybody with MH-6.8.1 can install this.  It doesn't matter
+	    what version of sendmail you're running.  It doesn't matter
+	    if you're not running sendmail (but it won't fix anything
+	    for you).
+
+	2)  No configuration file hacks. If the -client switch is
+	    absent (the default), the new sendmails will get an EHLO 
+	    using what LocalName() returns as the hostname.  On my systems, 
+	    this returns the FQDN.  If the EHLO fails with a result between 
+	    500 and 599  and the -client switch is not set, we give up on 
+	    sending EHLO/HELO and just go deliver the mail.
+
+	3)  No new configuration options.
+
+	4)  Retains the undocumented -client switch.  One warning:  it
+	    is possible using the -client switch to cause the old sendmails
+	    to return "I refuse to talk to myself".  You could do this under
+	    the old code as well.  This will happen if you claim to be the
+	    same system as the sendmail you're sending to is running on.  
+	    That's pointless, but possible.  If you do this, just like under
+	    the old code, you will get an error.
+
+	5)  If you're running a site with both old and new sendmails, you only
+	    have to build MH once.  The code's the same; works with them
+	    both.
+
+	If you decide to install this, make sure that you look the patch
+over and that you agree with what it is doing.  It works for me, but I
+can't test it on every possible combination.  Make sure that it works
+before you really install it for your users, if any.  No promises.
+
+	To install this, save this to a file in the mts/sendmail directory.
+Feed it to patch.  Patch will ignore the non-patch stuff.  You should have
+"mts sendmail/smtp" in your configuration file.  This works with old and
+new sendmails.  Using "mts sendmail"  will cause the new sendmails to
+print an "X-auth..." warning about who owns the process piping the mail 
+message.  I don't know of anyway of getting rid of these.
+
+	mh-config (if necessary), make, make inst-all.
+
+
+I hope this helps people.
+	
+/dcn
+
+Dave Nelson
+Academic Computer Services
+DePaul University, Chicago
+
+*** smail.c	Fri Sep  3 11:58:05 1993
+--- smail.c	Fri Sep  3 11:57:27 1993
+***************
+*** 239,261 ****
+  		    return RP_RPLY;
+  	    }
+  
+! 	    if (client && *client) {
+! 		doingEHLO = 1;
+! 		result = smtalk (SM_HELO, "EHLO %s", client);
+! 		doingEHLO = 0;
+  
+! 		if (500 <= result && result <= 599)
+  		    result = smtalk (SM_HELO, "HELO %s", client);
+! 
+! 		switch (result) {
+  		    case 250:
+! 		        break;
+  
+  		    default:
+  			(void) sm_end (NOTOK);
+  			return RP_RPLY;
+  		}
+  	    }
+  
+  #ifndef	ZMAILER
+  	    if (onex)
+--- 239,276 ----
+  		    return RP_RPLY;
+  	    }
+  
+! 	    doingEHLO = 1;
+! 	    result = smtalk (SM_HELO, "EHLO %s", 
+! 			     (client && *client) ? client : LocalName());
+! 	    doingEHLO = 0;
+! 
+! 	    switch (result)
+! 	    {
+! 	    case 250:
+! 		break;
+  
+! 	    default:
+! 		if (!(500 <= result && result <= 599))
+! 		{
+! 		    (void) sm_end (NOTOK);
+! 		    return RP_RPLY;
+! 		}
+! 		
+! 		if (client && *client)
+! 		{
+  		    result = smtalk (SM_HELO, "HELO %s", client);
+! 		    switch (result)
+! 		    {
+  		    case 250:
+! 			break;
+  
+  		    default:
+  			(void) sm_end (NOTOK);
+  			return RP_RPLY;
++ 		    }
+  		}
+  	    }
++ 	    
+  
+  #ifndef	ZMAILER
+  	    if (onex)
+***************
+*** 357,380 ****
+  	    return RP_RPLY;
+      }
+  
+!     if (client && *client) {
+! 	doingEHLO = 1;
+! 	result = smtalk (SM_HELO, "EHLO %s", client);
+! 	doingEHLO = 0;
+  
+! 	if (500 <= result && result <= 599)
+  	    result = smtalk (SM_HELO, "HELO %s", client);
+! 
+! 	switch (result) {
+! 	    case 250: 
+  		break;
+  
+! 	    default: 
+  		(void) sm_end (NOTOK);
+  		return RP_RPLY;
+  	}
+      }
+! 
+  send_options: ;
+      if (watch && EHLOset ("XVRB"))
+  	(void) smtalk (SM_HELO, "VERB on");
+--- 372,409 ----
+  	    return RP_RPLY;
+      }
+  
+!     doingEHLO = 1;
+!     result = smtalk (SM_HELO, "EHLO %s", 
+! 		     (client && *client) ? client : LocalName());
+!     doingEHLO = 0;
+! 
+!     switch (result)
+!     {
+!     case 250:
+! 	break;
+! 
+!     default:
+! 	if (!(500 <= result && result <= 599))
+! 	{
+! 	    (void) sm_end (NOTOK);
+! 	    return RP_RPLY;
+! 	}
+  
+! 	if (client && *client)
+! 	{
+  	    result = smtalk (SM_HELO, "HELO %s", client);
+! 	    switch (result)
+! 	    {
+! 	    case 250:
+  		break;
+  
+! 	    default:
+  		(void) sm_end (NOTOK);
+  		return RP_RPLY;
++ 	    }
+  	}
+      }
+!     
+  send_options: ;
+      if (watch && EHLOset ("XVRB"))
+  	(void) smtalk (SM_HELO, "VERB on");
diff --git a/usr.sbin/sendmail/contrib/mmuegel b/usr.sbin/sendmail/contrib/mmuegel
new file mode 100644
index 00000000000..6db4a45189c
--- /dev/null
+++ b/usr.sbin/sendmail/contrib/mmuegel
@@ -0,0 +1,2079 @@
+From: "Michael S. Muegel" <mmuegel@cssun6.corp.mot.com>
+Message-Id: <199307280818.AA08111@cssun6.corp.mot.com>
+Subject: Re: contributed software
+To: eric@cs.berkeley.edu (Eric Allman)
+Date: Wed, 28 Jul 1993 03:18:02 -0500 (CDT)
+In-Reply-To: <199307221853.LAA04266@mastodon.CS.Berkeley.EDU> from "Eric Allman" at Jul 22, 93 11:53:47 am
+X-Mailer: ELM [version 2.4 PL22]
+Mime-Version: 1.0
+Content-Type: text/plain; charset=US-ASCII
+Content-Transfer-Encoding: 7bit
+Content-Length: 69132     
+
+OK. Here is a new shell archive.
+
+Cheers,
+-Mike
+
+---- Cut Here and feed the following to sh ----
+#!/bin/sh
+# This is a shell archive (produced by shar 3.49)
+# To extract the files from this archive, save it to a file, remove
+# everything above the "!/bin/sh" line above, and type "sh file_name".
+#
+# made 07/28/1993 08:13 UTC by mmuegel@mot.com (Michael S. Muegel)
+# Source directory /home/ustart/NeXT/src/mail-tools/dist/foo
+#
+# existing files will NOT be overwritten unless -c is specified
+#
+# This shar contains:
+# length  mode       name
+# ------ ---------- ------------------------------------------
+#   4308 -r--r--r-- README
+#  12339 -r--r--r-- libs/date.pl
+#   3198 -r--r--r-- libs/elapsed.pl
+#   4356 -r--r--r-- libs/mail.pl
+#   6908 -r--r--r-- libs/mqueue.pl
+#   7024 -r--r--r-- libs/newgetopts.pl
+#   4687 -r--r--r-- libs/strings1.pl
+#   1609 -r--r--r-- libs/timespec.pl
+#   5212 -r--r--r-- man/cqueue.1
+#   2078 -r--r--r-- man/postclip.1
+#   6647 -r-xr-xr-x src/cqueue
+#   1836 -r-xr-xr-x src/postclip
+#
+# ============= README ==============
+if test -f 'README' -a X"$1" != X"-c"; then
+	echo 'x - skipping README (File already exists)'
+else
+echo 'x - extracting README (Text)'
+sed 's/^X//' << 'SHAR_EOF' > 'README' &&
+-------------------------------------------------------------------------------
+Document Revision Control Information:
+X   mmuegel
+X   /usr/local/ustart/src/mail-tools/dist/foo/README,v
+X   1.1 of 1993/07/28 08:12:53
+-------------------------------------------------------------------------------
+X
+1. Introduction
+---------------
+X
+These tools may be of use to those sites using sendmail. Both are written in
+Perl. Our site, Mot.COM, receives a ton of mail being a top-level domain
+gateway. We have over 24 domains under us. Needless to say, we must have
+a robust mail system or my head, and others, would be on the chopping block.
+X
+2. Description
+--------------
+X
+The first tool, cqueue, checks the sendmail queue for problems. We use
+it to flag problems with subdomain mail servers (and even our own servers
+once in a while ;-). We run it via a cron job every hour during the day.
+You may find this too frequent, however. 
+X
+The other program, postclip, is used to "filter" non-deliverable NDNs that
+get sent to our Postmaster account now and then. This ensures privacy of
+e-mail and helps avoid disk problems from huge NDNs. It is different than
+a brute force "just keep the header" approach because it tries hard to keep
+other parts of the message that look like non-delivery information.
+X
+Both have been used for some time at our site with no problems. Everything 
+you need should be in this distribution: source, manual pages, and support 
+libs. See the manual pages for a complete description of each tool.
+X
+3. Installation
+---------------
+X
+No fancy Makefile simply because these tools are all under a large
+hierarchy at my site. Installation should be a snap, however. Install
+the nroff(1) man(5) manual pages from the man subdirectory to the
+appropriate directory on your system. This might be something like
+/usr/local/man/man1.
+X
+Next, install all of the Perl libraries located in the lib subdirectory
+to your Perl library area. /usr/local/lib/perl is a good bet. The person
+who installed Perl at your site will be able to tell you for sure. 
+X
+Finally, you need to install the programs. Note that cqueue wants to
+run setuid root by default. This is because the sendmail queue is normally
+only readable by root or some special group. In order to let any user
+run this suidperl is used. suidperl allows a Perl program to run with the
+privileges of another user. 
+X
+You will have to edit both the cqueue and postclip programs to change
+the #! line at the top of each. Just change the pathname to whatever is
+appropriate on your system. Note that Larry Wall's fixin program from
+the Camel book can also be used to do this. It is very handy. It changes
+#! lines by looking at your PATH.
+X
+If you do not have suidperl on your system change the #! line in cqueue
+to reference perl instead of suidperl.
+X
+You may also wish to change some constants in cqueue. $DEF_QUEUE should be
+changed to your queue directory if it is not /usr/spool/mqueue. $DEF_TIME
+could be changed easy enough also. It is the time spec for the time duration
+after which a mail message will be reported on if the -a option has not been
+specified. See the manual page for more information and the format of this
+constant (same as the -t argument). Then again, neither of these has to
+be changed. Command line options are there to override their default
+values.
+X
+After you have edited the programs as necessary, all that remains is to
+install them to some executable directory. Install postclip mode 555
+and cqueue mode 4555 with owner root (if using suidperl) or mode 555
+(if not using suidperl).
+X
+4. Gripes, Comments, Etc
+------------------------
+X
+If you start using either of these let me know. I have other mail tools I
+will likely post in the future if these prove useful. Also, if you think
+something is just plain dumb/wrong/stupid let me know!
+X
+Cheers,
+-Mike
+X
+--
++----------------------------------------------------------------------------+
+| Michael S. Muegel                    | Internet E-Mail:    mmuegel@mot.com |
+| UNIX Applications Startup Group      | Moto Dist E-Mail:   X10090          |
+| Corporate Information Office         | Voice:              (708) 576-0507  |
+| Motorola                             | Fax:                (708) 576-4153  |
++----------------------------------------------------------------------------+
+SHAR_EOF
+chmod 0444 README ||
+echo 'restore of README failed'
+Wc_c="`wc -c < 'README'`"
+test 4308 -eq "$Wc_c" ||
+	echo 'README: original size 4308, current size' "$Wc_c"
+fi
+# ============= libs/date.pl ==============
+if test ! -d 'libs'; then
+    echo 'x - creating directory libs'
+    mkdir 'libs'
+fi
+if test -f 'libs/date.pl' -a X"$1" != X"-c"; then
+	echo 'x - skipping libs/date.pl (File already exists)'
+else
+echo 'x - extracting libs/date.pl (Text)'
+sed 's/^X//' << 'SHAR_EOF' > 'libs/date.pl' &&
+;#
+;# Name
+;#	date.pl - Perl emulation of (the output side of) date(1)
+;#
+;# Synopsis
+;#	require "date.pl";
+;#	$Date = &date(time);
+;#	$Date = &date(time, $format);
+;#
+;# Description
+;#	This package implements the output formatting functions of date(1) in
+;#	Perl.  The format options are based on those supported by Ultrix 4.0
+;#	plus a couple of additions from SunOS 4.1.1 and elsewhere:
+;#
+;#		%a		abbreviated weekday name - Sun to Sat
+;#		%A		full weekday name - Sunday to Saturday
+;#		%b		abbreviated month name - Jan to Dec
+;#		%B		full month name - January to December
+;#		%c		date and time in local format [+]
+;#		%C		date and time in long local format [+]
+;#		%d		day of month - 01 to 31
+;#		%D		date as mm/dd/yy
+;#		%e		day of month (space padded) - ` 1' to `31'
+;#		%E		day of month (with suffix: 1st, 2nd, 3rd...)
+;#		%f		month of year (space padded) - ` 1' to `12'
+;#		%h		abbreviated month name - Jan to Dec
+;#		%H		hour - 00 to 23
+;#		%i		hour (space padded) - ` 1' to `12'
+;#		%I		hour - 01 to 12
+;#		%j		day of the year (Julian date) - 001 to 366
+;#		%k		hour (space padded) - ` 0' to `23'
+;#		%l		date in ls(1) format
+;#		%m		month of year - 01 to 12
+;#		%M		minute - 00 to 59
+;#		%n		insert a newline character
+;#		%p		ante-meridiem or post-meridiem indicator (AM or PM)
+;#		%r		time in AM/PM notation
+;#		%R		time as HH:MM
+;#		%S		second - 00 to 59
+;#		%t		insert a tab character
+;#		%T		time as HH:MM:SS
+;#		%u		date/time in date(1) required format
+;#		%U		week number, Sunday as first day of week - 00 to 53
+;#		%V		date-time in SysV touch format (mmddHHMMyy)
+;#		%w		day of week - 0 (Sunday) to 6
+;#		%W		week number, Monday as first day of week - 00 to 53
+;#		%x		date in local format [+]
+;#		%X		time in local format [+]
+;#		%y		last 2 digits of year - 00 to 99
+;#		%Y		all 4 digits of year ~ 1700 to 2000 odd ?
+;#		%z		time zone from TZ environment variable w/ a trailing space
+;#		%Z		time zone from TZ environment variable
+;#		%%		insert a `%' character
+;#		%+		insert a `+' character
+;#
+;#	[+]:  These may need adjustment to fit local conventions, see below.
+;#
+;#	For the sake of compatibility, a leading `+' in the format
+;#	specificaiton is removed if present.
+;#
+;# Remarks
+;#	This is version 3.4 of date.pl
+;#
+;#	An extension of `ctime.pl' by Waldemar Kebsch (kebsch.pad@nixpbe.UUCP),
+;#	as modified by Marion Hakanson (hakanson@ogicse.ogi.edu).
+;#
+;#  Unlike date(1), unknown format tags are silently replaced by "".
+;#
+;#  defaultTZ is a blatant hack, but I wanted to be able to get date(1)
+;#	like behaviour by default and there does'nt seem to be an easy (read
+;#	portable) way to get the local TZ name back...
+;#
+;#	For a cheap date, try...
+;#
+;#		#!/usr/local/bin/perl
+;#		require "date.pl";
+;#		exit print (&date(time, shift @ARGV) . "\n") ? 0 : 1;
+;#
+;#	This package is redistributable under the same terms as apply to
+;#	the Perl 4.0 release.  See the COPYING file in your Perl kit for
+;#	more information.
+;#
+;#	Please send any bug reports or comments to tmcgonigal@gallium.com
+;#
+;# Modification History
+;#	Nmemonic	Version	Date		Who
+;#
+;#	NONE		1.0		02feb91		Terry McGonigal (tmcgonigal@gallium.com)
+;#		Created from ctime.pl
+;#
+;#	NONE		2.0		07feb91		tmcgonigal
+;#		Added some of Marion Hakanson (hakanson@ogicse.ogi.edu)'s ctime.pl
+;#		TZ handling changes.
+;#
+;#	NONE		2.1		09feb91		tmcgonigal
+;#		Corrected week number calculations.
+;#
+;#	NONE		2.2		21oct91		tmcgonigal
+;#		Added ls(1) date format, `%l'.
+;#
+;#	NONE		2.3		06nov91		tmcgonigal
+;#		Added SysV touch(1) date-time format, `%V' (pretty thin as
+;#		mnemonics go, I know, but `t' and `T' were both gone already!)
+;#
+;#	NONE		2.4		05jan92		tmcgonigal
+;#		Corrected slight (cosmetic) problem with %V replacment string
+;#
+;#	NONE		3.0		09jul92		tmcgonigal
+;#		Fixed a couple of problems with &ls as pointed out by
+;#		Thomas Richter (richter@ki1.chemie.fu-berlin.de), thanks Thomas!
+;#		Also added a couple of SunOS 4.1.1 strftime-ish formats, %i and %k
+;#		for space padded hours (` 1' to `12' and ` 0' to `23' respectivly),
+;#		and %C for locale long date/time format.  Changed &ampmH to take a
+;#		pad char parameter to make to evaled code for %i and %k simpler. 
+;#		Added %E for suffixed day-of-month (ie 1st, 3rd, 4th etc).
+;#
+;#	NONE		3.1		16jul92		tmcgonigal
+;#		Added `%u' format to generate date/time in date(1) required
+;#		format (ie '%y%m%d%H%M.%S').
+;#
+;#	NONE		3.2		23jan93		tmcgonigal
+;#		Added `%f' format to generate space padded month numbers, added
+;#		`%E' to the header comments, it seems to have been left out (and
+;#		I'm sure I wanted to use it at some point in the past...).
+;#
+;#	NONE		3.3		03feb93		tmcgonigal
+;#		Corrected some problems with AM/PM handling pointed out by
+;#		Michael S. Muegel (mmuegel@mot.com).  Thanks Michael, I hope
+;#		this is the behaviour you were looking for, it seems more
+;#		correct to me...
+;#
+;#	NONE		3.4		26jul93		tmcgonigal
+;#		Incorporated some fixes provided by DaviD W. Sanderson
+;#		(dws@ssec.wisc.edu): February was spelled incorrectly and
+;#		&wkno() was always using the current year while calculating
+;#		week numbers, regardless of year implied by the time value
+;#		passed to &date().  DaviD also contributed an improved &date()
+;#		test script, thanks DaviD, I appreciate the effort.  Finally,
+;#		changed my mailling address from @gvc.com to @gallium.com
+;#		to reflect, well, my new address!
+;#
+;# SccsId = "%W% %E%"
+;#
+require 'timelocal.pl';
+package date;
+X
+# Months of the year
+@MoY = ('January',	'February',	'March',	'April',	'May',		'June',
+X		'July',		'August',	'September','October',	'November', 'December');
+X
+# days of the week
+@DoW = ('Sunday',	'Monday',	'Tuesday',	'Wednesday',
+X		'Thursday',	'Friday',	'Saturday');
+X
+# CUSTOMIZE - defaults
+$defaultTZ = 'CST';						# time zone (hack!)
+$defaultFMT = '%a %h %e %T %z%Y';		# format (ala date(1))
+X
+# CUSTOMIZE - `local' formats
+$locTF = '%T';							# time (as HH:MM:SS)
+$locDF = '%D';							# date (as mm/dd/yy)
+$locDTF = '%a %b %d %T %Y';				# date/time (as dow mon dd HH:MM:SS yyyy)
+$locLDTF = '%i:%M:%S %p %A %B %E %Y';	# long date/time (as HH:MM:SS a/p day month dom yyyy)
+X
+# Time zone info
+$TZ;									# wkno needs this info too
+X
+# define the known format tags as associative keys with their associated
+# replacement strings as values.  Each replacement string should be
+# an eval-able expresion assigning a value to $rep.  These expressions are
+# eval-ed, then the value of $rep is substituted into the supplied
+# format (if any).
+%Tags = ( '%a', q|($rep = $DoW[$wday])=~ s/^(...).*/\1/|,	# abbr. weekday name - Sun to Sat
+X		  '%A', q|$rep = $DoW[$wday]|,						# full weekday name - Sunday to Saturday
+X		  '%b', q|($rep = $MoY[$mon]) =~ s/^(...).*/\1/|,	# abbr. month name - Jan to Dec
+X		  '%B', q|$rep = $MoY[$mon]|,						# full month name - January to December
+X		  '%c', q|$rep = $locDTF; 1|,						# date/time in local format
+X		  '%C', q|$rep = $locLDTF; 1|,						# date/time in local long format
+X		  '%d',	q|$rep = &date'pad($mday, 2, "0")|,			# day of month - 01 to 31
+X		  '%D',	q|$rep = '%m/%d/%y'|,						# date as mm/dd/yy
+X		  '%e', q|$rep = &date'pad($mday, 2, " ")|,			# day of month (space padded) ` 1' to `31'
+X		  '%E', q|$rep = &date'dsuf($mday)|,				# day of month (w/suffix) `1st' to `31st'
+X		  '%f', q|$rep = &date'pad($mon+1, 2, " ")|,		# month of year (space padded) ` 1' to `12'
+X		  '%h', q|$rep = '%b'|,								# abbr. month name (same as %b)
+X		  '%H',	q|$rep = &date'pad($hour, 2, "0")|,			# hour - 00 to 23
+X		  '%i', q|$rep = &date'ampmH($hour, " ")|,			# hour (space padded ` 1' to `12'
+X		  '%I', q|$rep = &date'ampmH($hour, "0")|,			# hour - 01 to 12
+X		  '%j', q|$rep = &date'pad($yday+1, 3, "0")|,		# Julian date 001 - 366
+X		  '%k', q|$rep = &date'pad($hour, 2, " ")|,			# hour (space padded) ` 0' to `23'
+X		  '%l', q|$rep = '%b %d ' . &date'ls($year)|,		# ls(1) style date
+X		  '%m',	q|$rep = &date'pad($mon+1, 2, "0")|,		# month of year - 01 to 12
+X		  '%M', q|$rep = &date'pad($min, 2, "0")|,			# minute - 00 to 59
+X		  '%n',	q|$rep = "\n"|,								# insert a newline
+X		  '%p', q|$rep = &date'ampmD($hour)|,				# insert `AM' or `PM'
+X		  '%r', q|$rep = '%I:%M:%S %p'|,					# time in AM/PM notation
+X		  '%R', q|$rep = '%H:%M'|,							# time as HH:MM
+X		  '%S', q|$rep = &date'pad($sec, 2, "0")|,			# second - 00 to 59
+X		  '%t',	q|$rep = "\t"|,								# insert a tab
+X		  '%T',	q|$rep = '%H:%M:%S'|,						# time as HH:MM:SS
+X		  '%u', q|$rep = '%y%m%d%H%M.%S'|,					# daaate/time in date(1) required format
+X		  '%U',	q|$rep = &date'wkno($year, $yday, 0)|,		# week number (weeks start on Sun) - 00 to 53
+X		  '%V', q|$rep = '%m%d%H%M%y'|,						# SysV touch(1) date-time format (mmddHHMMyy)
+X		  '%w', q|$rep = $wday; 1|,							# day of week - Sunday = 0
+X		  '%W', q|$rep = &date'wkno($year, $yday, 1)|,		# week number (weeks start on Mon) - 00 to 53
+X		  '%x', q|$rep = $locDF; 1|,						# date in local format
+X		  '%X', q|$rep = $locTF; 1|,						# time in local format
+X		  '%y', q|($rep = $year) =~ s/..(..)/\1/|,			# last 2 digits of year - 00 to 99
+X		  '%Y', q|$rep = "$year"; 1|,						# full year ~ 1700 to 2000 odd
+X		  '%z', q|$rep = $TZ eq "" ? "" : "$TZ "|,			# time zone from TZ env var (w/trail. space)
+X		  '%Z', q|$rep = $TZ; 1|,							# time zone from TZ env. var.
+X		  '%%', q|$rep = '%'; $adv=1|,						# insert a `%'
+X		  '%+', q|$rep = '+'|								# insert a `+'
+);
+X	
+sub main'date {
+X	local($time, $format) = @_;
+X	local($sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst);
+X	local($pos, $tag, $rep, $adv) = (0, "", "", 0);
+X
+X	# default to date/ctime format or strip leading `+'...
+X	if ($format eq "") {
+X		$format = $defaultFMT;
+X	} elsif ($format =~ /^\+/) {
+X		$format = $';
+X	}
+X
+X	# Use local time if can't find a TZ in the environment
+X	$TZ = defined($ENV{'TZ'}) ? $ENV{'TZ'} : $defaultTZ;
+X	($sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst) = 
+X		&gettime ($TZ, $time);
+X
+X	# Hack to deal with 'PST8PDT' format of TZ
+X	# Note that this can't deal with all the esoteric forms, but it
+X	# does recognize the most common: [:]STDoff[DST[off][,rule]]
+X	if ($TZ =~ /^([^:\d+\-,]{3,})([+-]?\d{1,2}(:\d{1,2}){0,2})([^\d+\-,]{3,})?/) {
+X		$TZ = $isdst ? $4 : $1;
+X	}
+X
+X	# watch out in 2070...
+X	$year += ($year < 70) ? 2000 : 1900;
+X
+X	# now loop throught the supplied format looking for tags...
+X	while (($pos = index ($format, '%')) != -1) {
+X
+X		# grab the format tag
+X		$tag = substr($format, $pos, 2);
+X		$adv = 0;							# for `%%' processing
+X
+X		# do we have a replacement string?
+X		if (defined $Tags{$tag}) {
+X
+X			# trap dead evals...
+X			if (! eval $Tags{$tag}) {
+X				print STDERR "date.pl: internal error: eval for $tag failed: $@\n";
+X				return "";
+X			}
+X		} else {
+X			$rep = "";
+X		}
+X			
+X		# do the substitution
+X		substr ($format, $pos, 2) =~ s/$tag/$rep/;
+X		$pos++ if ($adv);
+X	}
+X
+X	$format;
+}
+X
+# dsuf - add `st', `nd', `rd', `th' to a date (ie 1st, 22nd, 29th)
+sub dsuf {
+X	local ($mday) = @_;
+X
+X	return $mday . 'st' if ($mday =~ m/.*1$/);
+X	return $mday . 'nd' if ($mday =~ m/.*2$/);
+X	return $mday . 'rd' if ($mday =~ m/.*3$/);
+X	return $mday . 'th';
+}
+X	
+# weekno - figure out week number
+sub wkno {
+X	local ($year, $yday, $firstweekday) = @_;   
+X	local ($jan1, @jan1, $wks);
+X
+X	# figure out the `time' value for January 1 of the given year
+X	$jan1 = &maketime ($TZ, 0, 0, 0, 1, 0, $year-1900);
+X
+X	# figure out what day of the week January 1 was
+X	@jan1= &gettime ($TZ, $jan1);
+X	
+X	# and calculate the week number
+X	$wks = (($yday + ($jan1[6] - $firstweekday)) + 1)/ 7;
+X	$wks += (($wks - int($wks) > 0.0) ? 1 : 0);
+X
+X	# supply zero padding
+X	&pad (int($wks), 2, "0");
+}
+X
+# ampmH - figure out am/pm (1 - 12) mode hour value, padded with $p (0 or ' ')
+sub ampmH { local ($h, $p) = @_;  &pad($h>12 ? $h-12 : ($h ? $h : 12), 2, $p); }
+X
+# ampmD - figure out am/pm designator
+sub ampmD { shift @_ >= 12 ? "PM" : "AM"; }
+X
+# gettime - get the time via {local,gmt}time
+sub gettime { ((shift @_) eq 'GMT') ? gmtime(shift @_) : localtime(shift @_); }
+X
+# maketime - make a time via time{local,gmt}
+sub maketime { ((shift @_) eq 'GMT') ? &main'timegm(@_) : &main'timelocal(@_); }
+X
+# ls - generate the time/year portion of an ls(1) style date
+sub ls {
+X	return ((&gettime ($TZ, time))[5] == @_[0]) ? "%R" : " %Y";
+}
+X
+# pad - pad $in with leading $pad until lenght $len
+sub pad {
+X	local ($in, $len, $pad) = @_;
+X	local ($out) = "$in";
+X
+X	$out = $pad . $out until (length ($out) == $len);
+X	return $out;
+}
+X
+1;
+SHAR_EOF
+chmod 0444 libs/date.pl ||
+echo 'restore of libs/date.pl failed'
+Wc_c="`wc -c < 'libs/date.pl'`"
+test 12339 -eq "$Wc_c" ||
+	echo 'libs/date.pl: original size 12339, current size' "$Wc_c"
+fi
+# ============= libs/elapsed.pl ==============
+if test -f 'libs/elapsed.pl' -a X"$1" != X"-c"; then
+	echo 'x - skipping libs/elapsed.pl (File already exists)'
+else
+echo 'x - extracting libs/elapsed.pl (Text)'
+sed 's/^X//' << 'SHAR_EOF' > 'libs/elapsed.pl' &&
+;# NAME
+;#    elapsed.pl - convert seconds to elapsed time format
+;#
+;# AUTHOR
+;#    Michael S. Muegel <mmuegel@mot.com>
+;#
+;# RCS INFORMATION
+;#    mmuegel
+;#    /usr/local/ustart/src/mail-tools/dist/foo/libs/elapsed.pl,v
+;#    1.1 of 1993/07/28 08:07:19
+X
+package elapsed;
+X
+# Time field types
+$DAYS		= 1;
+$HOURS		= 2;
+$MINUTES	= 3;
+$SECONDS	= 4;
+X
+# The array contains four records each with four fields. The fields are,
+# in order:
+#
+#    Type		Specifies what kind of time field this is. Once of
+#			$DAYS, $HOURS, $MINUTES, or $SECONDS.
+#
+#    Multiplier		Specifies what time field this is via the minimum
+#			number of seconds this time field may specify. For
+#			example, the minutes field would be non-zero
+#			when there are 60 or more seconds.
+#			
+#    Separator		How to separate this time field from the next
+#			*greater* field.
+#
+#    Format		sprintf() format specifier on how to print this
+#			time field.
+@MULT_AND_SEPS = ($DAYS, 60 * 60 * 24, "+", "%d",
+X                  $HOURS, 60 * 60, ":", "%d",
+X                  $MINUTES, 60, ":", "%02d",
+X                  $SECONDS, 1, "", "%02d"
+X                 );
+X
+;###############################################################################
+;# Seconds_To_Elapsed
+;#
+;# Coverts a seconds count to form [d+]h:mm:ss. If $Collapse
+;# is true then the result is compacted somewhat. The string returned
+;# will be of the form [d+][[h:]mm]:ss.
+;#
+;# Arguments:
+;#    $Seconds, $Collapse
+;#
+;# Examples:
+;#    &Seconds_To_Elapsed (0, 0) 	-> 0:00:00
+;#    &Seconds_To_Elapsed (0, 1) 	-> :00
+;#
+;#    &Seconds_To_Elapsed (119, 0) 	-> 0:01:59
+;#    &Seconds_To_Elapsed (119, 1) 	-> 01:59
+;#
+;#    &Seconds_To_Elapsed (3601, 0) 	-> 1:00:01
+;#    &Seconds_To_Elapsed (3601, 1) 	-> 1:00:01
+;#
+;#    &Seconds_To_Elapsed (86401, 0) 	-> 1+0:00:01
+;#    &Seconds_To_Elapsed (86401, 1) 	-> 1+:01
+;#
+;# Returns:
+;#    $Elapsed
+;###############################################################################
+sub main'Seconds_To_Elapsed
+{
+X   local ($Seconds, $Collapse) = @_;
+X   local ($Type, $Multiplier, @Multipliers, $Separator, $DHMS_Used, 
+X          $Elapsed, @Mult_And_Seps, $Print_Field);
+X
+X   $Multiplier = 1;
+X   @Mult_And_Seps = @MULT_AND_SEPS;
+X
+X   # Keep subtracting the number of seconds corresponding to a time field
+X   # from the number of seconds passed to the function.
+X   while (1)
+X   {
+X      ($Type, $Multiplier, $Separator, $Format) = splice (@Mult_And_Seps, 0, 4);
+X      last if (! $Multiplier);
+X      $Seconds -= $DHMS_Used * $Multiplier 
+X         if ($DHMS_Used = int ($Seconds / $Multiplier));
+X
+X      # Figure out if we should print this field
+X      if ($Type == $DAYS)
+X      {
+X	 $Print_Field = $DHMS_Used;
+X      }
+X
+X      elsif ($Collapse)
+X      {
+X	 if ($Type == $HOURS)
+X	 {
+X	    $Print_Field = $DHMS_Used;
+X	 }
+X	 elsif ($Type == $MINUTES)
+X	 {
+X	    $Print_Field = $DHMS_Used || $Printed_Field {$HOURS};
+X	 }
+X	 else
+X	 {
+X	    $Format = ":%02d" 
+X	       if (! $Printed_Field {$MINUTES});
+X	    $Print_Field = 1;
+X	 };
+X      }
+X
+X      else
+X      {
+X	 $Print_Field = 1;
+X      };
+X
+X      $Printed_Field {$Type} = $Print_Field;
+X      $Elapsed .= sprintf ("$Format%s", $DHMS_Used, $Separator) 
+X	 if ($Print_Field);
+X   };
+X
+X   return ($Elapsed);
+};
+X
+1;
+SHAR_EOF
+chmod 0444 libs/elapsed.pl ||
+echo 'restore of libs/elapsed.pl failed'
+Wc_c="`wc -c < 'libs/elapsed.pl'`"
+test 3198 -eq "$Wc_c" ||
+	echo 'libs/elapsed.pl: original size 3198, current size' "$Wc_c"
+fi
+# ============= libs/mail.pl ==============
+if test -f 'libs/mail.pl' -a X"$1" != X"-c"; then
+	echo 'x - skipping libs/mail.pl (File already exists)'
+else
+echo 'x - extracting libs/mail.pl (Text)'
+sed 's/^X//' << 'SHAR_EOF' > 'libs/mail.pl' &&
+;# NAME
+;#    mail.pl - perl function(s) to handle mail processing
+;#
+;# AUTHOR
+;#    Michael S. Muegel (mmuegel@mot.com)
+;#
+;# RCS INFORMATION
+;#    mmuegel
+;#    /usr/local/ustart/src/mail-tools/dist/foo/libs/mail.pl,v 1.1 1993/07/28 08:07:19 mmuegel Exp
+X
+package mail;
+X
+# Mailer statement to eval. $Users, $Subject, and $Verbose are substituted 
+# via eval
+$BIN_MAILER 		= "/usr/ucb/mail \$Verbose -s '\$Subject' \$Users";
+X
+# Sendmail command to use when $Use_Sendmail is true.
+$SENDMAIL		= '/usr/lib/sendmail $Verbose $Users';
+X
+;###############################################################################
+;# Send_Mail
+;#
+;# Sends $Message to $Users with a subject of $Subject. If $Message_Is_File
+;# is true then $Message is assumed to be a filename pointing to the mail
+;# message. This is a new option and thus the backwards-compatible hack.
+;# $Users should be a space separated list of mail-ids.
+;#
+;# If everything went OK $Status will be 1 and $Error_Msg can be ignored; 
+;# otherwise, $Status will be 0 and $Error_Msg will contain an error message.
+;# 
+;# If $Use_Sendmail is 1 then sendmail is used to send the message. Normally
+;# a mailer such as Mail is used. By specifiying this you can include 
+;# headers in addition to text in either $Message or $Message_Is_File.
+;# If either $Message or $Message_Is_File contain a Subject: header then
+;# $Subject is ignored; otherwise, a Subject: header is automatically created.
+;# Similar to the Subject: header, if a To: header does not exist one
+;# is automatically created from the $Users argument. The mail is still
+;# sent, however, to the recipients listed in $Users. This is keeping with
+;# normal sendmail usage (header vs. envelope).
+;# 
+;# In both bin mailer and sendmail modes $Verbose will turn on verbose mode
+;# (normally just sendmail verbose mode output).
+;#
+;# Arguments:
+;#    $Users, $Subject, $Message, $Message_Is_File, $Verbose, $Use_Sendmail
+;#
+;# Returns:
+;#    $Status, $Error_Msg
+;###############################################################################
+sub main'Send_Mail
+{
+X   local ($Users, $Subject, $Message, $Message_Is_File, $Verbose, 
+X	  $Use_Sendmail) = @_;
+X   local ($BIN_MAILER_HANDLE, $Mailer_Command, $Header_Found, %Header_Map,
+X	  $Header_Extra, $Mailer);
+X
+X   # If the message is contained in a file read it in so we can have one
+X   # consistent interface
+X   if ($Message_Is_File)
+X   {
+X      undef $/;
+X      $Message_Is_File = 0;
+X      open (Message) || return (0, "error reading $Message: $!");
+X      $Message = <Message>;
+X      close (Message);
+X   };
+X
+X   # If sendmail mode see if we need to add some headers
+X   if ($Use_Sendmail)
+X   {
+X      # Determine if a header block is included in the message and what headers
+X      # are there
+X      foreach (split (/\n/, $Message))
+X      {
+X	 last if ($_ eq "");
+X	 $Header_Found = $Header_Map {$1} = 1 if (/^([A-Z]\S*): /);
+X      };
+X
+X      # Add some headers?
+X      if (! $Header_Map {"To"})
+X      {
+X	 $Header_Extra .= "To: " . join (", ", $Users) . "\n";
+X      };
+X      if (($Subject ne "") && (! $Header_Map {"Subject"}))
+X      {
+X	 $Header_Extra .= "Subject: $Subject\n";
+X      };
+X
+X      # Add the required blank line between header/body if there where no
+X      # headers to begin with
+X      if ($Header_Found)
+X      {
+X         $Message = "$Header_Extra$Message";
+X      }
+X      else
+X      {
+X	 $Message = "$Header_Extra\n$Message";
+X      };
+X   };
+X
+X   # Get a string that is the mail command
+X   $Verbose = ($Verbose) ? "-v" : "";
+X   $Mailer = ($Use_Sendmail) ? $SENDMAIL : $BIN_MAILER;
+X   eval "\$Mailer = \"$Mailer\"";
+X   return (0, "error setting \$Mailer: $@") if ($@);
+X
+X   # need to catch SIGPIPE in case the $Mailer call fails
+X   $SIG {'PIPE'} = "mail'Cleanup";
+X
+X   # Open mailer
+X   return (0, "can not open mail program: $Mailer") if (! open (MAILER, "| $Mailer"));
+X   
+X   # Send off the mail!
+X   print MAILER $Message;
+X   close (MAILER);
+X   return (0, "error running mail program: $Mailer") if ($?);
+X   
+X   # Everything must have went AOK
+X   return (1);
+};
+X
+;###############################################################################
+;# Cleanup
+;#
+;# Simply here so we can catch SIGPIPE and not exit.
+;#
+;# Globals:
+;#    None
+;#
+;# Arguments:
+;#    None
+;#
+;# Returns:
+;#    Nothing exciting
+;###############################################################################
+sub Cleanup
+{
+};
+X
+1;
+SHAR_EOF
+chmod 0444 libs/mail.pl ||
+echo 'restore of libs/mail.pl failed'
+Wc_c="`wc -c < 'libs/mail.pl'`"
+test 4356 -eq "$Wc_c" ||
+	echo 'libs/mail.pl: original size 4356, current size' "$Wc_c"
+fi
+# ============= libs/mqueue.pl ==============
+if test -f 'libs/mqueue.pl' -a X"$1" != X"-c"; then
+	echo 'x - skipping libs/mqueue.pl (File already exists)'
+else
+echo 'x - extracting libs/mqueue.pl (Text)'
+sed 's/^X//' << 'SHAR_EOF' > 'libs/mqueue.pl' &&
+;# NAME
+;#    mqueue.pl - functions to work with the sendmail queue
+;#
+;# DESCRIPTION
+;#    Both Get_Queue_IDs and Parse_Control_File are available to get 
+;#    information about the sendmail queue. The cqueue program is a good
+;#    example of how these functions work.
+;#
+;# AUTHOR
+;#    Michael S. Muegel (mmuegel@mot.com)  
+;#
+;# RCS INFORMATION
+;#    mmuegel
+;#    /usr/local/ustart/src/mail-tools/dist/foo/libs/mqueue.pl,v
+;#    1.1 of 1993/07/28 08:07:19
+X
+package mqueue;
+X
+;###############################################################################
+;# Get_Queue_IDs
+;#
+;# Will figure out the queue IDs in $Queue that have both control and data
+;# files. They are returned in @Valid_IDs. Those IDs that have a
+;# control file and no data file are saved to the array globbed by 
+;# *Missing_Control_IDs. Likewise, those IDs that have a data file and no 
+;# control file are saved to the array globbed by *Missing_Data_IDs.
+;#
+;# If $Skip_Locked is true they a message that has a lock file is skipped
+;# and will not show up in any of the arrays.
+;#
+;# If everything went AOK then $Status is 1; otherwise, $Status is 0 and
+;# $Msg tells what went wrong.
+;#
+;# Globals:
+;#    None
+;#
+;# Arguments:
+;#    $Queue, $Skip_Locked, *Missing_Control_IDs, *Missing_Data_IDs
+;#
+;# Returns:
+;#    $Status, $Msg, @Valid_IDs
+;###############################################################################
+sub main'Get_Queue_IDs
+{
+X   local ($Queue, $Skip_Locked, *Missing_Control_IDs, 
+X          *Missing_Data_IDs) = @_;
+X   local (*QUEUE, @Files, %Lock_IDs, %Data_IDs, %Control_IDs, $_);
+X
+X   # Make sure that the * argument @arrays ar empty
+X   @Missing_Control_IDs = @Missing_Data_IDs = ();
+X
+X   # Save each data, lock, and queue file in @Files
+X   opendir (QUEUE, $Queue) || return (0, "error getting directory listing of $Queue");
+X   @Files = grep (/^(df|lf|qf)/, readdir (QUEUE));
+X   closedir (QUEUE);
+X   
+X   # Create indexed list of data and control files. IF $Skip_Locked is true
+X   # then skip either if there is a lock file present.
+X   if ($Skip_Locked)
+X   {
+X      grep ((s/^lf//) && ($Lock_IDs {$_} = 1), @Files);
+X      grep ((s/^df//) && (! $Lock_IDs {$_}) && ($Data_IDs {$_} = 1), @Files);
+X      grep ((s/^qf//) && (! $Lock_IDs {$_}) && ($Control_IDs {$_} = 1), @Files);
+X   }
+X   else
+X   {
+X      grep ((s/^df//) && ($Data_IDs {$_} = 1), @Files);
+X      grep ((s/^qf//) && ($Control_IDs {$_} = 1), @Files);
+X   };
+X   
+X   # Find missing control and data files and remove them from the lists of each
+X   @Missing_Control_IDs = sort (grep ((! $Control_IDs {$_}) && (delete $Data_IDs {$_}), keys (%Data_IDs)));
+X   @Missing_Data_IDs = sort (grep ((! $Data_IDs {$_} && (delete $Control_IDs {$_})), keys (%Control_IDs)));
+X   
+X   
+X   # Return the IDs in an appartently random order
+X   return (1, "", keys (%Control_IDs));
+};
+X
+X
+;###############################################################################
+;# Parse_Control_File
+;#
+;# Will pase a sendmail queue control file for useful information. See the
+;# Sendmail Installtion and Operation Guide (SMM:07) for a complete
+;# explanation of each field.
+;#
+;# The following globbed variables are set (or cleared) by this function:
+;#
+;#    $Sender           The sender's address. 
+;#
+;#    @Recipients       One or more addresses for the recipient of the mail.
+;#
+;#    @Errors_To        One or more addresses for addresses to which mail
+;#                      delivery errors should be sent.
+;#
+;#    $Creation_Time    The job creation time in time(3) format. That is,
+;#                      seconds since 00:00:00 GMT 1/1/70.
+;#
+;#    $Priority         An integer representing the current message priority.
+;#                      This is used to order the queue. Higher numbers mean 
+;#                      lower priorities.
+;#
+;#    $Status_Message   The status of the mail message. It can contain any
+;#                      text.
+;#
+;#    @Headers          Message headers unparsed but in their original order.
+;#                      Headers that span multiple lines are not mucked with,
+;#                      embedded \ns will be evident.
+;#
+;# In all e-mail addresses bounding <> pairs are stripped.
+;#
+;# If everything went AOK then $Status is 1. If the message with queue ID
+;# $Queue_ID just does not exist anymore -1 is returned. This is very
+;# possible and should be allowed for. Otherwise, $Status is 0 and $Msg 
+;# tells what went wrong.
+;#
+;# Globals:
+;#    None
+;#
+;# Arguments:
+;#    $Queue, $Queue_ID, *Sender, *Recipients, *Errors_To, *Creation_Time, 
+;#    *Priority, *Status_Message, *Headers
+;#
+;# Returns:
+;#    $Status, $Msg
+;###############################################################################
+sub main'Parse_Control_File
+{
+X   local ($Queue, $Queue_ID, *Sender, *Recipients, *Errors_To, *Creation_Time,
+X          *Priority, *Status_Message, *Headers) = @_;
+X   local (*Control, $_, $Not_Empty);
+X
+X   # Required variables and the associated control. If empty at the end of
+X   # parsing we return a bad status.
+X   @REQUIRED_INFO = ('$Creation_Time', 'T', '$Sender', 'S', '@Recipients', 'R',
+X		     '$Priority', 'P');
+X
+X   # Open up the control file for read
+X   $Control = "$Queue/qf$Queue_ID";
+X   if (! open (Control)) 
+X   {
+X      return (-1) if ((-x $Queue) && (! -f "$Queue/qf$Queue_ID") &&
+X       (! -f "$Queue/df$Queue_ID"));
+X      return (0, "error opening $Control for read: $!");
+X   };
+X
+X   # Reset the globbed variables just in case
+X   $Sender = $Creation_Time = $Priority = $Status_Message = "";
+X   @Recipients = @Errors_To = @Headers = ();
+X
+X   # Look for a few things in the control file
+X   READ: while (<Control>)
+X   {
+X      $Not_Empty = 1;
+X      chop;
+X
+X      PARSE:
+X      {
+X         if (/^T(\d+)$/)
+X         {
+X            $Creation_Time = $1;
+X         }
+X         elsif (/^S(<)?([^>]+)/)
+X         {
+X            $Sender = $2;
+X         }
+X         elsif (/^R(<)?([^>]+)/)
+X         {
+X            push (@Recipients, $2);
+X         }
+X         elsif (/^E(<)?([^>]+)/)
+X         {
+X            push (@Errors_To, $2);
+X         }
+X         elsif (/^M(.*)/)
+X         {
+X            $Status_Message = $1;
+X         }
+X         elsif (/^P(\d+)$/)
+X         {
+X            $Priority = $1;
+X         }
+X         elsif (/^H(.*)/)
+X         {
+X            $Header = $1;
+X            while (<Control>)
+X            {
+X               chop;
+X               last if (/^[A-Z]/);
+X               $Header .= "\n$_";
+X            };
+X            push (@Headers, $Header);
+X	    redo PARSE if ($_);
+X	    last if (eof);
+X         };
+X      };
+X   };
+X
+X   # If the file was empty scream bloody murder
+X   return (0, "empty control file") if (! $Not_Empty);
+X
+X   # Yell if we could not find a required field
+X   while (($Var, $Control) = splice (@REQUIRED_INFO, 0, 2))
+X   {
+X      eval "return (0, 'required control field $Control not found')
+X	       if (! $Var)";
+X      return (0, "error checking \$Var: $@") if ($@);
+X   };
+X
+X   # Everything went AOK
+X   return (1);
+};
+X
+1;
+SHAR_EOF
+chmod 0444 libs/mqueue.pl ||
+echo 'restore of libs/mqueue.pl failed'
+Wc_c="`wc -c < 'libs/mqueue.pl'`"
+test 6908 -eq "$Wc_c" ||
+	echo 'libs/mqueue.pl: original size 6908, current size' "$Wc_c"
+fi
+# ============= libs/newgetopts.pl ==============
+if test -f 'libs/newgetopts.pl' -a X"$1" != X"-c"; then
+	echo 'x - skipping libs/newgetopts.pl (File already exists)'
+else
+echo 'x - extracting libs/newgetopts.pl (Text)'
+sed 's/^X//' << 'SHAR_EOF' > 'libs/newgetopts.pl' &&
+;# NAME
+;#    newgetopts.pl - a better newgetopt (which is a better getopts which is
+;#                    a better getopt ;-)
+;#
+;# AUTHOR
+;#    Mike Muegel (mmuegel@mot.com)
+;#
+;# mmuegel
+;# /usr/local/ustart/src/mail-tools/dist/foo/libs/newgetopts.pl,v 1.1 1993/07/28 08:07:19 mmuegel Exp
+X
+;###############################################################################
+;# New_Getopts
+;#
+;# Does not care about order of switches, options, and arguments like 
+;# getopts.pl. Thus all non-switches/options will be kept in ARGV even if they
+;# are not at the end. If $Pass_Invalid is set all unkown options will be
+;# passed back to the caller by keeping them in @ARGV. This is useful when
+;# parsing a command line for your script while ignoring options that you
+;# may pass to another script. If this is set New_Getopts tries to maintain 
+;# the switch clustering on the unkown switches.
+;#
+;# Accepts the special argument -usage to print the Usage string. Also accepts 
+;# the special option -version which prints the contents of the string 
+;# $VERSION. $VERSION may or may not have an embeded \n in it. If -usage 
+;# or -version are specified a status of -1 is returned. Note that the usage
+;# option is only accepted if the usage string is not null.
+;# 
+;# $Switches is just like the formal arguemnt of getopts.pl. $Usage is a usage
+;# string with or without a trailing \n. *Switch_To_Order is an optional
+;# pointer to the name of an associative array which will contain a mapping of
+;# switch names to the order in which (if at all) the argument was entered.
+;#
+;# For example, if @ARGV contains -v, -x, test:
+;#
+;#    $Switch_To_Order {"v"} = 1;
+;#    $Switch_To_Order {"x"} = 2;
+;#
+;# Note that in the case of multiple occurances of an option $Switch_To_Order
+;# will store each occurance of the argument via a string that emulates
+;# an array. This is done by using join ($;, ...). You can retrieve the
+;# array by using split (/$;/, ...).
+;#
+;# *Split_ARGV is an optional pointer to an array which will conatin the
+;# original switches along with their values. For the example used above 
+;# Split_ARGV would contain:
+;#
+;#   @Split_ARGV = ("v", "", "x", "test");
+;#
+;# Another exciting ;-) feature that newgetopts has. Along with creating the 
+;# normal $opt_ scalars for the last value of an argument the list @opt_ is 
+;# created. It is an array which contains all the values of arguments to the 
+;# basename of the variable. They are stored in the order which they occured 
+;# on the command line starting with $[. Note that blank arguments are stored 
+;# as "". Along with providing support for multiple options on the command 
+;# line this also provides a method of counting the number of times an option 
+;# was specified via $#opt_.
+;#
+;# Automatically resets all $opt_, @opt_, %Switch_To_Order, and @Split_ARGV
+;# variables so that New_Getopts may be called more than once from within
+;# the same program. Thus, if $opt_v is set upon entry to New_Getopts and 
+;# -v is not in @ARGV $opt_v will not be set upon exit.
+;#
+;# Arguments:
+;#    $Switches, $Usage, $Pass_Invalid, *Switch_To_Order, *Split_ARGV
+;#
+;# Returns:
+;#    -1, 0, or 1 depending on status (printed Usage/Version, OK, not OK)
+;###############################################################################
+sub New_Getopts 
+{
+X    local($taint_argumentative, $Usage, $Pass_Invalid, *Switch_To_Order,
+X          *Split_ARGV) = @_;
+X    local(@args,$_,$first,$rest,$errs, @leftovers, @current_leftovers,
+X          %Switch_Found);
+X    local($[, $*, $Script_Name, $argumentative);
+X
+X    # Untaint the argument cluster so that we can use this with taintperl
+X    $taint_argumentative =~ /^(.*)$/;
+X    $argumentative = $1;
+X
+X    # Clear anything that might still be set from a previous New_Getopts
+X    # call.
+X    @Split_ARGV = ();
+X
+X    # Get the basename of the calling script
+X    ($Script_Name = $0) =~ s/.*\///;
+X    
+X    # Make Usage have a trailing \n
+X    $Usage .= "\n" if ($Usage !~ /\n$/);
+X
+X    @args = split( / */, $argumentative );
+X
+X    # Clear anything that might still be set from a previous New_Getopts call.
+X    foreach $first (@args)
+X    {
+X       next if ($first eq ":");
+X       delete $Switch_Found {$first};
+X       delete $Switch_To_Order {$first};
+X       eval "undef \@opt_$first; undef \$opt_$first;";
+X    };
+X
+X    while (@ARGV)
+X    {
+X        # Let usage through
+X        if (($ARGV[0] eq "-usage") && ($Usage ne "\n"))
+X        {
+X           print $Usage;
+X           exit (-1);
+X        }
+X
+X        elsif ($ARGV[0] eq "-version")
+X        {
+X           if ($VERSION)
+X           {
+X              print $VERSION;
+X              print "\n" if ($VERSION !~ /\n$/);
+X           }
+X           else
+X           {
+X              warn "${Script_Name}: no version information available, sorry\n";
+X           }
+X           exit (-1);
+X        }
+X
+X        elsif (($_ = $ARGV[0]) =~ /^-(.)(.*)/)
+X        {
+X           ($first,$rest) = ($1,$2);
+X           $pos = index($argumentative,$first);
+X
+X           $Switch_To_Order {$first} = join ($;, split (/$;/, $Switch_To_Order {$first}), ++$Order);
+X
+X           if($pos >= $[) 
+X           {
+X               if($args[$pos+1] eq ':') 
+X               {
+X                   shift(@ARGV);
+X                   if($rest eq '') 
+X                   {
+X                       $rest = shift(@ARGV);
+X                   }
+X
+X                   eval "\$opt_$first = \$rest;";
+X                   eval "push (\@opt_$first, \$rest);";
+X                   push (@Split_ARGV, $first, $rest);
+X               }
+X               else 
+X               {
+X                   eval "\$opt_$first = 1";
+X                   eval "push (\@opt_$first, '');";
+X                   push (@Split_ARGV, $first, "");
+X
+X                   if($rest eq '') 
+X                   {
+X                       shift(@ARGV);
+X                   }
+X                   else 
+X                   {
+X                       $ARGV[0] = "-$rest";
+X                   }
+X               }
+X           }
+X
+X           else 
+X           {
+X               # Save any other switches if $Pass_Valid
+X               if ($Pass_Invalid)
+X               {
+X                  push (@current_leftovers, $first);
+X               }
+X               else
+X               {
+X                  warn "${Script_Name}: unknown option: $first\n";
+X                  ++$errs;
+X               };
+X               if($rest ne '') 
+X               {
+X                   $ARGV[0] = "-$rest";
+X               }
+X               else 
+X               {
+X                   shift(@ARGV);
+X               }
+X           }
+X        }
+X
+X        else
+X        {
+X           push (@leftovers, shift (@ARGV));
+X        };
+X
+X        # Save any other switches if $Pass_Valid
+X        if ((@current_leftovers) && ($rest eq ''))
+X        {
+X           push (@leftovers, "-" . join ("", @current_leftovers));
+X           @current_leftovers = ();
+X        };
+X    };
+X
+X    # Automatically print Usage if a warning was given
+X    @ARGV = @leftovers;
+X    if ($errs != 0)
+X    {
+X       warn $Usage;
+X       return (0);
+X    }
+X    else
+X    {
+X       return (1);
+X    }
+X       
+}
+X
+1;
+SHAR_EOF
+chmod 0444 libs/newgetopts.pl ||
+echo 'restore of libs/newgetopts.pl failed'
+Wc_c="`wc -c < 'libs/newgetopts.pl'`"
+test 7024 -eq "$Wc_c" ||
+	echo 'libs/newgetopts.pl: original size 7024, current size' "$Wc_c"
+fi
+# ============= libs/strings1.pl ==============
+if test -f 'libs/strings1.pl' -a X"$1" != X"-c"; then
+	echo 'x - skipping libs/strings1.pl (File already exists)'
+else
+echo 'x - extracting libs/strings1.pl (Text)'
+sed 's/^X//' << 'SHAR_EOF' > 'libs/strings1.pl' &&
+;# NAME
+;#    strings1.pl - FUN with strings #1
+;#
+;# NOTES
+;#    I wrote Format_Text_Block when I just started programming Perl so
+;#    it is probably not very Perlish code. Center is more like it :-).
+;#
+;# AUTHOR
+;#    Michael S. Muegel (mmuegel@mot.com)
+;#
+;# RCS INFORMATION
+;#    mmuegel
+;#    /usr/local/ustart/src/mail-tools/dist/foo/libs/strings1.pl,v 1.1 1993/07/28 08:07:19 mmuegel Exp
+X
+package strings1;
+X
+;###############################################################################;# Center
+;#
+;# Center $Text assuming the output should be $Columns wide. $Text can span
+;# multiple lines, of course :-). Lines within $Text that contain only 
+;# whitespace are not centered and are instead collapsed. This may save time 
+;# when printing them later.
+;#
+;# Arguments:
+;#    $Text, $Columns
+;#
+;# Returns:
+;#    $Centered_Text
+;###############################################################################
+sub main'Center
+{
+X   local ($_, $Columns) = @_;
+X   local ($*) = 1;
+X
+X   s@^(.*)$@" " x (($Columns - length ($1)) / 2) . $1@eg;
+X   s/^[\t ]*$//g;
+X   return ($_);
+};
+X
+;###############################################################################
+;# Format_Text_Block
+;#
+;# Formats a text string to be printed to the display or other similar device.
+;# Text in $String will be fomratted such that the following hold:
+;#
+;#    + $String contains the (possibly) multi-line text to print. It is
+;#	automatically word-wrapped to fit in $Columns. 
+;#
+;#    + \n'd are maintained and are not folded.
+;#
+;#    + $Offset	is pre-pended before each separate line of text. 
+;#
+;#    + If $Offset_Once	is $TRUE $Offset will only appear on the first line.
+;#      All other lines will be indented to match the amount of whitespace of
+;#      $Offset.
+;#
+;#    + If $Bullet_Indent is $TRUE $Offset will only be applied to the begining
+;#      of lines as they occured in the original $String. Lines that are created
+;#      by this routine will always be indented by blank spaces.
+;#
+;#    + If $Columns is 0 no word-wrap is done. This might be useful to still
+;#      to offset each line in a buffer.
+;#
+;#    + If $Split_Expr is supplied the string is split on it. If not supplied
+;#      the string is split on " \t\/\-\,\." by default.
+;#
+;#    + If $Offset_Blank is $TRUE then empty lines will have $Offset pre-pended
+;#      to them. Otherwise, they will still empty.
+;#
+;# This is a realy workhorse routine that I use in many places because of its
+;# veratility.
+;#
+;# Arguments:
+;#    $String, $Offset, $Offset_Once, $Bullet_Indent, $Columns, $Split_Expr,
+;#    $Offset_Blank
+;#
+;# Returns:
+;#    $Buffer
+;###############################################################################
+sub main'Format_Text_Block
+{
+X   local ($String, $Real_Offset, $Offset_Once, $Bullet_Indent, $Columns, 
+X      $Split_Expr, $Offset_Blank) = @_;
+X
+X   local ($New_Line, $Line, $Chars_Per_Line, $Space_Offset, $Buffer,
+X      $Next_New_Line, $Num_Lines, $Num_Offsets, $Offset);
+X   local ($*) = 0;
+X   local ($BLANK_TAG) = "__FORMAT_BLANK__";
+X   local ($Blank_Offset) = $Real_Offset if ($Offset_Blank);
+X
+X   # What should we split on?
+X   $Split_Expr = " \\t\\/\\-\\,\\." if (! $Split_Expr);
+X
+X   # Pre-process the string - convert blank lines to __FORMAT_BLANK__ sequence
+X   $String =~ s/\n\n/\n$BLANK_TAG\n/g;
+X   $String =~ s/^\n/$BLANK_TAG\n/g;
+X   $String =~ s/\n$/\n$BLANK_TAG/g;
+X
+X   # If bad $Columns/$Offset combo or no $Columns make a VERRRYYY wide $Column
+X   $Offset = $Real_Offset;
+X   $Chars_Per_Line = 16000 if (($Chars_Per_Line = $Columns - length ($Offset)) <= 0);
+X   $Space_Offset = " " x length ($Offset);
+X
+X   # Get a buffer
+X   foreach $Line (split ("\n", $String))
+X   {
+X      $Offset = $Real_Offset if ($Bullet_Indent);
+X
+X      # Find where to split the line
+X      if ($Line ne $BLANK_TAG)
+X      { 
+X         $New_Line = "";
+X         while ($Line =~ /^([$Split_Expr]*)([^$Split_Expr]+)/)
+X         {
+X            if (length ("$New_Line$&") >= $Chars_Per_Line)
+X            {
+X               $Next_New_Line = $+;
+X               $New_Line = "$Offset$New_Line$1";
+X               $Buffer .= "\n" if ($Num_Lines++);
+X               $Buffer .= $New_Line;
+X               $Offset = $Space_Offset if (($Offset) && ($Offset_Once));
+X               $New_Line = $Next_New_Line;
+X               ++$Num_Lines;
+X            }
+X            else
+X            {
+X               $New_Line .= $&;
+X            };
+X            $Line = $';
+X         };
+X
+X         $Buffer .= "\n" if ($Num_Lines++);
+X         $Buffer .= "$Offset$New_Line$Line";
+X         $Offset = $Space_Offset if (($Offset) && ($Offset_Once));
+X      }
+X
+X      else
+X      {
+X         $Buffer .= "\n$Blank_Offset";
+X      };
+X   };
+X
+X   return ($Buffer);
+X
+};
+X
+1;
+SHAR_EOF
+chmod 0444 libs/strings1.pl ||
+echo 'restore of libs/strings1.pl failed'
+Wc_c="`wc -c < 'libs/strings1.pl'`"
+test 4687 -eq "$Wc_c" ||
+	echo 'libs/strings1.pl: original size 4687, current size' "$Wc_c"
+fi
+# ============= libs/timespec.pl ==============
+if test -f 'libs/timespec.pl' -a X"$1" != X"-c"; then
+	echo 'x - skipping libs/timespec.pl (File already exists)'
+else
+echo 'x - extracting libs/timespec.pl (Text)'
+sed 's/^X//' << 'SHAR_EOF' > 'libs/timespec.pl' &&
+;# NAME
+;#    timespec.pl - convert a pre-defined time specifyer to seconds
+;#
+;# AUTHOR
+;#    Michael S. Muegel (mmuegel@mot.com)
+;#
+;# RCS INFORMATION
+;#    mmuegel
+;#    /usr/local/ustart/src/mail-tools/dist/foo/libs/timespec.pl,v 1.1 1993/07/28 08:07:19 mmuegel Exp
+X
+package timespec;
+X
+%TIME_SPEC_TO_SECONDS 	= ("s", 1,
+X		    	   "m", 60,
+X		    	   "h", 60 * 60,
+X		    	   "d", 60 * 60 * 24
+X		    	   );
+X
+$VALID_TIME_SPEC_EXPR 	= "[" . join ("", keys (%TIME_SPEC_TO_SECONDS)) . "]";
+X
+;###############################################################################
+;# Time_Spec_To_Seconds
+;#
+;# Converts a string of the form:
+;#
+;#    (<number>(s|m|h|d))+
+;#
+;# to seconds. The second part of the time spec specifies seconds, minutes, 
+;# hours, or days, respectfully. The first part is the number of those untis. 
+;# There can be any number of such specifiers. As an example, 1h30m means 1 
+;# hour and 30 minutes.
+;#
+;# If the parsing went OK then $Status is 1, $Msg is undefined, and $Seconds
+;# is $Time_Spec converted to seconds. If something went wrong then $Status
+;# is 0 and $Msg explains what went wrong.
+;#
+;# Arguments:
+;#    $Time_Spec
+;#
+;# Returns:
+;#    $Status, $Msg, $Seconds
+;###############################################################################
+sub main'Time_Spec_To_Seconds
+{
+X   $Time_Spec = $_[0];
+X
+X   $Seconds = 0;
+X   while ($Time_Spec =~ /^(\d+)($VALID_TIME_SPEC_EXPR)/)
+X   {
+X      $Seconds += $1 * $TIME_SPEC_TO_SECONDS {$2};
+X      $Time_Spec = $';
+X   };
+X
+X   return (0, "error parsing time spec: $Time_Spec") if ($Time_Spec ne "");
+X   return (1, "", $Seconds);
+X
+};
+X
+X
+1;
+SHAR_EOF
+chmod 0444 libs/timespec.pl ||
+echo 'restore of libs/timespec.pl failed'
+Wc_c="`wc -c < 'libs/timespec.pl'`"
+test 1609 -eq "$Wc_c" ||
+	echo 'libs/timespec.pl: original size 1609, current size' "$Wc_c"
+fi
+# ============= man/cqueue.1 ==============
+if test ! -d 'man'; then
+    echo 'x - creating directory man'
+    mkdir 'man'
+fi
+if test -f 'man/cqueue.1' -a X"$1" != X"-c"; then
+	echo 'x - skipping man/cqueue.1 (File already exists)'
+else
+echo 'x - extracting man/cqueue.1 (Text)'
+sed 's/^X//' << 'SHAR_EOF' > 'man/cqueue.1' &&
+.TH CQUEUE 1L
+\"
+\" mmuegel
+\" /usr/local/ustart/src/mail-tools/dist/foo/man/cqueue.1,v 1.1 1993/07/28 08:08:25 mmuegel Exp
+\"
+.ds mp \fBcqueue\fR
+.de IB
+.IP \(bu 2
+..
+.SH NAME
+\*(mp - check sendmail queue for problems
+.SH SYNOPSIS
+.IP \*(mp 7 
+[ \fB-abdms\fR ] [ \fB-q\fR \fIqueue-dir\fI ] [ \fB-t\fR \fItime\fR ] 
+[ \fB-u\fR \fIusers\fR ] [ \fB-w\fR \fIwidth\fR ]
+.SH DESCRIPTION
+Reports on problems in the sendmail queue. With no options this simply
+means listing messages that have been in the queue longer than a default
+period along with a summary of queue mail by host and status message.
+.SH OPTIONS
+.IP \fB-a\fR 14
+Report on all messages in the queue. This is equivalent to saying \fB-t\fR 0s.
+You may like this command so much that you use it as a replacement for
+\fBmqueue\fR. For example:
+.sp 1
+.RS
+.RS
+\fBalias mqueue cqueue -a\fR
+.RE
+.RE
+.IP \fB-b\fR 14
+Also report on bogus queue files. Those are files that
+have data files and no control files or vice versa.
+.IP \fB-d\fR
+Print a detailed report of mail messages that have been queued longer than
+the specified or default time. Information that is presented includes:
+.RS
+.RS
+.IB
+Sendmail queue identifier.
+.IB
+Date the message was first queued.
+.IB
+Sender of the message.
+.IB
+One or more recipients of the message.
+.IB
+An optional status of the message. This usually indicates why the message
+has not been delivered.
+.RE
+.RE
+.IP \fB-m\fR 14
+Mail off the results if any problems were found.
+Normaly results are printed to stdout. If this option
+is specified they are mailed to one or more users. Results
+are not printed to stdout in this case. Results are \fBonly\fR
+mailed if \*(mp found something wrong.
+.IP "\fB-q\fR \fIqueue-dir\fI"
+The sendmail mail queue directory. Default is \fB/usr/spool/mqueue\fR or
+some other site configured value.
+.IP "\fB-t\fR \fItime\fR"
+List messages that have been in the queue longer than
+\fItime\fR. Time should of the form:
+.sp 1
+.RS
+.RS
+(<number>(s|m|h|d))+
+.sp 1
+.RE
+.RE
+.RS 14
+The second portion of the above definition
+specifies seconds, minutes, hours, or
+days, respectfully. The first portion is the number of
+those units. There can be any number of such specifiers.
+As an example, 1h30m means 1 hour and 30 minutes.
+.sp 1
+The default is 2 hours.
+.RE
+.IP \fB-s\fR 14
+Print a summary of messages that have been queued longer than
+the specified or default time. Two separate types of summaries are printed.
+The first summarizes the queue messages by destination host. The host name
+is gleaned from the recipient addresses for each message.
+Thus the actual host names for this summary should be taken with a grain
+of salt since ruleset 0 has not been applied to the address the host was
+taken from nor were MX records consulted. It would be possible to add
+this; however, the execution time of the script would increase 
+dramatically. The second summary is by status message.
+.IP "\fB-u\fR \fIusers\fR"
+Specify list of users to send a mail report to other than
+the invoker. This option is only valid when \fB-m\fR has been
+specified. Multiple recipients may be separated by spaces.
+.IP "\fB-w\fR \fIwidth\fR"
+Specify the page width to which the output should tailored. \fIwidth\fR
+should be an integer representing some character position. The default is
+80 or some other site configured value. Output is folded neatly to match 
+\fIwidth\fR.
+.SH EXAMPLES
+.nf
+% \fBdate\fR
+Tue Jan 19 12:07:20 CST 1993
+X
+% \fBcqueue -t 21h45m -w 70\fR
+X
+Summary of messages in queue longer than 21:45:00 by destination 
+host:
+X
+X   Number of
+X   Messages    Destination Host
+X   ---------   ----------------
+X   2           cigseg.rtsg.mot.com
+X   1           mnesouth.corp.mot.com
+X   ---------
+X   3
+X
+Summary of messages in queue longer than 21:45:00 by status message:
+X
+X   Number of
+X   Messages    Status Message
+X   ---------   --------------
+X   1           Deferred: Connection refused by mnesouth.corp.mot.com
+X   2           Deferred: Host Name Lookup Failure
+X   ---------
+X   3
+X
+Detail of messages in queue longer than 21:45:00 sorted by creation 
+date:
+X
+X   ID:        AA20573
+X   Date:      02:09:27 PM 01/18/93
+X   Sender:    melrose-place-owner@ferkel.ucsb.edu
+X   Recipient: pbaker@cigseg.rtsg.mot.com
+X   Status:    Deferred: Host Name Lookup Failure
+X
+X   ID:        AA20757
+X   Date:      02:11:30 PM 01/18/93
+X   Sender:    90210-owner@ferkel.ucsb.edu
+X   Recipient: pbaker@cigseg.rtsg.mot.com
+X   Status:    Deferred: Host Name Lookup Failure
+X
+X   ID:        AA21110
+X   Date:      02:17:01 PM 01/18/93
+X   Sender:    rd_lap_wg@mdd.comm.mot.com
+X   Recipient: jim_mathis@mnesouth.corp.mot.com
+X   Status:    Deferred: Connection refused by mnesouth.corp.mot.com
+.fi
+.SH AUTHOR
+.nf
+Michael S. Muegel (mmuegel@mot.com)
+UNIX Applications Startup Group
+Corporate Information Office, Schaumburg, IL
+Motorola, Inc.
+.fi
+.SH COPYRIGHT NOTICE
+Copyright 1993, Motorola, Inc.
+.sp 1
+Permission to use, copy, modify and distribute without charge this
+software, documentation, etc. is granted, provided that this
+comment and the author's name is retained.  The author nor Motorola assume any
+responsibility for problems resulting from the use of this software.
+.SH SEE ALSO
+.nf
+\fBsendmail(8)\fR
+\fISendmail Installation and Operation Guide\fR.
+.fi
+SHAR_EOF
+chmod 0444 man/cqueue.1 ||
+echo 'restore of man/cqueue.1 failed'
+Wc_c="`wc -c < 'man/cqueue.1'`"
+test 5212 -eq "$Wc_c" ||
+	echo 'man/cqueue.1: original size 5212, current size' "$Wc_c"
+fi
+# ============= man/postclip.1 ==============
+if test -f 'man/postclip.1' -a X"$1" != X"-c"; then
+	echo 'x - skipping man/postclip.1 (File already exists)'
+else
+echo 'x - extracting man/postclip.1 (Text)'
+sed 's/^X//' << 'SHAR_EOF' > 'man/postclip.1' &&
+.TH POSTCLIP 1L
+\"
+\" mmuegel
+\" /usr/local/ustart/src/mail-tools/dist/foo/man/postclip.1,v 1.1 1993/07/28 08:08:25 mmuegel Exp
+\"
+.ds mp \fBpostclip\fR
+.SH NAME
+\*(mp - send only the headers to Postmaster
+.SH SYNOPSIS
+\*(mp [ \fB-v\fR ] [ \fIto\fR ... ]
+.SH DESCRIPTION
+\*(mp  will forward non-delivery reports to a postmaster after deleting the body
+of the message. This keeps bounced mail private and helps to avoid disk space problems. \*(mp tries its best to keep as much of the header trail as possible.
+Hopefully only the original body of the message will be filtered. Only messages
+that have a subject that begins with 'Returned mail:' are filtered. This
+ensures that other mail is not accidently mucked with. Finally, note that
+\fBsendmail\fR is used to deliver the message after it has been (possibly)
+filtered. All of the original headers will remain intact.
+.sp 1 
+You can use this with any \fBsendmail\fR by modifying the Postmaster alias.
+If you use IDA \fBsendmail\fR you could add the following to <machine>.m4:
+.sp 1
+.RS
+define(POSTMASTERBOUNCE, mailer-errors)
+.RE
+.sp 1
+In the aliases file, add a line similar to the following:
+.sp 1
+.RS
+mailer-errors: "|/usr/local/bin/postclip postmaster"
+.RE
+.SH OPTIONS
+.IP \fB-v\fR
+Be verbose about delivery. Probably only useful when debugging \*(mp.
+.IP \fIto\fR
+A list of one or more e-mail ids to send the modified
+Postmaster messages to. If none are specified postmaster
+is used.
+.SH AUTHOR
+.nf
+Michael S. Muegel (mmuegel@mot.com)
+UNIX Applications Startup Group
+Corporate Information Office, Schaumburg, IL
+Motorola, Inc.
+.fi
+.SH CREDITS
+The original idea to filter Postmaster mail was taken from a script by 
+Christopher Davis <ckd@eff.org>.
+.SH COPYRIGHT NOTICE
+Copyright 1992, Motorola, Inc.
+.sp 1
+Permission to use, copy, modify and distribute without charge this
+software, documentation, etc. is granted, provided that this
+comment and the author's name is retained.  The author nor Motorola assume any
+responsibility for problems resulting from the use of this software.
+.SH SEE ALSO
+.nf
+\fBsendmail(8)\fR
+.fi
+SHAR_EOF
+chmod 0444 man/postclip.1 ||
+echo 'restore of man/postclip.1 failed'
+Wc_c="`wc -c < 'man/postclip.1'`"
+test 2078 -eq "$Wc_c" ||
+	echo 'man/postclip.1: original size 2078, current size' "$Wc_c"
+fi
+# ============= src/cqueue ==============
+if test ! -d 'src'; then
+    echo 'x - creating directory src'
+    mkdir 'src'
+fi
+if test -f 'src/cqueue' -a X"$1" != X"-c"; then
+	echo 'x - skipping src/cqueue (File already exists)'
+else
+echo 'x - extracting src/cqueue (Text)'
+sed 's/^X//' << 'SHAR_EOF' > 'src/cqueue' &&
+#!/usr/local/ustart/bin/suidperl
+X
+# NAME
+#    cqueue - check sendmail queue for problems
+#
+# SYNOPSIS
+#    Type cqueue -usage
+#
+# AUTHOR
+#    Michael S. Muegel <mmuegel@mot.com>
+#
+# RCS INFORMATION
+#    mmuegel
+#    /usr/local/ustart/src/mail-tools/dist/foo/src/cqueue,v 1.1 1993/07/28 08:09:02 mmuegel Exp
+X
+# So that date.pl does not yell (Domain/OS version does a ``)
+$ENV{'PATH'}    = "";
+X
+# A better getopts routine
+require "newgetopts.pl";
+require "timespec.pl";
+require "mail.pl";
+require "date.pl";
+require "mqueue.pl";
+require "strings1.pl";
+require "elapsed.pl";
+X
+($Script_Name = $0) =~ s/.*\///;
+X         
+# Some defaults you may want to change
+$DEF_TIME	= "2h";
+$DEF_QUEUE      = "/usr/spool/mqueue";
+$DEF_COLUMNS	= 80;
+$DATE_FORMAT    = "%r %D";
+X
+# Constants that probably should not be changed
+$USAGE          = "Usage: $Script_Name [ -abdms ] [ -q queue-dir ] [ -t time ] [ -u user ] [ -w width ]\n";
+$VERSION        = "${Script_Name} by mmuegel; 1.1 of 1993/07/28 08:09:02";
+$SWITCHES       = "abdmst:u:q:w:";
+$SPLIT_EXPR	= '\s,\.@!%:';
+$ADDR_PART_EXPR	= '[^!@%]+';
+X
+# Let getopts parse for switches
+$Status = &New_Getopts ($SWITCHES, $USAGE);
+exit (0) if ($Status == -1);
+exit (1) if (! $Status);
+X
+# Check args 
+die "${Script_Name}: -u only valid with -m\n" if (($opt_u) && (! $opt_m));
+die "${Script_Name}: -a not valid with -t option\n" if ($opt_a && $opt_t);
+$opt_u = getlogin || (getpwuid ($<))[0] || $ENV{"USER"} || die "${Script_Name}: can not determine who you are!\n" if (! $opt_u);
+X
+# Set defaults
+$opt_t = "0s" if ($opt_a);
+$opt_t = $DEF_TIME if ($opt_t eq "");
+$opt_w = $DEF_COLUMNS if ($opt_w eq "");
+$opt_q = $DEF_QUEUE if ($opt_q eq "");
+$opt_s = $opt_d = 1 if (! ($opt_s || $opt_d));
+X
+# Untaint the users to mail to
+$opt_u =~ /^(.*)$/;
+$Users = $1;
+X
+# Convert time option to seconds and seconds to elapsed form
+die "${Script_Name}: $Msg\n" if (! (($Status, $Msg, $Seconds) = &Time_Spec_To_Seconds ($opt_t))[0]);
+$Elapsed = &Seconds_To_Elapsed ($Seconds, 1);
+$Time_Info = " longer than $Elapsed" if ($Seconds);
+X
+# Get the current time
+$Current_Time = time;
+$Current_Date = &date ($Current_Time, $DATE_FORMAT);
+X
+($Status, $Msg, @Queue_IDs) = &Get_Queue_IDs ($opt_q, 1, @Missing_Control_IDs,
+X   @Missing_Data_IDs);
+die "$Script_Name: $Msg\n" if (! $Status);
+X
+# Yell about missing data/control files?
+if ($opt_b)
+{
+X
+X   $Report = "\nMessages missing control files:\n\n   " . 
+X             join ("\n   ", @Missing_Control_IDs) . 
+X             "\n" 
+X      if (@Missing_Control_IDs);
+X
+X   $Report .= "\nMessages missing data files:\n\n   " . 
+X              join ("\n   ", @Missing_Data_IDs) . 
+X              "\n"
+X      if (@Missing_Data_IDs);
+};
+X
+# See if any mail messages are older than $Seconds
+foreach $Queue_ID (@Queue_IDs)
+{
+X   # Get lots of info about this sendmail message via the control file
+X   ($Status, $Msg) = &Parse_Control_File ($opt_q, $Queue_ID, *Sender, 
+X      *Recipients, *Errors_To, *Creation_Time, *Priority, *Status_Message, 
+X      *Headers);
+X   next if ($Status == -1);
+X   if (! $Status)
+X   {
+X      warn "$Script_Name: $Queue_ID: $Msg\n";
+X      next;
+X   };
+X
+X   # Report on message if it is older than $Seconds
+X   if ($Current_Time - $Creation_Time >= $Seconds)
+X   {
+X      # Build summary by host information. Keep track of each host destination
+X      # encountered.
+X      if ($opt_s)
+X      {
+X         %Host_Map = ();
+X         foreach (@Recipients)
+X         {
+X	    if ((/@($ADDR_PART_EXPR)$/) || (/($ADDR_PART_EXPR)!$ADDR_PART_EXPR$/))
+X            {
+X	       ($Host = $1) =~ tr/A-Z/a-z/;
+X               $Host_Map {$Host} = 1;
+X	    }
+X	    else
+X	    {
+X	       warn "$Script_Name: could not find host part from $_; contact author\n";
+X	    };
+X         };
+X
+X         # For each unique target host add to its stats
+X         grep ($Host_Queued {$_}++, keys (%Host_Map));
+X
+X         # Build summary by message information.
+X         $Message_Queued {$Status_Message}++ if ($Status_Message);
+X      };
+X
+X      # Build long report information for this creation time (there may be
+X      # more than one message created at the same time)
+X      if ($opt_d)
+X      {
+X         $Creation_Date = &date ($Creation_Time, $DATE_FORMAT);
+X         $Recipient_Info = &Format_Text_Block (join (", ", @Recipients), 
+X	    "   Recipient: ", 1, 0, $opt_w, $SPLIT_EXPR);
+X         $Time_To_Report {$Creation_Time} .= <<"EOS";
+X
+X   ID:        $Queue_ID
+X   Date:      $Creation_Date
+X   Sender:    $Sender
+$Recipient_Info
+EOS
+X
+X         # Add the status message if available to long report
+X         if ($Status_Message)
+X         {
+X	    $Time_To_Report {$Creation_Time} .= &Format_Text_Block ($Status_Message, 
+X   	       "   Status:    ", 1, 0, $opt_w, $SPLIT_EXPR) . "\n";
+X         };
+X      };
+X   };
+X
+};
+X
+# Add the summary report by target host?
+if ($opt_s)
+{
+X   foreach $Host (sort (keys (%Host_Queued)))
+X   {
+X      $Host_Report .= &Format_Text_Block ($Host, 
+X         sprintf ("   %-9d   ", $Host_Queued{$Host}), 1, 0, $opt_w,
+X         $SPLIT_EXPR) . "\n";
+X      $Num_Hosts += $Host_Queued{$Host};
+X   };
+X   if ($Host_Report)
+X   {
+X      chop ($Host_Report);
+X      $Report .= &Format_Text_Block("\nSummary of messages in queue$Time_Info by destination host:\n", "", 0, 0, $opt_w);
+X
+X      $Report .= <<"EOS";
+X
+X   Number of
+X   Messages    Destination Host
+X   ---------   ----------------
+$Host_Report
+X   ---------
+X   $Num_Hosts
+EOS
+X   };
+};
+X
+# Add the summary by message report?
+if ($opt_s)
+{
+X   foreach $Message (sort (keys (%Message_Queued)))
+X   {
+X      $Message_Report .= &Format_Text_Block ($Message, 
+X         sprintf ("   %-9d   ", $Message_Queued{$Message}), 1, 0, $opt_w, 
+X         $SPLIT_EXPR) . "\n";
+X      $Num_Messages += $Message_Queued{$Message};
+X   };
+X   if ($Message_Report)
+X   {
+X      chop ($Message_Report);
+X      $Report .= &Format_Text_Block ("\nSummary of messages in queue$Time_Info by status message:\n", "", 0, 0, $opt_w);
+X
+X      $Report .= <<"EOS";
+X
+X   Number of
+X   Messages    Status Message
+X   ---------   --------------
+$Message_Report
+X   ---------
+X   $Num_Messages
+EOS
+X   };
+};
+X
+# Add the detailed message reports?
+if ($opt_d)
+{
+X   foreach $Time (sort { $a <=> $b} (keys (%Time_To_Report)))
+X   {
+X      $Report .= &Format_Text_Block ("\nDetail of messages in queue$Time_Info sorted by creation date:\n","", 0, 0, $opt_w) if (! $Detailed_Header++);
+X      $Report .= $Time_To_Report {$Time};
+X   };
+};
+X
+# Now mail or print the report
+if ($Report)
+{
+X   $Report .= "\n";
+X   if ($opt_m)
+X   {
+X      ($Status, $Msg) = &Send_Mail ($Users, "sendmail queue report for $Current_Date", $Report, 0);
+X      die "${Script_Name}: $Msg" if (! $Status);
+X   }
+X
+X   else
+X   {
+X      print $Report;
+X   };
+X
+};
+X
+# I am outta here...
+exit (0);
+SHAR_EOF
+chmod 0555 src/cqueue ||
+echo 'restore of src/cqueue failed'
+Wc_c="`wc -c < 'src/cqueue'`"
+test 6647 -eq "$Wc_c" ||
+	echo 'src/cqueue: original size 6647, current size' "$Wc_c"
+fi
+# ============= src/postclip ==============
+if test -f 'src/postclip' -a X"$1" != X"-c"; then
+	echo 'x - skipping src/postclip (File already exists)'
+else
+echo 'x - extracting src/postclip (Text)'
+sed 's/^X//' << 'SHAR_EOF' > 'src/postclip' &&
+#!/usr/local/bin/perl
+X
+# NAME
+#    postclip - send only the headers to Postmaster
+#
+# SYNOPSIS
+#    postclip [ -v ] [ to ... ]
+#
+# AUTHOR
+#    Michael S. Muegel <mmuegel@mot.com>
+#
+# RCS INFORMATION
+#    /usr/local/ustart/src/mail-tools/dist/foo/src/postclip,v
+#    1.1 of 1993/07/28 08:09:02
+X
+# We use this to send off the mail
+require "newgetopts.pl";
+require "mail.pl";
+X
+# Get the basename of the script
+($Script_Name = $0) =~ s/.*\///;
+X
+# Some famous constants
+$USAGE          = "Usage: $Script_Name [ -v ] [ to ... ]\n";
+$VERSION        = "${Script_Name} by mmuegel; 1.1 of 1993/07/28 08:09:02";
+$SWITCHES       = "v";
+X
+# Let getopts parse for switches
+$Status = &New_Getopts ($SWITCHES, $USAGE);
+exit (0) if ($Status == -1);
+exit (1) if (! $Status);
+X
+# Who should we send the modified mail to?
+@ARGV = ("postmaster") if (! @ARGV);
+$Users = join (" ", @ARGV);
+@ARGV = ();
+X
+# Suck in the original header and save a few interesting lines
+while (<>) 
+{
+X    $Buffer .= $_ if (! /^From /);
+X    $Subject = $1 if (/^Subject:\s+(.*)$/);
+X    $From = $1 if (/^From:\s+(.*)$/);
+X    last if (/^$/);
+};
+X
+# Do not filter the message unless it has a subject and the subject indicates
+# it is an NDN
+if ($Subject && ($Subject =~ /^returned mail/i))
+{
+X   # Slurp input by paragraph. Keep track of the last time we saw what
+X   # appeared to be NDN text. We keep this.
+X   $/ = "\n\n";
+X   $* = 1;
+X   while (<>)
+X   {
+X      push (@Paragraphs, $_);
+X      $Last_Error_Para = $#Paragraphs 
+X	 if (/unsent message follows/i || /was not delivered because/);
+X   };
+X
+X   # Now save the NDN text into $Buffer
+X   $Buffer .= join ("", @Paragraphs [0..$Last_Error_Para]);
+}
+X
+else
+{
+X   undef $/;
+X   $Buffer .= <>;
+};
+X
+# Send off the (possibly) modified mail
+($Status, $Msg) = &Send_Mail ($Users, "", $Buffer, 0, $opt_v, 1);
+die "$Script_Name: $Msg\n" if (! $Status);
+SHAR_EOF
+chmod 0555 src/postclip ||
+echo 'restore of src/postclip failed'
+Wc_c="`wc -c < 'src/postclip'`"
+test 1836 -eq "$Wc_c" ||
+	echo 'src/postclip: original size 1836, current size' "$Wc_c"
+fi
+exit 0
+
+--
++----------------------------------------------------------------------------+
+| Michael S. Muegel                    | Internet E-Mail:    mmuegel@mot.com |
+| UNIX Applications Startup Group      | Moto Dist E-Mail:   X10090          |
+| Corporate Information Office         | Voice:              (708) 576-0507  |
+| Motorola                             | Fax:                (708) 576-4153  |
++----------------------------------------------------------------------------+
+
+      "I'm disturbed, I'm depressed, I'm inadequate -- I've got it all!"
+	  -- George from _Seinfeld_
diff --git a/usr.sbin/sendmail/contrib/oldbind.compat.c b/usr.sbin/sendmail/contrib/oldbind.compat.c
new file mode 100644
index 00000000000..1621a7ba5e8
--- /dev/null
+++ b/usr.sbin/sendmail/contrib/oldbind.compat.c
@@ -0,0 +1,79 @@
+/*
+**  OLDBIND.COMPAT.C
+**
+**	Very old systems do not have res_query(), res_querydomain() or
+**	res_search(), so emulate them here.
+**
+**	You really ought to be upgrading to a newer version of BIND
+**	(4.8.2 or later) rather than be using this.
+**
+**	J.R. Oldroyd <jr@inset.com>
+*/
+
+#include <sys/types.h>
+#include <netinet/in.h>
+#include <arpa/nameser.h>
+#include <resolv.h>
+
+typedef union
+{
+	HEADER	qb1;
+	char	qb2[PACKETSZ];
+} querybuf;
+
+res_query(dname, class, type, data, datalen)
+	char *		dname;
+	int		class;
+	int 		type;
+	char *		data;
+	int		datalen;
+{
+	int		n;
+	querybuf	buf;
+
+	n = res_mkquery(QUERY, dname, class, type, (char *) NULL, 0,
+		NULL, (char *) &buf, sizeof buf);
+	n = res_send((char *)&buf, n, data, datalen);
+
+	return n;
+}
+
+res_querydomain(host, dname, class, type, data, datalen)
+	char *		host;
+	char *		dname;
+	int		class;
+	int		type;
+	char *		data;
+	int		datalen;
+{
+	int		n;
+	querybuf	buf;
+	char		dbuf[256];
+
+	strcpy(dbuf, host);
+	if (dbuf[strlen(dbuf)-1] != '.')
+		strcat(dbuf, ".");
+	strcat(dbuf, dname);
+	n = res_mkquery(QUERY, dbuf, class, type, (char *) NULL, 0,
+		NULL, (char *)&buf, sizeof buf);
+	n = res_send((char *) &buf, n, data, datalen);
+
+	return n;
+}
+
+res_search(dname, class, type, data, datalen)
+	char *		dname;
+	int		class;
+	int		type;
+	char *		data;
+	int		datalen;
+{
+	int		n;
+	querybuf	buf;
+
+	n = res_mkquery(QUERY, dname, class, type, (char *)NULL, 0,
+		NULL, (char *) &buf, sizeof buf);
+	n = res_send((char *) &buf, n, data, datalen);
+
+	return n;
+}
diff --git a/usr.sbin/sendmail/contrib/rcpt-streaming b/usr.sbin/sendmail/contrib/rcpt-streaming
new file mode 100644
index 00000000000..a43af6d43f4
--- /dev/null
+++ b/usr.sbin/sendmail/contrib/rcpt-streaming
@@ -0,0 +1,305 @@
+Message-ID: <wgKo1lW00WBw46OU8k@andrew.cmu.edu>
+Date: Sun,  1 Aug 1993 00:02:57 -0400 (EDT)
+From: John Gardiner Myers <jgm+@CMU.EDU>
+To: sendmail@cs.berkeley.edu
+Subject: contrib/rcpt-streaming
+Beak: Is
+
+This patch implements "RCPT streaming" in sendmail version 8.  This
+patch is not an official part of sendmail.  Please report all problems
+with this patch to jgm+@cmu.edu.
+
+RCPT streming avoids network round trips by sending all RCPT commands
+for a single SMTP transaction together.  Sendmail then waits for all
+the replies, matching them up with the apropriate addresses.
+
+Apply to the sendmail src directory (your line numbers may vary) and
+compile with -DRCPTSTREAM
+
+diff -cr ./src/deliver.c /afs/andrew.cmu.edu/system/src/local/../host/oldsmail/016/src/deliver.c
+*** ./src/deliver.c	Thu Jul 22 14:28:19 1993
+--- /afs/andrew.cmu.edu/system/src/local/../host/oldsmail/016/src/deliver.c	Fri Jul 30 21:11:16 1993
+***************
+*** 1334,1339 ****
+--- 1334,1354 ----
+  			register int i;
+  
+  			/* send the recipient list */
++ #ifdef RCPTSTREAM
++ /***********************************************************************
++  *
++  * RCPT streaming code by John G Myers, jgm+@cmu.edu
++  * This is not supported by the maintainer of sendmail.
++  * Report all bugs concerning RCPT streaming to jgm+@cmu.edu
++  *
++  ***********************************************************************
++  */
++ 			for (to = tochain; to != NULL; to = to->q_tchain)
++ 			{
++ 				smtpstreammessage("RCPT To:<%s>", m, mci,
++ 						  to->q_user);
++ 			}
++ #endif
+  			tobuf[0] = '\0';
+  			for (to = tochain; to != NULL; to = to->q_tchain)
+  			{
+diff -cr ./src/usersmtp.c /afs/andrew.cmu.edu/system/src/local/../host/oldsmail/016/src/usersmtp.c
+*** ./src/usersmtp.c	Mon Jul 19 23:50:43 1993
+--- /afs/andrew.cmu.edu/system/src/local/../host/oldsmail/016/src/usersmtp.c	Fri Jul 30 21:12:00 1993
+***************
+*** 44,49 ****
+--- 44,61 ----
+  
+  # include <sysexits.h>
+  # include <errno.h>
++ #ifdef RCPTSTREAM
++ /***********************************************************************
++  *
++  * RCPT streaming code by John G Myers, jgm+@cmu.edu
++  * This is not supported by the maintainer of sendmail.
++  * Report all bugs concerning RCPT streaming to jgm+@cmu.edu
++  *
++  ***********************************************************************
++  */
++ # include <sys/types.h>
++ # include <sys/time.h>
++ #endif
+  
+  # ifdef SMTP
+  
+***************
+*** 62,67 ****
+--- 74,87 ----
+  char	SmtpError[MAXLINE] = "";	/* save failure error messages */
+  int	SmtpPid;			/* pid of mailer */
+  
++ #ifdef RCPTSTREAM
++ char	*SmtpStreamBuf;			/* buffer for streaming output */
++ int	SmtpStreamBufSize = 0;		/* allocated size of buffer */
++ char	*SmtpStreamStart;		/* pointer to text not yet written */
++ int	SmtpStreamLen = 0;		/* # chars not yet written */
++ #endif
++ 
++ 
+  #ifdef __STDC__
+  extern	smtpmessage(char *f, MAILER *m, MCI *mci, ...);
+  #endif
+***************
+*** 404,410 ****
+--- 424,434 ----
+  {
+  	register int r;
+  
++ #ifdef RCPTSTREAM
++ 	sprintf(SmtpMsgBuffer, "RCPT To:<%s>", to->q_user);
++ #else
+  	smtpmessage("RCPT To:<%s>", m, mci, to->q_user);
++ #endif
+  
+  	SmtpPhase = mci->mci_phase = "client RCPT";
+  	setproctitle("%s %s: %s", e->e_id, CurHostName, mci->mci_phase);
+***************
+*** 667,672 ****
+--- 694,703 ----
+  	bool firstline = TRUE;
+  	char junkbuf[MAXLINE];
+  
++ #ifdef RCPTSTREAM
++ 	extern char MsgBuf[];		/* err.c */
++ #endif
++ 
+  	if (mci->mci_out != NULL)
+  		(void) fflush(mci->mci_out);
+  
+***************
+*** 682,687 ****
+--- 713,755 ----
+  		register char *p;
+  		extern time_t curtime();
+  
++ #ifdef RCPTSTREAM
++ 		if (SmtpStreamLen > 0) {
++ 		    int outfd;
++ 
++ 		    outfd = fileno(mci->mci_out);
++ 
++ 		    nonblock(outfd, TRUE);
++ 		    r = write(outfd, SmtpStreamStart, SmtpStreamLen);
++ 		    nonblock(outfd, FALSE);
++ 		    if (r == -1 && errno != EAGAIN
++ #ifdef EWOULDBLOCK
++ 			&& errno != EWOULDBLOCK
++ #endif
++ 			) {
++ 
++ 			mci->mci_errno = errno;
++ 			message("451 streamreply: write error to %s",
++ 				mci->mci_host);
++ 
++ 			/* if debugging, pause so we can see state */
++ 			if (tTd(18, 100))
++ 			  pause();
++ # ifdef LOG
++ 			if (LogLevel > 0)
++ 			  syslog(LOG_INFO, "%s", &MsgBuf[4]);
++ # endif /* LOG */
++ 			/* stop trying to write output */
++ 			SmtpStreamLen = 0;
++ 			continue;
++ 		    }
++ 		    if (r > 0) {
++ 			SmtpStreamStart += r;
++ 			SmtpStreamLen -= r;
++ 		    }
++ 		}
++ #endif /* RCPTSTREAM */
++ 
+  		/* actually do the read */
+  		if (e->e_xfp != NULL)
+  			(void) fflush(e->e_xfp);	/* for debugging */
+***************
+*** 792,797 ****
+--- 860,937 ----
+  
+  	return (r);
+  }
++ 
++ #ifdef RCPTSTREAM
++ /*
++ **  SMTPSTREAMMESSAGE -- buffer message to be streamed to server
++ **
++ **	Parameters:
++ **		f -- format
++ **		m -- the mailer to control formatting.
++ **		a, b, c -- parameters
++ **
++ **	Returns:
++ **		none.
++ **
++ **	Side Effects:
++ **		stores message in SmtpStreamBuf
++ */
++ 
++ /*VARARGS1*/
++ #ifdef __STDC__
++ smtpstreammessage(char *f, MAILER *m, MCI *mci, ...)
++ #else
++ smtpstreammessage(f, m, mci, va_alist)
++ 	char *f;
++ 	MAILER *m;
++ 	MCI *mci;
++ 	va_dcl
++ #endif
++ {
++ 	VA_LOCAL_DECL
++ 	int len;
++ 
++ 	VA_START(mci);
++ 	(void) vsprintf(SmtpMsgBuffer, f, ap);
++ 	VA_END;
++ 
++ 	if (tTd(18, 1) || Verbose)
++ 		nmessage(">>> %s", SmtpMsgBuffer);
++ 	if (TrafficLogFile != NULL)
++ 		fprintf(TrafficLogFile, "%05d >>> %s\n", getpid(), SmtpMsgBuffer);
++ 
++ 	if (mci->mci_out == NULL) {
++ 	    if (tTd(18, 1)) printf("smtpstreammessage: NULL mci_out\n");
++ 	    return;
++ 	}
++ 
++ 	strcat(SmtpMsgBuffer, m == NULL ? "\r\n" : m->m_eol);
++ 	len = strlen(SmtpMsgBuffer);
++ 
++ 	if (SmtpStreamLen == 0) {
++ 	    if (SmtpStreamBufSize == 0) {
++ 		SmtpStreamBufSize = MAXLINE;
++ 		SmtpStreamBuf = xalloc(SmtpStreamBufSize);
++ 	    }
++ 	    SmtpStreamStart = SmtpStreamBuf;
++ 	}
++ 
++ 	if (SmtpStreamBufSize - SmtpStreamLen < len + 1) {
++ 	    int start = SmtpStreamStart - SmtpStreamBuf;
++ 	    SmtpStreamBufSize += MAXLINE;
++ 	    SmtpStreamBuf = realloc(SmtpStreamBuf, SmtpStreamBufSize);
++ 	    if (!SmtpStreamBuf) {
++ 		syserr("Out of memory!!");
++ 		abort();
++ 		/* exit(EX_UNAVAILABLE); */
++ 	    }
++ 	    SmtpStreamStart = SmtpStreamBuf + start;
++ 	}
++ 
++ 	strcpy(SmtpStreamBuf + SmtpStreamLen, SmtpMsgBuffer);
++ 	SmtpStreamLen += len;
++ }
++ #endif /* RCPTSTREAM */
+  /*
+  **  SMTPMESSAGE -- send message to server
+  **
+Only in /afs/andrew.cmu.edu/system/src/local/../host/oldsmail/016/src: usersmtp.c~
+diff -cr ./src/util.c /afs/andrew.cmu.edu/system/src/local/../host/oldsmail/016/src/util.c
+*** ./src/util.c	Mon Jul 19 23:50:45 1993
+--- /afs/andrew.cmu.edu/system/src/local/../host/oldsmail/016/src/util.c	Mon Jul 26 17:17:10 1993
+***************
+*** 1034,1039 ****
+--- 1034,1091 ----
+  			return (FALSE);
+  	return (TRUE);
+  }
++ 
++ #ifdef RCPTSTREAM
++ /***********************************************************************
++  *
++  * RCPT streaming code by John G Myers, jgm+@cmu.edu
++  * This is not supported by the maintainer of sendmail.
++  * Report all bugs concerning RCPT streaming to jgm+@cmu.edu
++  *
++  ***********************************************************************
++  */
++ 
++ #include <fcntl.h>
++ 
++ /*
++ **  NONBLOCK -- set or clear non-blocking mode on file descriptor
++ **
++ **	Parameters:
++ **		fd -- the file descriptor
++ **		mode -- TRUE to set non-blocking mode
++ **			FALSE to clear non-blocking mode
++ **
++ **	Returns:
++ **		none
++ **
++ **	Side Effects:
++ **		modifies nonblocking status of fd
++ */
++ 
++ nonblock(fd, mode)
++ int fd;
++ bool mode;
++ {
++     int flags;
++ 
++     flags = fcntl(fd, F_GETFL, 0);
++     if (mode) {
++ #ifdef FNONBIO
++ 	flags |= FNONBIO;
++ #else
++ 	flags |= O_NDELAY;
++ #endif
++     }
++     else {
++ #ifdef FNONBIO
++ 	flags &= ~FNONBIO;
++ #else
++ 	flags &= ~O_NDELAY;
++ #endif
++     }
++     fcntl(fd, F_SETFL, flags);
++ }
++ #endif
+  /*
+  **  STRCONTAINEDIN -- tell if one string is contained in another
+  **
diff --git a/usr.sbin/sendmail/contrib/xla/README b/usr.sbin/sendmail/contrib/xla/README
new file mode 100644
index 00000000000..a72fd03c832
--- /dev/null
+++ b/usr.sbin/sendmail/contrib/xla/README
@@ -0,0 +1,207 @@
+         XLA - Extended Load Average design for Sendmail R6
+         --------------------------------------------------
+
+          Christophe Wolfhugel - Herve Schauer Consultants
+              wolf@grasp.insa-lyon.fr, wolf@hsc-sec.fr
+
+
+WARNING:  this extension is supplied as a contribution to Sendmail.
+Should you have trouble, questions, please contact me directly, and
+*not* the Sendmail development team.
+
+
+ABSTRACT
+
+Sendmail currently furnishes a limitation mecanism which is based on
+the system load average, when available.  Experience has prooven that
+this was not sufficiant for some particular situations, for example
+if you have slow and/or overloaded links. This can easily cause both
+system and network congestions with Sendmail having to handle a large
+number of simultaneous sessions on the same overloaded link, causing
+most of the SMTP sessions to timeout after a long time.  The system
+load average is also generally too slow to react when your system
+gets a burst of incoming or outgoing SMTP sessions which on some
+stations can easily cause system unavailabilities.
+
+The extended load average module has been designed in order to furnish
+a way of limitation the load generated by Sendmail to both your
+system and your network. This design can be used either alone or as
+complementary to the system load average if your system supports it.
+
+Limitation is based on the number of incoming/outgoing SMTP sessions,
+and remote hosts are classified in classes. The system administrator
+will define a maximum number of incoming SMTP sessions as well as
+a maximum total (incoming + outgoing) sessions for each class of
+hosts. A class can be either an individual machine or a network.
+
+When the limit is reached for a given class, all incoming SMTP
+connections will be politely refused. When the limit is reached for
+all classes, the SMTP connections will be refused by the system
+(which one could consider as less politely :)).
+On outgoing mail, messages will be queued for delayed processing.
+
+The extended load average parameters are given in the Sendmail
+configuration file, and when not present, Sendmail behaves the
+usual way.
+
+
+COMPILATION
+
+Copy the xla.c module in the src sub-directory, edit the Makefile
+in order to define XLA (-DXLA). Also add the xla.[co] module name
+in the list of files so that it gets compiled.
+
+Regenerate sendmail by removing all objects, or at least those
+containing references to XLA (this list may vary, so use grep to
+get the module list).  This will generate a new sendmail executable
+containing the xla code.
+
+Debugging level 59 has been assigned to this module and when used
+it provides some output (sendmail -d59.x).  Please check the source
+code to see which levels are supported.
+
+
+CONFIGURATION
+
+The extended average uses a new set of configuration lines in the
+sendmail.cf file.  All newly introduced line begin with the letter L
+(capital L).
+
+Before detailling the syntax, first an example (this can be placed
+at any section of the sendmail.cf file, note that the order is
+important). Fields are separated by (one or more) tabs/spaces.
+
+# File name used to store the counters
+L/etc/sendmail.la
+# Classes definition
+# Lname            #queue #reject
+L*.insa-lyon.fr         8       3
+L*.univ-lyon1.fr        6       4
+L*                     15      16
+
+The first line defines the working file which will be used in order
+to have the occurences of Sendmail read and update the counters. The
+format of this file is described in the "Design" section.
+This line is mandatory and the specified file must be absolute (ie
+begin with a slash).
+
+Then you can specify one or more classes. The last class (*) is also
+mandatory and should be in last position as the first match will stop
+the search and if there is no match the behavior of Sendmail is unknown.
+
+Each class has three fields separated by one or more tabs/spaces.
+
+L{mask}         {queue_#}      {refuse_#}
+
+The {mask} is a simple mask. It can be either an explicit host name
+(like grasp.insa-lyon.fr) or a mask starting with "*." or just "*".
+No other variants are allowed.
+
+Lgrasp.insa-lyon.fr  will match exactely any session to/from this host.
+
+L*.insa-lyon.fr      will match any session to/from any machine in the
+                     insa-lyon.fr domain as well as from the machine
+                     named "insa-lyon.fr" if it exists.
+
+L*                   will match any session, and thus should also be
+                     last in the list to act as a catchup line.
+
+The {queue_#} is the maximum number of SMTP sessions in the given class
+for both incoming and outgoing messages. The {refuse_#} indicates when
+to refuse incoming messages for this class. The interaction between
+those counters is somewhat subtle. It seems logical that a standard
+configuration has {queue_#} >= {refuse_#}, and in fact in most
+configurations they can be equal (that's why what I use in my environment).
+Thus, this is not mandatory. If {queue_#} < {refuse_#} outgoing messages
+will be lower priority than incoming messages and once a class gets loaded
+the outgoing messages are blocked first.
+
+I use very low values in some situations, for example I have a customer
+connected to the Internet via a 9600 bps line, they also have internal
+users sending burst of messages (10, 20 small messages coming in just
+one or two seconds).  Both situations were unsupportable. The line is
+too slow to handle many simultaneous connections and the mail server
+does not have the ressources to handle such a heavy load (it's a 12 Megs
+Sun 3 also doing Usenet news).
+
+I have defined following section in the configuration file, and experience
+shows the benefits for everyone. Fake domain for the example: customer.fr.
+
+L/etc/sendmail.la
+L*.customer.fr          8       8
+L*                      3       3
+
+This means that there might not be more than 8 simultaneous SMTP sessions
+between the mail server and any other internal host. This is to protect
+the station from heavy loads like users (or applications !) sending
+several tenths of messages in just a few seconds).
+No more than 3 SMTP sessions are authorized with any other host, this is
+to save the load of the slow 9600 line to the Internet.
+
+Drawback is that is you have 3 * 2 Megs sessions established from/to the
+outside, all your mail will be held until one slot gets available, on
+a 9600 bps line just make your counts, il blocks your line during over
+one hour.
+
+
+DESIGN
+
+Sendmail will analyze the "L" lines in the configuration file during
+startup (or read the initialized structure from the frozen file).
+When started in daemon mode (and only there), any existing working file
+will be cleared and a new one is created. Each class gets a record in
+the sendmail.la work file. The size of this record is a short integer
+(generally two bytes) and represents the count of active sessions in
+the given class.  Read/Write operations in this file are done in
+one operation (as anyway the size is far below one disk sector). The
+file is locked with Sendmail's lockfile() function priori to any
+access.
+
+Handling incoming SMTP sessions.
+
+There is interaction is two points in the Sendmail source code. First
+on the listen system call: if all slots in all classes are in use,
+a listen(0) is done so that the system rejects any incoming SMTP session.
+This avois to fork and then reject the connexion.
+
+If there are some free slots, nothing better than accepting the
+connection, then forking can be done. The child process then checks if
+the adequate class is full or not. If full, it rejects the connection
+with a "421 Too many sessions" diagnostic to the sender (which should
+then appear when the remote users do a mailq). If the treshold {reject_#}
+is not reached, the connection is accepted and the counter is sendmail.la
+is updated.
+
+Handling outgoing SMTP sessions.
+
+As soon as Sendmail needs to connect to a distant host, the adequate class
+is checked against {queue_#} and if no slots are available, the message is
+queued for further processing.
+
+Sendmail's connection caching.
+
+Sendmail-R6 introduces a new design: connection caching, ie several SMTP
+sessions can be opened at the same time.  This could cause some problems
+when sending mail, as after having a few connections opened, all slots
+could be in use and generate a partial delivery of the message.  In
+order to deal with this, xla.c uses following design "for a given
+sendmail process, only the first connection in a given class is counted".
+This can be done because sendmail does not do parralel message sending
+on the different channels.
+
+End of connection.
+
+As soon as a connection is closed, the counters will be automatically
+updated.
+
+
+
+Please look at the code to understand of all this works. Comments,
+suggestions, questions welcome.
+
+
+
+                                        Christophe Wolfhugel
+                                        Herve Schauer Consultants
+                                        Paris, France
+                                        May 23, 1993
diff --git a/usr.sbin/sendmail/contrib/xla/xla.c b/usr.sbin/sendmail/contrib/xla/xla.c
new file mode 100644
index 00000000000..627d383676b
--- /dev/null
+++ b/usr.sbin/sendmail/contrib/xla/xla.c
@@ -0,0 +1,532 @@
+/*
+ * (C) Copyright 1993-94, Herve Schauer Consultants
+ *
+ * This module written by Christophe.Wolfhugel@hsc-sec.fr
+ * is to be used under the same conditions and terms (and absence
+ * or warranties) than the other modules of the Sendmail package.
+ *
+ * ABSOLUTELY NO WARRANTY. USE AT YOUR OWN RISKS.
+ *
+ * Version: 940417, applied a patch from Paul Graham <pjg@acsu.buffalo.edu>
+ *                  (lockfile syntax in xla.c did not reflect anymore the
+ *                  new one used by sendmail, now fine).
+ *
+ */
+
+
+#ifdef XLA
+
+#ifndef MAXLARULES
+# define MAXLARULES	20
+#endif
+
+# include "sendmail.h"
+
+typedef struct {
+		short	queue;		/* # of connexions to have queueing */
+		short	reject;		/* # of conn. to reject */
+		short	num;		/* # of increments this process */
+		char	*mask;		/* Mask (domain) */
+        } XLARULE;
+
+char	*XlaFname;			/* Work file name */
+char	XlaHostName[1024];		/* Temporary */
+int	XlaNext;			/* # of XlaRules */
+pid_t	XlaPid;				/* Pid updating the tables */
+XLARULE	XlaRules[MAXLARULES];		/* The rules themselves */
+short   XlaCtr[MAXLARULES];		/* Counter (for work file only) */
+
+extern	bool	lockfile();
+
+/*
+** XLAMATCH -- Matches a fnmatch like expression.
+**
+**	Parameters:
+**		mask -- mask to match the string too;
+**		name -- string.
+**
+** Mask can either be a plain string or a simplified fnmatch like mask:
+**	*.string     or  string.*
+** No other alternatives are accepted.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		none.
+*/
+
+bool
+XlaMatch(mask, name)
+	char *mask, *name;
+{
+	int l1, l2;
+
+	l1 = strlen(mask);  l2 = strlen(name);
+	if (l1 == 1 && mask[0] == '*') return(TRUE);
+	if (mask[0] == '*' && mask[1] == '.') {
+		if (l2 < (l1 - 2)) return(FALSE);
+		if (strcasecmp(&mask[2], name) == 0) return(TRUE);
+		if (strcasecmp(&mask[1], name + l2 - l1 + 1) == 0) return(TRUE);
+		return(FALSE);
+	}
+	if (l1 < 3) return(FALSE);
+	if (mask[l1 -1] == '*') {
+		if (l2 < l1 - 1) return(FALSE);
+		if (strncasecmp(mask, name, l1 - 1) == 0) return(TRUE);
+		return(FALSE);
+	}
+	if (strcasecmp(mask, name) == 0) return(TRUE);
+	return(FALSE);
+}
+
+/*
+** XLAZERO -- Zeroes the used variables
+**
+** 	Just initializes some variables, called once at sendmail
+**	startup.
+**
+**	Parameters:
+**		none.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		none.
+*/
+
+xla_zero()
+{
+	if (tTd(59, 1)) {
+		printf("xla_zero\n");
+	}
+	XlaFname = NULL;
+	XlaNext  = 0;
+	XlaPid   = 0;
+	memset((char *) &XlaRules[0], 0, sizeof(XLARULE) * MAXLARULES);
+}
+
+
+/*
+**  XLAINIT -- initialized extended load average stuff
+**
+**  This routine handles the L lines appearing in the configuration
+**  file.
+**
+**  L/etc/sendmail.la     indicates the working file
+**  Lmask   #1   #2	  Xtended LA to apply to mask
+**	#1 = Queueing # of connections
+**	#2 = Reject connections.
+**
+**	Parameters:
+**		line -- the cf file line to parse.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		Builds several internal tables.
+*/
+
+xla_init(line)
+	char *line;
+{
+	char *s;
+
+	if (tTd(59, 1)) {
+		printf("xla_init line: %s\n", line);
+	}
+	if (XlaFname == NULL && *line == '/') {	/* Work file name */
+                XlaFname = newstr(line);
+		if (tTd(59, 10))
+			printf("xla_init: fname = %s\n", XlaFname);
+		return;
+	}
+	if (XlaNext == MAXLARULES) {
+		syserr("too many xla rules defined (%d max)", MAXLARULES);
+		return;
+	}
+	s = strtok(line, " \t");
+	if (s == NULL) {
+		syserr("xla: line unparseable");
+		return;
+	}
+	XlaRules[XlaNext].mask = newstr(s);
+	s = strtok(NULL, " \t");
+	if (s == NULL) {
+		syserr("xla: line unparseable");
+		return;
+	}
+	XlaRules[XlaNext].queue = atoi(s);
+	s = strtok(NULL, " \t");
+	if (s == NULL) {
+		syserr("xla: line unparseable");
+		return;
+	}
+	XlaRules[XlaNext].reject = atoi(s);
+	if (tTd(59, 10))
+		printf("xla_init: rule #%d = %s q=%d r=%d\n", XlaNext, 
+			XlaRules[XlaNext].mask,
+			XlaRules[XlaNext].queue, XlaRules[XlaNext].reject);
+	XlaNext++;
+}
+
+
+/*
+**  XLACREATEFILE -- Create the working file
+**
+**	Tries to create the working file, called each time sendmail is
+**	invoked with the -bd option.
+**
+**	Parameters:
+**		none.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		Creates the working file (sendmail.la) and zeroes it.
+*/
+
+xla_create_file()
+{
+	int	fd, i;
+
+	if (tTd(59, 1))
+		printf("xla_create_file:\n");
+	if (XlaFname == NULL) return;
+	fd = open(XlaFname, O_RDWR|O_CREAT, 0644);
+	if (fd == -1) {
+		XlaFname = NULL;
+		syserr("xla_create_file: open failed");
+		return;
+	}
+	if (!lockfile(fd, XlaFname, NULL, LOCK_EX)) {
+		close(fd);
+		XlaFname = NULL;
+		syserr("xla_create_file: can't set lock");
+		return;
+	}
+	if (ftruncate(fd, 0) == -1) {
+		close(fd);
+		XlaFname = NULL;
+		syserr("xla_create_file: can't truncate XlaFname");
+		return;
+	}
+	if (write(fd, XlaCtr, sizeof(XlaCtr)) != sizeof(XlaCtr)) {
+		XlaFname == NULL;
+		syserr("xla_create_file: can't write XlaFname");
+	}
+	close(fd);
+}
+
+
+/*
+**  XLASMTPOK -- Checks if all slots are in use
+**
+**	Check is there are still some slots available for an SMTP
+**	connection.
+**
+**	Parameters:
+**		none.
+**
+**	Returns:
+**		TRUE -- slots are available;
+**		FALSE -- no more slots.
+**
+**	Side Effects:
+**		Reads a file, uses a lock and updates sendmail.la if a slot
+**		is free for use.
+*/
+
+bool
+xla_smtp_ok()
+{
+	int	fd, i;
+
+	if (tTd(59, 1))
+		printf("xla_smtp_ok:\n");
+	if (XlaFname == NULL) return(TRUE);
+	fd = open(XlaFname, O_RDWR, 0644);
+	if (fd == -1) {
+		XlaFname = NULL;
+		syserr("xla_smtp_ok: open failed");
+		return(TRUE);
+	}
+	if (!lockfile(fd, XlaFname, NULL, LOCK_EX)) {
+		close(fd);
+		XlaFname = NULL;
+		syserr("xla_smtp_ok: can't set lock");
+		return(TRUE);
+	}
+	if (read(fd, XlaCtr, sizeof(XlaCtr)) != sizeof(XlaCtr)) {
+		close(fd);
+                XlaFname = NULL;
+                syserr("xla_smtp_ok: can't read XlaFname");
+                return(TRUE);
+	}
+	close(fd);
+	for (i = 0; i < XlaNext; i++) {
+		if (XlaCtr[i] < XlaRules[i].reject)
+			return(TRUE);
+	}
+	return(FALSE);
+}
+
+
+/*
+**  XLAHOSTOK -- Can we accept a connection from this host
+**
+**	Check the quota for the indicated host
+**
+**	Parameters:
+**		name -- host name or IP# (string)
+**
+**	Returns:
+**		TRUE -- we can accept the connection;
+**		FALSE -- we must refuse the connection.1
+**
+**	Side Effects:
+**		Reads and writes a file, uses a lock and still updates
+**		sendmail.la is a slot gets assigned.
+*/
+
+bool
+xla_host_ok(name)
+	char *name;
+{
+	int	fd, i;
+
+	if (tTd(59, 1))
+		printf("xla_host_ok:\n");
+	if (XlaFname == NULL) return(TRUE);
+	fd = open(XlaFname, O_RDWR, 0644);
+	if (fd == -1) {
+		XlaFname = NULL;
+		syserr("xla_host_ok: open failed");
+		return(TRUE);
+	}
+	XlaPid = getpid();
+	if (!lockfile(fd, XlaFname, NULL, LOCK_EX)) {
+		close(fd);
+		XlaFname = NULL;
+		syserr("xla_host_ok: can't set lock");
+		return(TRUE);
+	}
+	if (read(fd, XlaCtr, sizeof(XlaCtr)) != sizeof(XlaCtr)) {
+		close(fd);
+                XlaFname = NULL;
+                syserr("xla_smtp_ok: can't read XlaFname");
+                return(TRUE);
+	}
+	strncpy(XlaHostName, name, sizeof(XlaHostName) -1);
+	XlaHostName[sizeof(XlaHostName) -1] = 0;
+	i = strlen(name) - 1;
+	if (i >= 0 && XlaHostName[i] == '.') XlaHostName[i] = 0;
+	for (i = 0; i < XlaNext; i++) {
+		if (XlaMatch(XlaRules[i].mask, XlaHostName)) {
+			if (XlaCtr[i] < XlaRules[i].reject) {
+				if (XlaRules[i].num++ == 0) {
+					XlaCtr[i]++;
+					lseek(fd, i*sizeof(XlaCtr[i]), SEEK_SET);
+					if (write(fd, &XlaCtr[i], sizeof(XlaCtr[i])) !=  sizeof(XlaCtr[i]))
+						XlaFname = NULL;
+				}
+				close(fd);
+				return(TRUE);
+			}
+			close(fd);
+			return(FALSE);
+		}
+	}
+	close(fd);
+	return(TRUE);
+}
+
+/*
+**  XLANOQUEUEOK -- Can we sent this message to the remote host
+**
+**	Check if we can send to the remote host
+**
+**	Parameters:
+**		name -- host name or IP# (string)
+**
+**	Returns:
+**		TRUE -- we can send the message to the remote site;
+**		FALSE -- we can't connect the remote host, queue.
+**
+**	Side Effects:
+**		Reads and writes a file, uses a lock.
+**		And still updates the sendmail.la file.
+*/
+
+bool
+xla_noqueue_ok(name)
+	char *name;
+{
+	int	fd, i;
+
+	if (tTd(59, 1))
+		printf("xla_noqueue_ok:\n");
+        if (XlaFname == NULL) return(TRUE);
+	fd = open(XlaFname, O_RDWR, 0644);
+	if (fd == -1) {
+		XlaFname = NULL;
+		syserr("xla_noqueue_ok: open failed");
+		return(TRUE);
+	}
+	if (!lockfile(fd, XlaFname, NULL, LOCK_EX)) {
+		close(fd);
+		XlaFname = NULL;
+		syserr("xla_noqueue_ok: can't set lock");
+		return(TRUE);
+	}
+	XlaPid = getpid();
+        if (read(fd, XlaCtr, sizeof(XlaCtr)) != sizeof(XlaCtr)) {
+                close(fd);
+                XlaFname = NULL;
+                syserr("xla_noqueue_ok: can't read XlaFname");
+                return(TRUE);
+        }
+	strncpy(XlaHostName, name, sizeof(XlaHostName) -1);
+	XlaHostName[sizeof(XlaHostName) -1] = 0;
+	i = strlen(name) - 1;
+	if (i >= 0 && XlaHostName[i] == '.') XlaHostName[i] = 0;
+	for (i = 0; i < XlaNext; i++) {
+		if (XlaMatch(XlaRules[i].mask, XlaHostName)) {
+			if (XlaCtr[i] < XlaRules[i].queue) {
+				if (XlaRules[i].num++ == 0) {
+					XlaCtr[i]++;
+                                	lseek(fd, i*sizeof(XlaCtr[i]), SEEK_SET);
+                                	if (write(fd, &XlaCtr[i], sizeof(XlaCtr[i])) !=  sizeof(XlaCtr[i]))
+                                        	XlaFname = NULL;
+				}
+				close(fd);
+				return(TRUE);
+			}
+			close(fd);
+			return(FALSE);
+		}
+	}
+	close(fd);
+	return(TRUE);
+}
+
+
+/*
+**  XLAHOSTEND -- Notice that a connection is terminated.
+**
+**	Updates the counters to reflect the end of an SMTP session
+**	(in or outgoing).
+**
+**	Parameters:
+**		name -- host name or IP# (string)
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		Reads and writes a file, uses a lock.
+**		And still updates sendmail.la.
+*/
+
+xla_host_end(name)
+	char	*name;
+{
+	int	fd, i;
+
+	if (tTd(59, 1))
+		printf("xla_host_end:\n");
+	if (XlaFname == NULL || XlaPid != getpid()) return;
+	fd = open(XlaFname, O_RDWR, 0644);
+	if (fd == -1) {
+		XlaFname = NULL;
+		syserr("xla_host_end: open failed");
+		return;
+	}
+	if (!lockfile(fd, XlaFname, NULL, LOCK_EX)) {
+                close(fd);
+                XlaFname = NULL;
+		syserr("xla_host_end: can't set lock");
+		return;
+	}
+        if (read(fd, XlaCtr, sizeof(XlaCtr)) != sizeof(XlaCtr)) {
+                close(fd);
+                XlaFname = NULL;
+                syserr("xla_host_end: can't read XlaFname");
+                return(TRUE);
+	}
+	strncpy(XlaHostName, name, sizeof(XlaHostName) -1);
+	XlaHostName[sizeof(XlaHostName) -1] = 0;
+	i = strlen(name) - 1;
+	if (i >= 0 && XlaHostName[i] == '.') XlaHostName[i] = 0;
+	for (i = 0; i < XlaNext; i++) {
+		if (XlaMatch(XlaRules[i].mask, XlaHostName)) {
+			if (XlaRules[i].num > 0 && XlaRules[i].num-- == 1) {
+				if (XlaCtr[i]) XlaCtr[i]--;
+                                lseek(fd, i*sizeof(XlaCtr[i]), SEEK_SET);
+                                if (write(fd, &XlaCtr[i], sizeof(XlaCtr[i]))
+                                        !=  sizeof(XlaCtr[i]))
+                                        XlaFname = NULL;
+			}
+			close(fd);
+			return;
+		}
+	}
+	close(fd);
+}
+
+/*
+**  XLAALLEND -- Mark all connections as closed.
+**
+**	Generally due to an emergency exit.
+**
+**	Parameters:
+**		name -- host name or IP# (string)
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		Reads and writes a file, uses a lock.
+**		And guess what: updates sendmail.la.
+*/
+
+xla_all_end()
+{
+	int	fd, i;
+
+	if (tTd(59, 1))
+		printf("xla_all_end:\n");
+	if (XlaFname == NULL || XlaPid != getpid()) return;
+	fd = open(XlaFname, O_RDWR, 0644);
+        if (fd == -1) {
+                XlaFname = NULL;
+		syserr("xla_all_end: open failed");
+                return;
+        }
+        if (!lockfile(fd, XlaFname, NULL, LOCK_EX)) {
+                close(fd);
+                XlaFname = NULL;
+                syserr("xla_all_end: can't set lock");
+                return;
+        }
+        if (read(fd, XlaCtr, sizeof(XlaCtr)) != sizeof(XlaCtr)) {
+                close(fd);
+                XlaFname = NULL;
+                syserr("xla_all_end: can't read XlaFname");
+                return(TRUE);
+        }
+	for (i = 0; i < XlaNext; i++) {
+		if (XlaCtr[i] > 0 && XlaRules[i].num > 0) {
+			XlaCtr[i]--; XlaRules[i].num = 0;
+		}
+	}
+	lseek(fd, 0, SEEK_SET);
+	if (write(fd, XlaCtr, sizeof(XlaCtr)) != sizeof(XlaCtr)) {
+		XlaFname = NULL;
+	}
+	close(fd);
+}
+#endif /* XLA */
diff --git a/usr.sbin/sendmail/doc/changes/Makefile b/usr.sbin/sendmail/doc/changes/Makefile
new file mode 100644
index 00000000000..46447c2e534
--- /dev/null
+++ b/usr.sbin/sendmail/doc/changes/Makefile
@@ -0,0 +1,13 @@
+#	@(#)Makefile	8.1 (Berkeley) 4/13/94
+
+DIR=	smm/09.sendmail
+SRCS=	changes.me
+MACROS=	-me
+
+all: changes.ps
+
+changes.ps: ${SRCS}
+	rm -f ${.TARGET}
+	${PIC} ${SRCS} | ${ROFF} > ${.TARGET}
+
+.include <bsd.doc.mk>
diff --git a/usr.sbin/sendmail/doc/changes/changes.me b/usr.sbin/sendmail/doc/changes/changes.me
new file mode 100644
index 00000000000..0b91ed0d438
--- /dev/null
+++ b/usr.sbin/sendmail/doc/changes/changes.me
@@ -0,0 +1,997 @@
+.\" Copyright (c) 1994 Eric P. Allman
+.\" Copyright (c) 1988, 1994
+.\"	The Regents of the University of California.  All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 3. All advertising materials mentioning features or use of this software
+.\"    must display the following acknowledgement:
+.\"	This product includes software developed by the University of
+.\"	California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"	@(#)changes.me	8.1 (Berkeley) 4/13/94
+.\"
+.\"	ditroff -me -Pxx changes.me
+.eh '%''Changes in Sendmail Version 8'
+.oh 'Changes in Sendmail Version 8''%'
+.nr si 3n
+.if n .ls 2
+.+c
+.(l C
+.sz 14
+Changes in Sendmail Version 8*
+.sz
+.sp
+Eric Allman
+.sp 0.5
+.i
+University of California, Berkeley
+Mammoth Project
+.)l
+.(f
+*An earlier version of this paper was printed in the
+Proceedings of the 1994 AUUG Queensland Summer Technical Conference,
+Gateway Hotel, Brisbane, March 1994.
+.)f
+.sp
+.(l F
+.ce
+ABSTRACT
+.sp \n(psu
+Version 8 of
+.i sendmail
+includes a number of major changes from previous versions.
+This paper gives a very short history of
+.i sendmail ,
+a summary of the major differences between version 5
+(the last publically available version)
+and version 8,
+and some discussion of future directions.
+.)l
+.sp 2
+.pp
+In 1987, the author stopped major work on
+.i sendmail
+due to other time committments,
+only to return to active work in 1991.
+This paper explores why work resumed
+and what changes have been made.
+.pp
+Section 1 gives a short history of
+.i sendmail
+through version 5 and the motivation behind working on version 8.
+Section 2 has
+a rather detailed description of what has changed
+between version 5 and version 8.
+The paper finishes off with some thoughts
+about what still needs to be done.
+.sh 1 "HISTORY"
+.pp
+As discussed elsewhere,
+[Allman83a, Allman83b, Allman&Amos85]
+sendmail has existed in various forms since 1980.
+It was released under the name
+.i delivermail
+in 4BSD and 4.1BSD, and as
+.i sendmail
+in 4.2BSD.
+.\"4.0BSD	delivermail 1.10
+.\"4.1BSD	delivermail 1.10
+.\"4.2BSD	sendmail 4.12
+.\"4.3BSD	sendmail 5.52
+It quickly became the dominant mail system for networked UNIX systems.
+.pp
+Prior the release of 4.3BSD in November 1986,
+the author had left the University for private industry,
+but continued to do some work on
+.i sendmail
+with activity slowly trailing off
+until effectively stopping after February 1987.
+There was minimal support done by many people for several years,
+until July of 1991 when the original author,
+who had returned the University,
+started active work on it again.
+.pp
+There were several reasons for renewed work on
+.i sendmail .
+There was a desire at Berkeley to convert to a subdomained structure
+so that individuals were identified by their subdomain
+rather than by their individual workstation;
+although possible in the old code, there were some problems,
+and the author was the obvious person to address them.
+The Computer Systems Research Group (CSRG),
+the group that produced the Berkeley Software Distributions,
+was working on 4.4BSD,
+and wanted an update to the mail system.
+Bryan Costales was working on a book on
+.i sendmail
+that was being reviewed by the author,
+which encouraged him to make some revisions.
+And the author wanted to try to unify some of the disparate versions of
+.i sendmail
+that had been permitted to proliferate.
+.pp
+During the 1987\-91 fallow period,
+many vendors and outside volunteers
+had produced variants of
+.i sendmail .
+Perhaps the best known is the IDA version
+[IDA87].
+Originally intended to be a new set of configuration files,
+IDA expanded into a fairly large set of patches for the code.
+Originally produced in Sweden,
+IDA development passed to the University of Illinois,
+and was widely used by the fairly large set of people
+who prefer to get and compile their own source code
+rather than use vendor-supplied binaries.
+.pp
+In about the same time frame,
+attempts were made to clean up and extend the Simple Mail Transport Protocol
+(SMTP)
+[RFC821].
+This involved clarifications of some ambiguities in the protocol,
+and correction of some problem areas
+[RFC1123],
+as well as extensions for additional functionality
+(dubbed Extended Simple Mail Transport Protocol, or ESMTP)
+[RFC1425, RFC1426, RFC1427]
+and a richer set of semantics in the body of messages
+(the Multipurpose Internet Mail Extensions, a.k.a. MIME)
+[RFC1521, RFC1344].
+Neither the IDA group nor most vendors
+were modifying
+.i sendmail
+to conform to these new standards.
+It seemed clear that these were ``good things''
+that should be encouraged.
+However, since no one was working on a publically available version of
+.i sendmail
+with these updates,
+they were unlikely to be widely deployed any time in the near future.
+.pp
+There are, of course, other mail transport agents available,
+such as
+.i MMDF
+.\"[ref],
+.i zmailer
+.\"[ref],
+.i smail
+.\"[ref],
+and
+.i PP
+.\"[ref].
+However, none of these seemed to be gaining the prominence of
+.i sendmail ;
+it appeared that most companies would not convert to another
+mail transport agent any time in the forseeable future.
+However, they might be persuaded to convert to a newer version of
+.i sendmail .
+.pp
+All of these convinced the author
+to work on a updated version of
+.i sendmail
+for public distribution.
+.pp
+The new version of
+.i sendmail
+is referred to as version eight (V8).
+Versions six and seven were skipped
+because of an agreement
+that all files in 4.4BSD would be numbered as
+.q 8.1 .
+Rather than have an external version number
+that differed from the file version numbers,
+.i sendmail
+just jumped directly to V8.
+.sh 1 "CHANGES IN VERSION EIGHT"
+.pp
+The following is a summary of the changes between the last commonly
+available version of sendmail from Berkeley (5.67) and the latest
+version (8.6.6).
+.pp
+Many of these are ideas that had been tried in IDA,
+but many of them were generalized in V8.
+.sh 2 "Performance Enhancements"
+.pp
+Instead of closing SMTP connections immediately, open connections are
+cached for possible future use.  There is a limit to the number of
+simultaneous open connections and the idle time of any individual
+connection.
+.pp
+This is of best help during queue processing (since there is the
+potential of many different messages going to one site), although
+it can also help when processing MX records which aren't handled
+by MX Piggybacking.
+.pp
+If two hosts with different names in a single message happen to
+have the same set of MX hosts, they can be sent in the same
+transaction.  Version 8 notices this and tries to batch the messages.
+.pp
+For example, if two sites ``foo.com'' and ``bar.com'' are both
+served by UUNET, they will have the same set of MX hosts and will
+be sent in one transaction.  UUNET will then split the message
+and send it to the two individual hosts.
+.sh 2 "RFC 1123 Changes"
+.pp
+A number of changes have been made to make sendmail ``conditionally
+compliant'' (that is, it satisfies all of the MUST clauses and most
+but not all of the SHOULD clauses in RFC 1123).
+.pp
+The major areas of change are (numbers are RFC 1123 section numbers):
+.nr ii 0.75i
+.ip \(sc5.2.7
+Response to RCPT command is fast.  Previously, sendmail
+expanded all aliases as far as it could \*- this could
+take a very long time, particularly if there were
+name server delays.  Version 8 only checks for the
+existence of an alias and does the expansion later.
+It does still do a DNS lookup if there is an explicit host name
+in the RCPT command,
+but this time is bounded.
+.ip \(sc5.2.8
+Numeric IP addresses are logged in Received: lines.
+This helps tracing spoofed messages.
+.ip \(sc5.2.17
+Self domain literal is properly handled.  Previously,
+if someone sent to user@[1.2.3.4], where 1.2.3.4 is
+your IP address, the mail would probably be rejected
+with a ``configuration error''.
+Version 8 can handle these addresses.
+.ip \(sc5.3.2
+Better control over individual timeouts.  RFC 821 specified
+no timeouts.  Older versions of sendmail had a single
+timeout, typically set to two hours.  Version 8 allows
+the configuration file to set timeouts for various
+SMTP commands individually.
+.ip \(sc5.3.3
+Error messages are sent as From:<>.  This was urged by
+RFC 821 and reiterated by RFC 1123, but older versions
+of sendmail never really did it properly.  Version 8
+does.  However, some systems cannot handle this
+perfectly legal address; if necessary, you can create
+a special mailer that uses the `g' flag to disable this.
+.ip \(sc5.3.3
+Error messages are never sent to <>.  Previously,
+sendmail was happy to send responses-to-responses which
+sometimes resulted in responses-to-responses-to-responses
+which resulted in ....  you get the idea.
+.ip \(sc5.3.3
+Route-addrs (the ugly ``<@hosta,@hostb:user@hostc>''
+syntax) are pruned.  RFC 821 urged the use of this
+bletcherous syntax.  RFC 1123 has seen the light and
+officially deprecates them, further urging that you
+eliminate all but ``user@hostc'' should you receive
+one of these things.  Version 8 is slightly more generous
+than the standards suggest; instead of stripping off all
+the route addressees, it only strips hosts off up to
+the one before the last one known to DNS, thus allowing
+you to have pseudo-hosts such as foo.BITNET.  The `R'
+option will turn this off.
+.lp
+The areas in which sendmail is not ``unconditionally compliant'' are:
+.ip \(sc5.2.6
+Sendmail does do header munging.
+.ip \(sc5.2.10
+Sendmail doesn't always use the exact SMTP message
+text from RFC 821.  This is a rather silly requirement.
+.ip \(sc5.3.1.1
+Sendmail doesn't guarantee only one connect for each
+host on queue runs.  Connection caching gives you most
+of this, but it does not provide a guarantee.
+.ip \(sc5.3.1.1
+Sendmail doesn't always provide an adequate limit
+on concurrency.  That is, there can be several
+independent sendmails running at once.  My feeling
+is that doing an absolute limit would be a mistake
+(it might result in lost mail).  However, if you use
+the XLA contributed software, most of this will be
+guaranteed (but I don't guarantee the guarantee).
+.sh 2 "Extended SMTP Support
+.pp
+Version 8 includes both sending and receiving support for Extended
+SMTP support as defined by RFC 1425 (basic) and RFC 1427 (SIZE);
+and limited support for RFC 1426 (BODY).
+The body support is minimal because the
+.q 8BITMIME
+body type is not currently advertised.
+Although such a body type will be accepted,
+it will not be correctly converted to 7 bits
+if speaking to a non-8-bit-MIME aware SMTP server.
+.pp
+.i Sendmail
+tries to speak ESMTP if you have the `a' flag set
+in the flags for the mailer descriptor,
+or if the other end advertises the fact that it speaks ESMTP.
+This is a non-standard advertisement:
+.i sendmail
+announces
+.q "ESMTP spoken here"
+during the initial connection message,
+and client sendmails search for this message.
+This creates some problems for some PC-based mailers,
+which do not understand two-line greeting messages
+as required by RFC 821.
+.sh 2 "Eight-Bit Clean
+.pp
+Previous versions of sendmail used the 0200 bit for quoting.  This
+version avoids that use.
+However, you can set option `7' to get seven bit stripping
+for compatibility with RFC 821,
+which is a 7-bit protocol.
+This option says ``strip to 7 bits on input''.
+.pp
+Individual mailers can still produce seven bit out put using the
+`7' mailer flag.
+This flag says ``strip to 7 bits on output''.
+.sh 2 "User Database"
+.pp
+The User Database (UDB) is an as-yet experimental attempt to provide
+unified large-site name support.
+We are installing it at Berkeley;
+future versions may show significant modifications.
+Briefly, UDB contains a database that is intended to contain
+all the per-user information for your workgroup,
+such as people's full names, their .plan information,
+their outgoing mail name, and their mail drop.
+.pp
+The user database allows you to map both incoming and outgoing
+addresses, much like IDA.  However, the interface is still
+better with IDA;
+in particular, the alias file with incoming/outgoing marks
+provides better locality of information.
+.sh 2 "Improved BIND Support"
+.pp
+The BIND support, particularly for MX records, had a number of
+annoying ``features'' which have been removed in this release.  In
+particular, these more tightly bind (pun intended) the name server
+to sendmail, so that the name server resolution rules are incorporated
+directly into sendmail.
+.pp
+The major change has been that the $[ ... $] operator didn't fully
+qualify names that were in DNS as A or MX records.  Version 8 does
+this qualification.
+.pp
+This has proven to be an annoyance in Sun shops,
+who often still run without BIND support.
+However, it is really critical that this be supported,
+since MX records are mandatory.
+In SunOS you can choose either MX support or NIS support,
+but not both.
+This is fixed in Solaris,
+and some
+.i sendmail
+support to allow this in SunOS should be forthcoming in a future release.
+.sh 2 "Keyed Files"
+.pp
+Generalized keyed files is an idea taken directly from IDA sendmail
+(albeit with a completely different implementation).
+They can be useful on large sites.
+.pp
+Version 8 includes the following built-in map classes:
+.ip dbm
+Support for the ndbm(3) library.
+.ip hash
+Support for the ``Hash'' type from the new Berkeley db(3) library.
+this library provides substantially better database support
+than ndbm(3),
+including in-memory caching,
+arbitrarily long keys and values,
+and better disk utilization.
+.ip btree
+Support for the ``B-Tree'' type from the new Berkeley db(3) library.
+B-Trees provide better clustering than Hashed files
+if you are fetching lots of records that have similar keys,
+such as searching a dictionary for words beginning with ``detr''.
+.ip nis
+Support for NIS (a.k.a. YP) maps.
+NIS+ is not supported in this version.
+.ip host
+Support for DNS lookups.
+.ip dequote
+A ``pseudo-map'' (that is, once that does not have any external data)
+that allows a configuration file to break apart a quoted string
+in the address.
+This is necessary primarily for DECnet addresses,
+which often have quoted addresses that need to be unwrapped on gateways.
+.sh 2 "Multi-Word Classes & Macros in Classes"
+.pp
+Classes can now be multiple words.  For example,
+.(b
+CShofmann.CS.Berkeley.EDU
+.)b
+allows you to match the entire string ``hofmann.CS.Berkeley.EDU''
+using the single construct ``$=S''.
+.pp
+Class definitions are now allowed to include macros \*- for example:
+.(b
+Cw$k
+.)b
+is legal.
+.sh 2 "IDENT Protocol Support"
+.pp
+The IDENT protocol as defined in RFC 1413 [RFC1413] is supported.
+However, many systems have a TCP/IP bug that renders this useless,
+and the feature must be turned off.
+Roughly, if one of these system receives a
+.q "No route to host"
+message (ICMP message ICMP_UNREACH_HOST) on
+.i any
+connection, all connections to that host are closed.
+Some firewalls return this error if you try to connect
+to the IDENT port,
+so you can't receive email from these hosts on these systems.
+It's possible that if the firewall used a more specific message
+(such as ICMP_UNREACH_PROTOCOL, ICMP_UNREACH_PORT or ICMP_UNREACH_NET_PROHIB)
+it would work, but this hasn't been verified.
+.pp
+IDENT protocol support cannot be used on
+4.3BSD,
+Apollo DomainOS,
+Apple A/UX,
+ConvexOS,
+Data General DG/UX,
+HP-UX,
+Sequent Dynix,
+or
+Ultrix.
+It seems to work on
+4.4BSD,
+IBM AIX 3.x,
+OSF/1,
+SGI IRIX,
+Solaris,
+and
+SunOS.
+.sh 2 "Separate Envelope/Header Processing
+.pp
+Since the From: line is passed in separately from the envelope
+sender, these have both been made visible; the $g macro is set to
+the envelope sender during processing of mailer argument vectors
+and the header sender during processing of headers.
+.pp
+It is also possible to specify separate per-mailer envelope and
+header processing.  The SenderRWSet and RecipientRWset arguments
+for mailers can be specified as ``envelope/header'' to give different
+rewritings for envelope versus header addresses.
+.sh 2 "Owner-List Propagates to Envelope
+.pp
+When an alias has an associated owner-list name, that alias is used
+to change the envelope sender address.  This will cause downstream
+errors to be returned to that owner.
+.pp
+Some people find this confusing
+because the envelope sender is what appears in the first
+``From_'' line in UNIX messages
+(that is, the line beginning ``From<space>''
+instead of ``From:'';
+the latter is the header from, which
+.i does
+indicate the sender of the message).
+In previous versions,
+.i sendmail
+has tried to avoid changing the envelope sender
+for back compatibility with UNIX convention;
+at this point that back compatibility is creating too many problems,
+and it is necessary to move forward into the 1980s.
+.sh 2 "Command Line Flags"
+.pp
+The
+.b \-B
+flag has been added to pass in body type information.
+.pp
+The
+.b \-p
+flag has been added to pass in protocol information
+that was previously passed in by defining the
+.b $r
+and
+.b $s
+macros.
+.pp
+The
+.b \-X
+flag has been added to allow logging of all protocol in and
+out of sendmail for debugging.
+You can set
+.q "\-X filename"
+and a complete transcript will be logged in that file.
+This gets big fast: the option is only for debugging.
+.pp
+The
+.b \-q
+flag can limit limit a queue run to specific recipients,
+senders, or queue ids using \-qRsubstring, \-qSsubstring, or
+\-qIsubstring respectively.
+.sh 2 "New Configuration Line Types
+.pp
+The `T' (Trusted users) configuration line has been deleted.  It
+will still be accepted but will be ignored.
+.pp
+The `K' line has been added to declare database maps.
+.pp
+The `V' line has been added to declare the configuration version
+level.
+.pp
+The `M' (mailer) line takes a D= field to specify execution
+directory.
+.sh 2 "New and Extended Options"
+.pp
+Several new options have been added, many to support new features,
+others to allow tuning that was previously available only by
+recompiling.  Briefly:
+.nr ii 0.5i
+.ip A
+The alias file specification can now be a list of alias files.
+Also, the configuration can specify a class of file.
+For example, to search the NIS aliases, use
+.q OAnis:mail.aliases .
+.ip b
+Insist on a minimum number of disk blocks.
+.ip C
+Delivery checkpoint interval.  Checkpoint the queue (to avoid
+duplicate deliveries) every C addresses.
+.ip E
+Default error message.  This message (or the contents of the
+indicated file) are prepended to error messages.
+.ip G
+Enable GECOS matching.  If you can't find a local user name
+and this option is enabled, do a sequential scan of the passwd
+file to match against full names.  Previously a compile option.
+.ip h
+Maximum hop count.  Previously this was compiled in.
+.ip I
+This option has been extended to allow setting of resolver parameters.
+.ip j
+Send errors in MIME-encapsulated format.
+.ip J
+Forward file path.  Where to search for .forward files \*- defaults
+to $HOME/.forward.
+.ip k
+Connection cache size.  The total number of connections that will
+be kept open at any time.
+.ip K
+Connection cache lifetime.  The amount of time any connection
+will be permitted to sit idle.
+.ip l
+Enable Errors-To: header.  These headers violate RFC 1123;
+this option is included to provide back compatibility with
+old versions of sendmail.
+.ip O
+Incoming daemon options (e.g., use alternate SMTP port).
+.ip p
+Privacy options.  These can be used to make your SMTP server
+less friendly.
+.ip r
+This option has been extended to allow finer grained control
+over timeouts.
+For example, you can set the timeout for SMTP commands individually.
+.ip R
+Don't prune route-addrs.  Normally, if version 8 sees an address
+like "<@hostA,@hostB:user@hostC>, sendmail will try to strip off
+as much as it can (up to user@hostC) as suggested by RFC 1123.
+This option disables that behaviour.
+.ip T
+The
+.q "Return To Sender"
+timeout has been extended
+to allow specification of a warning message interval,
+typically something on the order of four hours.
+If a message cannot be delivered in that interval,
+a warning message is sent back to the sender
+but the message continues to be tried.
+.ip U
+User database spec.  This is still experimental.
+.ip V
+Fallback ``MX'' host.  This can be thought of as an MX host
+that applies to all addresses that has a very high preference
+value (that is, use it only if everything else fails).
+.ip w
+If set, assume that if you are the best MX host for a host,
+you should send directly to that host.  This is intended
+for compatibility with UIUC sendmail, and may have some
+use on firewalls.
+.ip 7
+Do not run eight bit clean.  Technically, you have to assert
+this option to be RFC 821 compatible.
+.sh 2 "New Mailer Definitions"
+.ip L=
+Set the allowable line length.  In V5, the L mailer flag implied
+a line length limit of 990 characters; this is now settable to
+an arbitrary value.
+.ip F=a
+Try to use ESMTP.  It will fall back to SMTP if the initial
+EHLO packet is rejected.
+.ip F=b
+Ensure a blank line at the end of messages.  Useful on the
+*file* mailer.
+.ip F=c
+Strip all comments from addresses; this should only be used as
+a last resort when dealing with cranky mailers.
+.ip F=g
+Never use the null sender as the envelope sender, even when
+running SMTP.  This violates RFC 1123.
+.ip F=7
+Strip all output to this mailer to 7 bits.
+.ip F=L
+Used to set the line limit to 990 bytes for SMTP compatibility.
+It now does that only if the L= keyletter is not specified.
+This flag is obsolete and should not be used.
+.sh 2 "New or Changed Pre-Defined Macros"
+.ip $k
+UUCP node name from uname(2).
+.ip $m
+Domain part of our full hostname.
+.ip $_
+RFC 1413-provided sender address.
+.ip $w
+Previously was sometimes the full domain name, sometimes
+just the first word.  Now guaranteed to be the first word
+of the domain name (i.e., the host name).
+.ip $j
+Previously had to be defined \*- it is now predefined to be
+the full domain name, if that can be determined.  That is,
+it is equivalent to $w.$m.
+.sh 2 "New and Changed Classes"
+.ip $=k
+Initialized to contain $k.
+.ip $=w
+Now includes
+.q [1.2.3.4]
+(where 1.2.3.4 is your IP address)
+to allow the configuration file to recognize your own IP address.
+.sh 2 "New Rewriting Tokens"
+.pp
+The
+.b $&
+construct has been adopted from IDA to defer macro evaluation.
+Normally, macros in rulesets are bound when the rule is first parsed
+during startup.
+Some macros change during processing and are uninteresting during startup.
+However, that macro can be referenced using
+.q $&x
+to defer the evaulation of
+$x
+until the rule is processed.
+.pp
+The tokens
+.b $(
+and
+.b $)
+have been added to allow specification of map rewriting.
+.pp
+Version 8 allows
+.b $@
+on the Left Hand Side of an `R' line to match
+zero tokens.
+This is intended to be used to match the null input.
+.sh 2 "Bigger Defaults
+.pp
+Version 8 allows up to 100 rulesets instead of 30.  It is recommended
+that rulesets 0\-9 be reserved for sendmail's dedicated use in future
+releases.
+.pp
+The total number of MX records that can be used has been raised to
+20.
+.pp
+The number of queued messages that can be handled at one time has
+been raised from 600 to 1000.
+.sh 2 "Different Default Tuning Parameters
+.pp
+Version 8 has changed the default parameters for tuning queue costs
+to make the number of recipients more important than the size of
+the message (for small messages).  This is reasonable if you are
+connected with reasonably fast links.
+.sh 2 "Auto-Quoting in Addresses
+.pp
+Previously, the ``Full Name <email address>'' syntax would generate
+incorrect protocol output if ``Full Name'' had special characters
+such as dot.  This version puts quotes around such names.
+.sh 2 "Symbolic Names On Error Mailer
+.pp
+Several names have been built in to the $@ portion of the $#error
+mailer.  For example:
+.(b
+$#error $@NOHOST $: Host unknown
+.)b
+Prints the indicated message
+and sets the exit status of
+.i sendmail
+to
+.sm EX_NOHOST .
+.sh 2 "New Built-In Mailers"
+.pp
+Two new mailers, *file* and *include*, are included to define options
+when mailing to a file or a :include: file respectively.  Previously
+these were overloaded on the local mailer.
+.sh 2 "SMTP VRFY Doesn't Expand
+.pp
+Previous versions of sendmail treated VRFY and EXPN the same.  In
+this version, VRFY doesn't expand aliases or follow .forward files.
+.pp
+As an optimization, if you run with your default delivery mode
+being queue-only, the RCPT command will also not chase aliases and
+\&.forward files.
+It will chase them when it processes the queue.
+This speeds up RCPT processing.
+.sh 2 "[IPC] Mailers Allow Multiple Hosts
+.pp
+When an address resolves to a mailer that has ``[IPC]'' as its
+``Path'', the $@ part (host name) can be a colon-separated list of
+hosts instead of a single hostname.  This asks sendmail to search
+the list for the first entry that is available exactly as though
+it were an MX record.  The intent is to route internal traffic
+through internal networks without publishing an MX record to the
+net.  MX expansion is still done on the individual items.
+.sh 2 "Aliases Extended"
+.pp
+The implementation has been merged with maps.  Among other things,
+this supports multiple alias files and NIS-based aliases.  For
+example:
+.(b
+OA/etc/aliases,nis:mail.aliases
+.)b
+will search first the local database
+.q /etc/aliases
+followed by the NIS map
+
+.sh 2 "Portability and Security Enhancements
+.pp
+A number of internal changes have been made to enhance portability.
+.pp
+Several fixes have been made to increase the paranoia factor.
+.pp
+In particular, the permissions required for .forward and :include:
+files have been tightened up considerably.  V5 would pretty much
+read any file it could get to as root, which exposed some security
+holes.  V8 insists that all directories leading up to the .forward
+or :include: file be searchable ("x" permission) by the controlling
+user" (defined below), that the file itself be readable by the
+controlling user, and that .forward files be owned by the user
+who is being forwarded to or root.
+.pp
+The "controlling user" is the user on whose behalf the mail is
+being delivered.  For example, if you mail to "user1" then the
+controlling user for ~user1/.forward and any mailers invoked
+by that .forward file, including :include: files.
+.pp
+Previously, anyone who had a home directory could create a .forward
+could forward to a program.  Now, sendmail checks to make sure
+that they have an "approved shell", that is, a shell listed in
+the /etc/shells file.
+.sh 2 "Miscellaneous Fixes and Enhancements"
+.pp
+A number of small bugs having to do with things like backslash-escaped
+quotes inside of comments have been fixed.
+.pp
+The fixed size limit on header lines
+(such as
+.q To:
+and
+.q Cc: )
+has been eliminated;
+those buffers are dynamically allocated now.
+.pp
+Sendmail writes a /etc/sendmail.pid file with the current process id
+and the current invocation flags.
+.pp
+Two people using the same program (e.g., submit) are considered
+"different" so that duplicate elimination doesn't delete one of
+them.  For example, two people forwarding their email to
+|submit will be treated as two recipients.
+.pp
+The mailstats program prints mailer names and gets the location of
+the sendmail.st file from /etc/sendmail.cf.
+.pp
+Many minor bugs have been fixed, such as handling of backslashes
+inside of quotes.
+.pp
+A hook has been added to allow rewriting of local addresses after
+aliasing.
+.sh 1 "FUTURE WORK"
+.pp
+The previous section describes
+.i sendmail
+as of version 8.6.6.
+There is still much to be done.
+Some high points are described below.
+This list is by no means exhaustive.
+.sh 2 "Full MIME Support"
+.pp
+Currently
+.i sendmail
+only supports seven bit MIME messages.
+Although it can pass eight bit MIME messages,
+it cannot advertise that fact because the standards say
+that the mail agent must be able to do 8- to 7-bit conversion
+to have full 8-bit support.
+This requires far more extensive modification of the message body
+than is currently supported.
+.pp
+The best way to do this would be to support the general concept
+of an external
+``message filter''
+that could do arbitrary modifications of the message.
+This would allow MIME conversion as well as such things as
+automatic encryption of messages sent over external links.
+This is probably an extremely non-trivial change.
+.sh 2 "Service Switch Abstraction"
+.pp
+Most modern systems include some concept of a
+.q "service switch"
+\*- for example, to look up host names you can try
+DNS, NIS, NIS+, text tables, NetInfo,
+or other services in some arbitrary order.
+This is currently very clumsy in
+.i sendmail ,
+with only limited control of the services provided.
+.sh 2 "More Control of Local Addresses"
+.pp
+Currently some addresses are declared as
+.q local
+and are handled specially \*-
+for example, they may have .forward files,
+may be translated into program calls or file deliveries,
+and so forth.
+These should be broken out into separate flags
+to allow the local system administrator
+to have more fine-grained control over operations.
+.sh 2 "More Run-Time Configuration Options"
+.pp
+There are many options that are configured at compile time,
+such as the method of file locking
+and the use of the IDENT protocol
+[RFC1413].
+These should be transfered to run time
+by adding new options.
+.pp
+Similarly, some options are currently overloaded,
+that is, a single option controls more than one thing.
+These should probably be broken out into separate options.
+.pp
+This implies that options will change from single characters
+to words.
+.sh 2 "More Configuration Control Over Errors"
+.pp
+Currently,
+the configuration file can generate an error message during parsing.
+However,
+it cannot tweak other operations,
+such as issuing a warning message to the system postmaster.
+Similarly,
+some errors should not be triggered if they are in aliases
+during an alias file rebuild,
+but should be triggered if that alias is actually used.
+.sh 2 "Long Term Host State"
+.pp
+Currently,
+.i sendmail
+only remembers host status during a single queue run.
+This should be converted to long term status
+stored on disk
+so it can be shared between instantiations of
+.i sendmail .
+Entries will have to be timestamped
+so they can time out.
+This will allow
+.i sendmail
+to implement exponential backoff on queue runs
+on a per-host basis.
+.sh 2 "Connection Control"
+.pp
+Modern networks have different types of connectivity
+than the past.
+In particular, the rising prominence of dialup IP
+has created certain challenges for automated servers.
+It is not uncommon to try to make a connection to a host
+and have it fail, even though if you tried again it would succeed.
+The connection management could be a bit cleverer
+to try to adapt to such situations.
+.sh 2 "Other Caching"
+.pp
+When you do an MX record lookup,
+the name server automatically returns the IP addresses
+of the associated MX servers.
+This information is currently ignored,
+and another query is done to get this information.
+It should be cached to avoid excess name server traffic.
+.sh 1 "REFERENCES"
+.ip [Allman83a]
+.q "Sendmail \*- An Internetwork Mail Router."
+E. Allman.
+In
+.ul
+Unix Programmers's Manual,
+4.2 Berkeley Software Distribution,
+volume 2C.
+August 1983.
+.ip [Allman83b]
+.q "Mail Systems and Addressing in 4.2BSD."
+E. Allman
+In
+.ul
+UNICOM Conference Proceedings.
+San Diego, California.
+January 1983.
+.ip [Allman&Amos85]
+``Sendmail Revisited.''
+E. Allman and M. Amos.
+In
+.ul
+Usenix Summer 1985 Conference Proceedings.
+Portland, Oregon.
+June 1985.
+.ip [IDA87]
+.ul 3
+Electronic Mail Addressing in Theory and Practice
+with the IDA Sendmail Enhancement Kit
+(or The Postmaster's Last Will and Testament).
+Lennart Lo\*:vstrand.
+Department of Computer and Information Science,
+University of Linko\*:ping,
+Sweden,
+Report no. LiTH-IDA-Ex-8715.
+May 1987.
+.ip [RFC821]
+.ul
+Simple Mail Transport Protocol.
+J. Postel.
+August 1982.
+.ip [RFC1123]
+.ul
+Requirements for Internet Hosts \*- Application and Support.
+Internet Engineering Task Force,
+R. Braden, Editor.
+October 1989.
+.ip [RFC1344]
+.ul
+Implications of MIME for Internet Mail Gateways.
+N. Borenstein.
+June 1992.
+.ip [RFC1413]
+.ul
+Identification Protocol.
+M. St. Johns.
+February 1993.
+.ip [RFC1425]
+.ul
+SMTP Service Extensions.
+J. Klensin, N. Freed, M. Rose, E. Stefferud, and D. Crocker.
+February 1993.
+.ip [RFC1426]
+.ul
+SMTP Service Extension for 8bit-MIMEtransport.
+J. Klensin, N. Freed, M. Rose, E. Stefferud, and D. Crocker.
+February 1993.
+.ip [RFC1427]
+.ul
+SMTP Service Extension for Message Size Declaration.
+J. Klensin, N. Freed, and K. Moore.
+February 1993.
+.ip [RFC1521]
+.ul 3
+MIME (Multipurpose Internet Mail Extensions) Part One:
+Mechanisms for Specifying and Describing
+the Format of Internet Message Bodies.
+N. Borenstein and N. Freed.
+September 1993.
diff --git a/usr.sbin/sendmail/doc/intro/Makefile b/usr.sbin/sendmail/doc/intro/Makefile
new file mode 100644
index 00000000000..939cd6c17eb
--- /dev/null
+++ b/usr.sbin/sendmail/doc/intro/Makefile
@@ -0,0 +1,13 @@
+#	@(#)Makefile	8.2 (Berkeley) 2/28/94
+
+DIR=	smm/09.sendmail
+SRCS=	intro.me
+MACROS=	-me
+
+all: intro.ps
+
+intro.ps: ${SRCS}
+	rm -f ${.TARGET}
+	${PIC} ${SRCS} | ${ROFF} > ${.TARGET}
+
+.include <bsd.doc.mk>
diff --git a/usr.sbin/sendmail/doc/intro/intro.me b/usr.sbin/sendmail/doc/intro/intro.me
new file mode 100644
index 00000000000..0406bb1fdd6
--- /dev/null
+++ b/usr.sbin/sendmail/doc/intro/intro.me
@@ -0,0 +1,1478 @@
+.\" Copyright (c) 1983 Eric P. Allman
+.\" Copyright (c) 1988, 1993
+.\"	The Regents of the University of California.  All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 3. All advertising materials mentioning features or use of this software
+.\"    must display the following acknowledgement:
+.\"	This product includes software developed by the University of
+.\"	California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"	@(#)intro.me	8.2 (Berkeley) 11/27/93
+.\"
+.\"	pic -Pxx intro.me | ditroff -me -Pxx
+.eh 'SMM:9-%''SENDMAIL \*- An Internetwork Mail Router'
+.oh 'SENDMAIL \*- An Internetwork Mail Router''SMM:9-%'
+.nr si 3n
+.if n .ls 2
+.+c
+.(l C
+.sz 14
+SENDMAIL \*- An Internetwork Mail Router
+.sz
+.sp
+Eric Allman*
+.sp 0.5
+.i
+University of California, Berkeley
+Mammoth Project
+.)l
+.sp
+.(l F
+.ce
+ABSTRACT
+.sp \n(psu
+Routing mail through a heterogenous internet presents many new
+problems.  Among the worst of these is that of address mapping.
+Historically, this has been handled on an
+.i "ad hoc"
+basis.  However,
+this approach has become unmanageable as internets grow.
+.sp \n(psu
+Sendmail acts a unified "post office" to which all mail can be
+submitted.  Address interpretation is controlled by a production
+system, which can parse both domain-based addressing and old-style
+.i "ad hoc"
+addresses.
+The production system is powerful
+enough to rewrite addresses in the message header to conform to the
+standards of a number of common target networks, including old
+(NCP/RFC733) Arpanet, new (TCP/RFC822) Arpanet, UUCP, and Phonenet.
+Sendmail also implements an SMTP server, message
+queueing, and aliasing.
+.)l
+.sp 2
+.(f
+*A considerable part of this work
+was done while under the employ
+of the INGRES Project
+at the University of California at Berkeley
+and at Britton Lee.
+.)f
+.pp
+.i Sendmail
+implements a general internetwork mail routing facility,
+featuring aliasing and forwarding,
+automatic routing to network gateways,
+and flexible configuration.
+.pp
+In a simple network,
+each node has an address,
+and resources can be identified
+with a host-resource pair;
+in particular,
+the mail system can refer to users
+using a host-username pair.
+Host names and numbers have to be administered by a central authority,
+but usernames can be assigned locally to each host.
+.pp
+In an internet,
+multiple networks with different characterstics
+and managements
+must communicate.
+In particular,
+the syntax and semantics of resource identification change.
+Certain special cases can be handled trivially
+by
+.i "ad hoc"
+techniques,
+such as
+providing network names that appear local to hosts
+on other networks,
+as with the Ethernet at Xerox PARC.
+However,  the general case is extremely complex.
+For example,
+some networks require point-to-point routing,
+which simplifies the database update problem
+since only adjacent hosts must be entered
+into the system tables,
+while others use end-to-end addressing.
+Some networks use a left-associative syntax
+and others use a right-associative syntax,
+causing ambiguity in mixed addresses.
+.pp
+Internet standards seek to eliminate these problems.
+Initially, these proposed expanding the address pairs
+to address triples,
+consisting of
+{network, host, resource}
+triples.
+Network numbers must be universally agreed upon,
+and hosts can be assigned locally
+on each network.
+The user-level presentation was quickly expanded
+to address domains,
+comprised of a local resource identification
+and a hierarchical domain specification
+with a common static root.
+The domain technique
+separates the issue of physical versus logical addressing.
+For example,
+an address of the form
+.q "eric@a.cc.berkeley.arpa"
+describes only the logical
+organization of the address space.
+.pp
+.i Sendmail
+is intended to help bridge the gap
+between the totally
+.i "ad hoc"
+world
+of networks that know nothing of each other
+and the clean, tightly-coupled world
+of unique network numbers.
+It can accept old arbitrary address syntaxes,
+resolving ambiguities using heuristics
+specified by the system administrator,
+as well as domain-based addressing.
+It helps guide the conversion of message formats
+between disparate networks.
+In short,
+.i sendmail
+is designed to assist a graceful transition
+to consistent internetwork addressing schemes.
+.sp
+.pp
+Section 1 discusses the design goals for
+.i sendmail .
+Section 2 gives an overview of the basic functions of the system.
+In section 3,
+details of usage are discussed.
+Section 4 compares
+.i sendmail
+to other internet mail routers,
+and an evaluation of
+.i sendmail
+is given in section 5,
+including future plans.
+.sh 1 "DESIGN GOALS"
+.pp
+Design goals for
+.i sendmail
+include:
+.np
+Compatibility with the existing mail programs,
+including Bell version 6 mail,
+Bell version 7 mail
+[UNIX83],
+Berkeley
+.i Mail
+[Shoens79],
+BerkNet mail
+[Schmidt79],
+and hopefully UUCP mail
+[Nowitz78a, Nowitz78b].
+ARPANET mail
+[Crocker77a, Postel77]
+was also required.
+.np
+Reliability, in the sense of guaranteeing
+that every message is correctly delivered
+or at least brought to the attention of a human
+for correct disposal;
+no message should ever be completely lost.
+This goal was considered essential
+because of the emphasis on mail in our environment.
+It has turned out to be one of the hardest goals to satisfy,
+especially in the face of the many anomalous message formats
+produced by various ARPANET sites.
+For example,
+certain sites generate improperly formated addresses,
+occasionally
+causing error-message loops.
+Some hosts use blanks in names,
+causing problems with
+UNIX mail programs that assume that an address
+is one word.
+The semantics of some fields
+are interpreted slightly differently
+by different sites.
+In summary,
+the obscure features of the ARPANET mail protocol
+really
+.i are
+used and
+are difficult to support,
+but must be supported.
+.np
+Existing software to do actual delivery
+should be used whenever possible.
+This goal derives as much from political and practical considerations
+as technical.
+.np
+Easy expansion to
+fairly complex environments,
+including multiple
+connections to a single network type
+(such as with multiple UUCP or Ether nets
+[Metcalfe76]).
+This goal requires consideration of the contents of an address
+as well as its syntax
+in order to determine which gateway to use.
+For example,
+the ARPANET is bringing up the
+TCP protocol to replace the old NCP protocol.
+No host at Berkeley runs both TCP and NCP,
+so it is necessary to look at the ARPANET host name
+to determine whether to route mail to an NCP gateway
+or a TCP gateway.
+.np
+Configuration should not be compiled into the code.
+A single compiled program should be able to run as is at any site
+(barring such basic changes as the CPU type or the operating system).
+We have found this seemingly unimportant goal
+to be critical in real life.
+Besides the simple problems that occur when any program gets recompiled
+in a different environment,
+many sites like to
+.q fiddle
+with anything that they will be recompiling anyway.
+.np
+.i Sendmail
+must be able to let various groups maintain their own mailing lists,
+and let individuals specify their own forwarding,
+without modifying the system alias file.
+.np
+Each user should be able to specify which mailer to execute
+to process mail being delivered for him.
+This feature allows users who are using specialized mailers
+that use a different format to build their environment
+without changing the system,
+and facilitates specialized functions
+(such as returning an
+.q "I am on vacation"
+message).
+.np
+Network traffic should be minimized
+by batching addresses to a single host where possible,
+without assistance from the user.
+.pp
+These goals motivated the architecture illustrated in figure 1.
+.(z
+.hl
+.ie t \
+\{\
+.ie !"\*(.T"" \
+\{\
+.PS
+boxht = 0.5i
+boxwid = 1.0i
+
+	down
+S:	[
+		right
+	S1:	box "sender1"
+		move
+		box "sender2"
+		move
+	S3:	box "sender3"
+	]
+	arrow
+SM:	box "sendmail" wid 2i ht boxht
+	arrow
+M:	[
+		right
+	M1:	box "mailer1"
+		move
+		box "mailer2"
+		move
+	M3:	box "mailer3"
+	]
+
+	arrow from S.S1.s to 1/2 between SM.nw and SM.n
+	arrow from S.S3.s to 1/2 between SM.n and SM.ne
+
+	arrow from 1/2 between SM.sw and SM.s to M.M1.n
+	arrow from 1/2 between SM.s and SM.se to M.M3.n
+.PE
+.\}
+.el \
+.	sp 18
+.\}
+.el \{\
+.(c
++---------+   +---------+   +---------+
+| sender1 |   | sender2 |   | sender3 |
++---------+   +---------+   +---------+
+     |  	   |             |
+     +----------+  +  +----------+
+		|  |  |
+		v  v  v
+            +-------------+
+            |   sendmail  |
+            +-------------+
+		|  |  |
+     +----------+  +  +----------+
+     |  	   |             |
+     v             v             v
++---------+   +---------+   +---------+
+| mailer1 |   | mailer2 |   | mailer3 |
++---------+   +---------+   +---------+
+.)c
+.\}
+
+.ce
+Figure 1 \*- Sendmail System Structure.
+.hl
+.)z
+The user interacts with a mail generating and sending program.
+When the mail is created,
+the generator calls
+.i sendmail ,
+which routes the message to the correct mailer(s).
+Since some of the senders may be network servers
+and some of the mailers may be network clients,
+.i sendmail
+may be used as an internet mail gateway.
+.sh 1 "OVERVIEW"
+.sh 2 "System Organization"
+.pp
+.i Sendmail
+neither interfaces with the user
+nor does actual mail delivery.
+Rather,
+it collects a message
+generated by a user interface program (UIP)
+such as Berkeley
+.i Mail ,
+MS
+[Crocker77b],
+or MH
+[Borden79],
+edits the message as required by the destination network,
+and calls appropriate mailers
+to do mail delivery or queueing for network transmission\**.
+.(f
+\**except when mailing to a file,
+when
+.i sendmail
+does the delivery directly.
+.)f
+This discipline allows the insertion of new mailers
+at minimum cost.
+In this sense 
+.i sendmail
+resembles the Message Processing Module (MPM)
+of [Postel79b].
+.sh 2 "Interfaces to the Outside World"
+.pp
+There are three ways
+.i sendmail
+can communicate with the outside world,
+both in receiving and in sending mail.
+These are using the conventional UNIX
+argument vector/return status,
+speaking SMTP over a pair of UNIX pipes,
+and speaking SMTP over an interprocess(or) channel.
+.sh 3 "Argument vector/exit status"
+.pp
+This technique is the standard UNIX method
+for communicating with the process.
+A list of recipients is sent in the argument vector,
+and the message body is sent on the standard input.
+Anything that the mailer prints
+is simply collected and sent back to the sender
+if there were any problems.
+The exit status from the mailer is collected
+after the message is sent,
+and a diagnostic is printed if appropriate.
+.sh 3 "SMTP over pipes"
+.pp
+The SMTP protocol
+[Postel82]
+can be used to run an interactive lock-step interface
+with the mailer.
+A subprocess is still created,
+but no recipient addresses are passed to the mailer
+via the argument list.
+Instead, they are passed one at a time
+in commands sent to the processes standard input.
+Anything appearing on the standard output
+must be a reply code
+in a special format.
+.sh 3 "SMTP over an IPC connection"
+.pp
+This technique is similar to the previous technique,
+except that it uses a 4.2bsd IPC channel
+[UNIX83].
+This method is exceptionally flexible
+in that the mailer need not reside
+on the same machine.
+It is normally used to connect to a sendmail process
+on another machine.
+.sh 2 "Operational Description"
+.pp
+When a sender wants to send a message,
+it issues a request to
+.i sendmail
+using one of the three methods described above.
+.i Sendmail
+operates in two distinct phases.
+In the first phase,
+it collects and stores the message.
+In the second phase,
+message delivery occurs.
+If there were errors during processing
+during the second phase,
+.i sendmail
+creates and returns a new message describing the error
+and/or returns an status code
+telling what went wrong.
+.sh 3 "Argument processing and address parsing"
+.pp
+If
+.i sendmail
+is called using one of the two subprocess techniques,
+the arguments
+are first scanned
+and option specifications are processed.
+Recipient addresses are then collected,
+either from the command line
+or from the SMTP
+RCPT command,
+and a list of recipients is created.
+Aliases are expanded at this step,
+including mailing lists.
+As much validation as possible of the addresses
+is done at this step:
+syntax is checked, and local addresses are verified,
+but detailed checking of host names and addresses
+is deferred until delivery.
+Forwarding is also performed
+as the local addresses are verified.
+.pp
+.i Sendmail
+appends each address
+to the recipient list after parsing.
+When a name is aliased or forwarded,
+the old name is retained in the list,
+and a flag is set that tells the delivery phase
+to ignore this recipient.
+This list is kept free from duplicates,
+preventing alias loops
+and duplicate messages deliverd to the same recipient,
+as might occur if a person is in two groups.
+.sh 3 "Message collection"
+.pp
+.i Sendmail
+then collects the message.
+The message should have a header at the beginning.
+No formatting requirements are imposed on the message
+except that they must be lines of text
+(i.e., binary data is not allowed).
+The header is parsed and stored in memory,
+and the body of the message is saved
+in a temporary file.
+.pp
+To simplify the program interface,
+the message is collected even if no addresses were valid.
+The message will be returned with an error.
+.sh 3 "Message delivery"
+.pp
+For each unique mailer and host in the recipient list,
+.i sendmail
+calls the appropriate mailer.
+Each mailer invocation sends to all users receiving the message on one host.
+Mailers that only accept one recipient at a time
+are handled properly.
+.pp
+The message is sent to the mailer
+using one of the same three interfaces
+used to submit a message to sendmail.
+Each copy of the message is
+prepended by a customized header.
+The mailer status code is caught and checked,
+and a suitable error message given as appropriate.
+The exit code must conform to a system standard
+or a generic message
+(\c
+.q "Service unavailable" )
+is given.
+.sh 3 "Queueing for retransmission"
+.pp
+If the mailer returned an status that
+indicated that it might be able to handle the mail later,
+.i sendmail
+will queue the mail and try again later.
+.sh 3 "Return to sender"
+.pp
+If errors occur during processing,
+.i sendmail
+returns the message to the sender for retransmission.
+The letter can be mailed back
+or written in the file
+.q dead.letter
+in the sender's home directory\**.
+.(f
+\**Obviously, if the site giving the error is not the originating
+site, the only reasonable option is to mail back to the sender.
+Also, there are many more error disposition options,
+but they only effect the error message \*- the
+.q "return to sender"
+function is always handled in one of these two ways.
+.)f
+.sh 2 "Message Header Editing"
+.pp
+Certain editing of the message header
+occurs automatically.
+Header lines can be inserted
+under control of the configuration file.
+Some lines can be merged;
+for example,
+a
+.q From:
+line and a
+.q Full-name:
+line can be merged under certain circumstances.
+.sh 2 "Configuration File"
+.pp
+Almost all configuration information is read at runtime
+from an ASCII file,
+encoding
+macro definitions
+(defining the value of macros used internally),
+header declarations
+(telling sendmail the format of header lines that it will process specially,
+i.e., lines that it will add or reformat),
+mailer definitions
+(giving information such as the location and characteristics
+of each mailer),
+and address rewriting rules
+(a limited production system to rewrite addresses
+which is used to parse and rewrite the addresses).
+.pp
+To improve performance when reading the configuration file,
+a memory image can be provided.
+This provides a
+.q compiled
+form of the configuration file.
+.sh 1 "USAGE AND IMPLEMENTATION"
+.sh 2 "Arguments"
+.pp
+Arguments may be flags and addresses.
+Flags set various processing options.
+Following flag arguments,
+address arguments may be given,
+unless we are running in SMTP mode.
+Addresses follow the syntax in RFC822
+[Crocker82]
+for ARPANET
+address formats.
+In brief, the format is:
+.np
+Anything in parentheses is thrown away
+(as a comment).
+.np
+Anything in angle brackets (\c
+.q "<\|>" )
+is preferred
+over anything else.
+This rule implements the ARPANET standard that addresses of the form
+.(b
+user name <machine-address>
+.)b
+will send to the electronic
+.q machine-address
+rather than the human
+.q "user name."
+.np
+Double quotes
+(\ "\ )
+quote phrases;
+backslashes quote characters.
+Backslashes are more powerful
+in that they will cause otherwise equivalent phrases
+to compare differently \*- for example,
+.i user
+and
+.i
+"user"
+.r
+are equivalent,
+but
+.i \euser
+is different from either of them.
+.pp
+Parentheses, angle brackets, and double quotes
+must be properly balanced and nested.
+The rewriting rules control remaining parsing\**.
+.(f
+\**Disclaimer: Some special processing is done
+after rewriting local names; see below.
+.)f
+.sh 2 "Mail to Files and Programs"
+.pp
+Files and programs are legitimate message recipients.
+Files provide archival storage of messages,
+useful for project administration and history.
+Programs are useful as recipients in a variety of situations,
+for example,
+to maintain a public repository of systems messages
+(such as the Berkeley
+.i msgs
+program,
+or the MARS system
+[Sattley78]).
+.pp
+Any address passing through the initial parsing algorithm
+as a local address
+(i.e, not appearing to be a valid address for another mailer)
+is scanned for two special cases.
+If prefixed by a vertical bar (\c
+.q \^|\^ )
+the rest of the address is processed as a shell command.
+If the user name begins with a slash mark (\c
+.q /\^ )
+the name is used as a file name,
+instead of a login name.
+.pp
+Files that have setuid or setgid bits set
+but no execute bits set
+have those bits honored if
+.i sendmail
+is running as root.
+.sh 2 "Aliasing, Forwarding, Inclusion"
+.pp
+.i Sendmail
+reroutes mail three ways.
+Aliasing applies system wide.
+Forwarding allows each user to reroute incoming mail
+destined for that account.
+Inclusion directs
+.i sendmail
+to read a file for a list of addresses,
+and is normally used
+in conjunction with aliasing.
+.sh 3 "Aliasing"
+.pp
+Aliasing maps names to address lists using a system-wide file.
+This file is indexed to speed access.
+Only names that parse as local
+are allowed as aliases;
+this guarantees a unique key
+(since there are no nicknames for the local host).
+.sh 3 "Forwarding"
+.pp
+After aliasing,
+recipients that are local and valid
+are checked for the existence of a
+.q .forward
+file in their home directory.
+If it exists,
+the message is
+.i not
+sent to that user,
+but rather to the list of users in that file.
+Often
+this list will contain only one address,
+and the feature will be used for network mail forwarding.
+.pp
+Forwarding also permits a user to specify a private incoming mailer.
+For example,
+forwarding to:
+.(b
+"\^|\|/usr/local/newmail myname"
+.)b
+will use a different incoming mailer.
+.sh 3 "Inclusion"
+.pp
+Inclusion is specified in RFC 733 [Crocker77a] syntax:
+.(b
+:Include: pathname
+.)b
+An address of this form reads the file specified by
+.i pathname
+and sends to all users listed in that file.
+.pp
+The intent is
+.i not
+to support direct use of this feature,
+but rather to use this as a subset of aliasing.
+For example,
+an alias of the form:
+.(b
+project: :include:/usr/project/userlist
+.)b
+is a method of letting a project maintain a mailing list
+without interaction with the system administration,
+even if the alias file is protected.
+.pp
+It is not necessary to rebuild the index on the alias database
+when a :include: list is changed.
+.sh 2 "Message Collection"
+.pp
+Once all recipient addresses are parsed and verified,
+the message is collected.
+The message comes in two parts:
+a message header and a message body,
+separated by a blank line.
+.pp
+The header is formatted as a series of lines
+of the form
+.(b
+	field-name: field-value
+.)b
+Field-value can be split across lines by starting the following
+lines with a space or a tab.
+Some header fields have special internal meaning,
+and have appropriate special processing.
+Other headers are simply passed through.
+Some header fields may be added automatically,
+such as time stamps.
+.pp
+The body is a series of text lines.
+It is completely uninterpreted and untouched,
+except that lines beginning with a dot
+have the dot doubled
+when transmitted over an SMTP channel.
+This extra dot is stripped by the receiver.
+.sh 2 "Message Delivery"
+.pp
+The send queue is ordered by receiving host
+before transmission
+to implement message batching.
+Each address is marked as it is sent
+so rescanning the list is safe.
+An argument list is built as the scan proceeds.
+Mail to files is detected during the scan of the send list.
+The interface to the mailer
+is performed using one of the techniques
+described in section 2.2.
+.pp
+After a connection is established,
+.i sendmail
+makes the per-mailer changes to the header
+and sends the result to the mailer.
+If any mail is rejected by the mailer,
+a flag is set to invoke the return-to-sender function
+after all delivery completes.
+.sh 2 "Queued Messages"
+.pp
+If the mailer returns a
+.q "temporary failure"
+exit status,
+the message is queued.
+A control file is used to describe the recipients to be sent to
+and various other parameters.
+This control file is formatted as a series of lines,
+each describing a sender,
+a recipient,
+the time of submission,
+or some other salient parameter of the message.
+The header of the message is stored
+in the control file,
+so that the associated data file in the queue
+is just the temporary file that was originally collected.
+.sh 2 "Configuration"
+.pp
+Configuration is controlled primarily by a configuration file
+read at startup.
+.i Sendmail
+should not need to be recomplied except
+.np
+To change operating systems
+(V6, V7/32V, 4BSD).
+.np
+To remove or insert the DBM
+(UNIX database)
+library.
+.np
+To change ARPANET reply codes.
+.np
+To add headers fields requiring special processing.
+.lp
+Adding mailers or changing parsing
+(i.e., rewriting)
+or routing information
+does not require recompilation.
+.pp
+If the mail is being sent by a local user,
+and the file
+.q .mailcf
+exists in the sender's home directory,
+that file is read as a configuration file
+after the system configuration file.
+The primary use of this feature is to add header lines.
+.pp
+The configuration file encodes macro definitions,
+header definitions,
+mailer definitions,
+rewriting rules,
+and options.
+.sh 3 Macros
+.pp
+Macros can be used in three ways.
+Certain macros transmit
+unstructured textual information
+into the mail system,
+such as the name
+.i sendmail
+will use to identify itself in error messages.
+Other macros transmit information from
+.i sendmail
+to the configuration file
+for use in creating other fields
+(such as argument vectors to mailers);
+e.g., the name of the sender,
+and the host and user
+of the recipient.
+Other macros are unused internally,
+and can be used as shorthand in the configuration file.
+.sh 3 "Header declarations"
+.pp
+Header declarations inform
+.i sendmail
+of the format of known header lines.
+Knowledge of a few header lines
+is built into
+.i sendmail ,
+such as the
+.q From:
+and
+.q Date:
+lines.
+.pp
+Most configured headers
+will be automatically inserted
+in the outgoing message
+if they don't exist in the incoming message.
+Certain headers are suppressed by some mailers.
+.sh 3 "Mailer declarations"
+.pp
+Mailer declarations tell
+.i sendmail
+of the various mailers available to it.
+The definition specifies the internal name of the mailer,
+the pathname of the program to call,
+some flags associated with the mailer,
+and an argument vector to be used on the call;
+this vector is macro-expanded before use.
+.sh 3 "Address rewriting rules"
+.pp
+The heart of address parsing in
+.i sendmail
+is a set of rewriting rules.
+These are an ordered list of pattern-replacement rules,
+(somewhat like a production system,
+except that order is critical),
+which are applied to each address.
+The address is rewritten textually until it is either rewritten
+into a special canonical form
+(i.e.,
+a (mailer, host, user)
+3-tuple,
+such as {arpanet, usc-isif, postel}
+representing the address
+.q "postel@usc-isif" ),
+or it falls off the end.
+When a pattern matches,
+the rule is reapplied until it fails.
+.pp
+The configuration file also supports the editing of addresses
+into different formats.
+For example,
+an address of the form:
+.(b
+ucsfcgl!tef
+.)b
+might be mapped into:
+.(b
+tef@ucsfcgl.UUCP
+.)b
+to conform to the domain syntax.
+Translations can also be done in the other direction.
+.sh 3 "Option setting"
+.pp
+There are several options that can be set
+from the configuration file.
+These include the pathnames of various support files,
+timeouts,
+default modes,
+etc.
+.sh 1 "COMPARISON WITH OTHER MAILERS"
+.sh 2 "Delivermail"
+.pp
+.i Sendmail
+is an outgrowth of
+.i delivermail .
+The primary differences are:
+.np
+Configuration information is not compiled in.
+This change simplifies many of the problems
+of moving to other machines.
+It also allows easy debugging of new mailers.
+.np
+Address parsing is more flexible.
+For example,
+.i delivermail
+only supported one gateway to any network,
+whereas
+.i sendmail
+can be sensitive to host names
+and reroute to different gateways.
+.np
+Forwarding and
+:include:
+features eliminate the requirement that the system alias file
+be writable by any user
+(or that an update program be written,
+or that the system administration make all changes).
+.np
+.i Sendmail
+supports message batching across networks
+when a message is being sent to multiple recipients.
+.np
+A mail queue is provided in
+.i sendmail.
+Mail that cannot be delivered immediately
+but can potentially be delivered later
+is stored in this queue for a later retry.
+The queue also provides a buffer against system crashes;
+after the message has been collected
+it may be reliably redelivered
+even if the system crashes during the initial delivery.
+.np
+.i Sendmail
+uses the networking support provided by 4.2BSD
+to provide a direct interface networks such as the ARPANET
+and/or Ethernet
+using SMTP (the Simple Mail Transfer Protocol)
+over a TCP/IP connection.
+.sh 2 "MMDF"
+.pp
+MMDF
+[Crocker79]
+spans a wider problem set than
+.i sendmail .
+For example,
+the domain of
+MMDF includes a
+.q "phone network"
+mailer, whereas
+.i sendmail
+calls on preexisting mailers in most cases.
+.pp
+MMDF and
+.i sendmail
+both support aliasing,
+customized mailers,
+message batching,
+automatic forwarding to gateways,
+queueing,
+and retransmission.
+MMDF supports two-stage timeout,
+which
+.i sendmail
+does not support.
+.pp
+The configuration for MMDF
+is compiled into the code\**.
+.(f
+\**Dynamic configuration tables are currently being considered
+for MMDF;
+allowing the installer to select either compiled
+or dynamic tables.
+.)f
+.pp
+Since MMDF does not consider backwards compatibility
+as a design goal,
+the address parsing is simpler but much less flexible.
+.pp
+It is somewhat harder to integrate a new channel\**
+.(f
+\**The MMDF equivalent of a
+.i sendmail
+.q mailer.
+.)f
+into MMDF.
+In particular,
+MMDF must know the location and format
+of host tables for all channels,
+and the channel must speak a special protocol.
+This allows MMDF to do additional verification
+(such as verifying host names)
+at submission time.
+.pp
+MMDF strictly separates the submission and delivery phases.
+Although
+.i sendmail
+has the concept of each of these stages,
+they are integrated into one program,
+whereas in MMDF they are split into two programs.
+.sh 2 "Message Processing Module"
+.pp
+The Message Processing Module (MPM)
+discussed by Postel [Postel79b]
+matches
+.i sendmail
+closely in terms of its basic architecture.
+However,
+like MMDF,
+the MPM includes the network interface software
+as part of its domain.
+.pp
+MPM also postulates a duplex channel to the receiver,
+as does MMDF,
+thus allowing simpler handling of errors
+by the mailer
+than is possible in
+.i sendmail .
+When a message queued by
+.i sendmail
+is sent,
+any errors must be returned to the sender
+by the mailer itself.
+Both MPM and MMDF mailers
+can return an immediate error response,
+and a single error processor can create an appropriate response.
+.pp
+MPM prefers passing the message as a structured object,
+with type-length-value tuples\**.
+.(f
+\**This is similar to the NBS standard.
+.)f
+Such a convention requires a much higher degree of cooperation
+between mailers than is required by
+.i sendmail .
+MPM also assumes a universally agreed upon internet name space
+(with each address in the form of a net-host-user tuple),
+which
+.i sendmail
+does not.
+.sh 1 "EVALUATIONS AND FUTURE PLANS"
+.pp
+.i Sendmail
+is designed to work in a nonhomogeneous environment.
+Every attempt is made to avoid imposing unnecessary constraints
+on the underlying mailers.
+This goal has driven much of the design.
+One of the major problems
+has been the lack of a uniform address space,
+as postulated in [Postel79a]
+and [Postel79b].
+.pp
+A nonuniform address space implies that a path will be specified
+in all addresses,
+either explicitly (as part of the address)
+or implicitly
+(as with implied forwarding to gateways).
+This restriction has the unpleasant effect of making replying to messages
+exceedingly difficult,
+since there is no one
+.q address
+for any person,
+but only a way to get there from wherever you are.
+.pp
+Interfacing to mail programs
+that were not initially intended to be applied
+in an internet environment
+has been amazingly successful,
+and has reduced the job to a manageable task.
+.pp
+.i Sendmail
+has knowledge of a few difficult environments
+built in.
+It generates ARPANET FTP/SMTP compatible error messages
+(prepended with three-digit numbers
+[Neigus73, Postel74, Postel82])
+as necessary,
+optionally generates UNIX-style
+.q From
+lines on the front of messages for some mailers,
+and knows how to parse the same lines on input.
+Also,
+error handling has an option customized for BerkNet.
+.pp
+The decision to avoid doing any type of delivery where possible
+(even, or perhaps especially, local delivery)
+has turned out to be a good idea.
+Even with local delivery,
+there are issues of the location of the mailbox,
+the format of the mailbox,
+the locking protocol used,
+etc.,
+that are best decided by other programs.
+One surprisingly major annoyance in many internet mailers
+is that the location and format of local mail is built in.
+The feeling seems to be that local mail is so common
+that it should be efficient.
+This feeling is not born out by
+our experience;
+on the contrary,
+the location and format of mailboxes seems to vary widely
+from system to system.
+.pp
+The ability to automatically generate a response to incoming mail
+(by forwarding mail to a program)
+seems useful
+(\c
+.q "I am on vacation until late August...." )
+but can create problems
+such as forwarding loops
+(two people on vacation whose programs send notes back and forth,
+for instance)
+if these programs are not well written.
+A program could be written to do standard tasks correctly,
+but this would solve the general case.
+.pp
+It might be desirable to implement some form of load limiting.
+I am unaware of any mail system that addresses this problem,
+nor am I aware of any reasonable solution at this time.
+.pp
+The configuration file is currently practically inscrutable;
+considerable convenience could be realized
+with a higher-level format.
+.pp
+It seems clear that common protocols will be changing soon
+to accommodate changing requirements and environments.
+These changes will include modifications to the message header
+(e.g., [NBS80])
+or to the body of the message itself
+(such as for multimedia messages
+[Postel80]).
+Experience indicates that
+these changes should be relatively trivial to integrate
+into the existing system.
+.pp
+In tightly coupled environments,
+it would be nice to have a name server
+such as Grapvine
+[Birrell82]
+integrated into the mail system.
+This would allow a site such as
+.q Berkeley
+to appear as a single host,
+rather than as a collection of hosts,
+and would allow people to move transparently among machines
+without having to change their addresses.
+Such a facility
+would require an automatically updated database
+and some method of resolving conflicts.
+Ideally this would be effective even without
+all hosts being under
+a single management.
+However,
+it is not clear whether this feature
+should be integrated into the
+aliasing facility
+or should be considered a
+.q "value added"
+feature outside
+.i sendmail
+itself.
+.pp
+As a more interesting case,
+the CSNET name server
+[Solomon81]
+provides an facility that goes beyond a single
+tightly-coupled environment.
+Such a facility would normally exist outside of
+.i sendmail
+however.
+.sh 0 "ACKNOWLEDGEMENTS"
+.pp
+Thanks are due to Kurt Shoens for his continual cheerful
+assistance and good advice,
+Bill Joy for pointing me in the correct direction
+(over and over),
+and Mark Horton for more advice,
+prodding,
+and many of the good ideas.
+Kurt and Eric Schmidt are to be credited
+for using
+.i delivermail
+as a server for their programs
+(\c
+.i Mail
+and BerkNet respectively)
+before any sane person should have,
+and making the necessary modifications
+promptly and happily.
+Eric gave me considerable advice about the perils
+of network software which saved me an unknown
+amount of work and grief.
+Mark did the original implementation of the DBM version
+of aliasing, installed the VFORK code,
+wrote the current version of
+.i rmail ,
+and was the person who really convinced me
+to put the work into
+.i delivermail
+to turn it into
+.i sendmail .
+Kurt deserves accolades for using
+.i sendmail
+when I was myself afraid to take the risk;
+how a person can continue to be so enthusiastic
+in the face of so much bitter reality is beyond me.
+.pp
+Kurt,
+Mark,
+Kirk McKusick,
+Marvin Solomon,
+and many others have reviewed this paper,
+giving considerable useful advice.
+.pp
+Special thanks are reserved for Mike Stonebraker at Berkeley
+and Bob Epstein at Britton-Lee,
+who both knowingly allowed me to put so much work into this
+project
+when there were so many other things I really should
+have been working on.
+.+c
+.ce
+REFERENCES
+.nr ii 1.5i
+.ip [Birrell82]
+Birrell, A. D.,
+Levin, R.,
+Needham, R. M.,
+and
+Schroeder, M. D.,
+.q "Grapevine: An Exercise in Distributed Computing."
+In
+.ul
+Comm. A.C.M. 25,
+4,
+April 82.
+.ip [Borden79]
+Borden, S.,
+Gaines, R. S.,
+and
+Shapiro, N. Z.,
+.ul
+The MH Message Handling System: Users' Manual.
+R-2367-PAF.
+Rand Corporation.
+October 1979.
+.ip [Crocker77a]
+Crocker, D. H.,
+Vittal, J. J.,
+Pogran, K. T.,
+and
+Henderson, D. A. Jr.,
+.ul
+Standard for the Format of ARPA Network Text Messages.
+RFC 733,
+NIC 41952.
+In [Feinler78].
+November 1977.
+.ip [Crocker77b]
+Crocker, D. H.,
+.ul
+Framework and Functions of the MS Personal Message System.
+R-2134-ARPA,
+Rand Corporation,
+Santa Monica, California.
+1977.
+.ip [Crocker79]
+Crocker, D. H.,
+Szurkowski, E. S.,
+and
+Farber, D. J.,
+.ul
+An Internetwork Memo Distribution Facility \*- MMDF.
+6th Data Communication Symposium,
+Asilomar.
+November 1979.
+.ip [Crocker82]
+Crocker, D. H.,
+.ul
+Standard for the Format of Arpa Internet Text Messages.
+RFC 822.
+Network Information Center,
+SRI International,
+Menlo Park, California.
+August 1982.
+.ip [Metcalfe76]
+Metcalfe, R.,
+and
+Boggs, D.,
+.q "Ethernet: Distributed Packet Switching for Local Computer Networks" ,
+.ul
+Communications of the ACM 19,
+7.
+July 1976.
+.ip [Feinler78]
+Feinler, E.,
+and
+Postel, J.
+(eds.),
+.ul
+ARPANET Protocol Handbook.
+NIC 7104,
+Network Information Center,
+SRI International,
+Menlo Park, California.
+1978.
+.ip [NBS80]
+National Bureau of Standards,
+.ul
+Specification of a Draft Message Format Standard.
+Report No. ICST/CBOS 80-2.
+October 1980.
+.ip [Neigus73]
+Neigus, N.,
+.ul
+File Transfer Protocol for the ARPA Network.
+RFC 542, NIC 17759.
+In [Feinler78].
+August, 1973.
+.ip [Nowitz78a]
+Nowitz, D. A.,
+and
+Lesk, M. E.,
+.ul
+A Dial-Up Network of UNIX Systems.
+Bell Laboratories.
+In
+UNIX Programmer's Manual, Seventh Edition,
+Volume 2.
+August, 1978.
+.ip [Nowitz78b]
+Nowitz, D. A.,
+.ul
+Uucp Implementation Description.
+Bell Laboratories.
+In
+UNIX Programmer's Manual, Seventh Edition,
+Volume 2.
+October, 1978.
+.ip [Postel74]
+Postel, J.,
+and
+Neigus, N.,
+Revised FTP Reply Codes.
+RFC 640, NIC 30843.
+In [Feinler78].
+June, 1974.
+.ip [Postel77]
+Postel, J.,
+.ul
+Mail Protocol.
+NIC 29588.
+In [Feinler78].
+November 1977.
+.ip [Postel79a]
+Postel, J.,
+.ul
+Internet Message Protocol.
+RFC 753,
+IEN 85.
+Network Information Center,
+SRI International,
+Menlo Park, California.
+March 1979.
+.ip [Postel79b]
+Postel, J. B.,
+.ul
+An Internetwork Message Structure.
+In
+.ul
+Proceedings of the Sixth Data Communications Symposium,
+IEEE.
+New York.
+November 1979.
+.ip [Postel80]
+Postel, J. B.,
+.ul
+A Structured Format for Transmission of Multi-Media Documents.
+RFC 767.
+Network Information Center,
+SRI International,
+Menlo Park, California.
+August 1980.
+.ip [Postel82]
+Postel, J. B.,
+.ul
+Simple Mail Transfer Protocol.
+RFC821
+(obsoleting RFC788).
+Network Information Center,
+SRI International,
+Menlo Park, California.
+August 1982.
+.ip [Schmidt79]
+Schmidt, E.,
+.ul
+An Introduction to the Berkeley Network.
+University of California, Berkeley California.
+1979.
+.ip [Shoens79]
+Shoens, K.,
+.ul
+Mail Reference Manual.
+University of California, Berkeley.
+In UNIX Programmer's Manual,
+Seventh Edition,
+Volume 2C.
+December 1979.
+.ip [Sluizer81]
+Sluizer, S.,
+and
+Postel, J. B.,
+.ul
+Mail Transfer Protocol.
+RFC 780.
+Network Information Center,
+SRI International,
+Menlo Park, California.
+May 1981.
+.ip [Solomon81]
+Solomon, M., Landweber, L., and Neuhengen, D.,
+.q "The Design of the CSNET Name Server."
+CS-DN-2,
+University of Wisconsin, Madison.
+November 1981.
+.ip [Su82]
+Su, Zaw-Sing,
+and
+Postel, Jon,
+.ul
+The Domain Naming Convention for Internet User Applications.
+RFC819.
+Network Information Center,
+SRI International,
+Menlo Park, California.
+August 1982.
+.ip [UNIX83]
+.ul
+The UNIX Programmer's Manual, Seventh Edition,
+Virtual VAX-11 Version,
+Volume 1.
+Bell Laboratories,
+modified by the University of California,
+Berkeley, California.
+March, 1983.
diff --git a/usr.sbin/sendmail/doc/op/Makefile b/usr.sbin/sendmail/doc/op/Makefile
new file mode 100644
index 00000000000..e8f791a4959
--- /dev/null
+++ b/usr.sbin/sendmail/doc/op/Makefile
@@ -0,0 +1,13 @@
+#	@(#)Makefile	8.2 (Berkeley) 2/28/94
+
+DIR=	smm/08.sendmailop
+SRCS=	op.me
+MACROS=	-me
+
+all: op.ps
+
+op.ps: ${SRCS}
+	rm -f ${.TARGET}
+	${PIC} ${SRCS} | ${EQN} | ${ROFF} > ${.TARGET}
+
+.include <bsd.doc.mk>
diff --git a/usr.sbin/sendmail/doc/op/op.me b/usr.sbin/sendmail/doc/op/op.me
new file mode 100644
index 00000000000..9678d14c1fe
--- /dev/null
+++ b/usr.sbin/sendmail/doc/op/op.me
@@ -0,0 +1,6921 @@
+.\" Copyright (c) 1983 Eric P. Allman
+.\" Copyright (c) 1983, 1993
+.\"	The Regents of the University of California.  All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 3. All advertising materials mentioning features or use of this software
+.\"    must display the following acknowledgement:
+.\"	This product includes software developed by the University of
+.\"	California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"	@(#)op.me	8.36 (Berkeley) 4/14/94
+.\"
+.\" eqn op.me | pic | troff -me
+.eh 'SMM:08-%''Sendmail Installation and Operation Guide'
+.oh 'Sendmail Installation and Operation Guide''SMM:08-%'
+.\" SD is lib if sendmail is installed in /usr/lib, sbin if in /usr/sbin
+.ds SD sbin
+.\" SB is bin if newaliases/mailq are installed in /usr/bin, ucb if in /usr/ucb
+.ds SB bin
+.nr si 3n
+.de $0
+.(x
+.in \\$3u*3n
+.ti -3n
+\\$2.  \\$1
+.)x
+..
+.de $C
+.(x
+.in 0
+\\$1 \\$2.  \\$3
+.)x
+..
+.sc
+.+c
+.(l C
+.sz 16
+.b SENDMAIL
+.sz 12
+.sp
+.b "INSTALLATION AND OPERATION GUIDE"
+.sz 10
+.sp
+.r
+Eric Allman
+University of California, Berkeley
+Mammoth Project
+eric@CS.Berkeley.EDU
+.sp
+Version 8.36
+.sp
+For Sendmail Version 8.6
+.)l
+.sp 2
+.pp
+.i Sendmail
+implements a general purpose internetwork mail routing facility
+under the UNIX*
+.(f
+*UNIX is a trademark of Unix Systems Laboratories.
+.)f
+operating system.
+It is not tied to any one transport protocol \*-
+its function may be likened to a crossbar switch,
+relaying messages from one domain into another.
+In the process,
+it can do a limited amount of message header editing
+to put the message into a format that is appropriate
+for the receiving domain.
+All of this is done under the control of a configuration file.
+.pp
+Due to the requirements of flexibility
+for
+.i sendmail ,
+the configuration file can seem somewhat unapproachable.
+However, there are only a few basic configurations
+for most sites,
+for which standard configuration files have been supplied.
+Most other configurations
+can be built by adjusting an existing configuration files
+incrementally.
+.pp
+.i Sendmail
+is based on
+RFC822 (Internet Mail Format Protocol),
+RFC821 (Simple Mail Transport Protocol),
+RFC1123 (Internet Host Requirements),
+and
+RFC1425 (SMTP Service Extensions).
+However, since
+.i sendmail
+is designed to work in a wider world,
+in many cases it can be configured to exceed these protocols.
+These cases are described herein.
+.pp
+Although
+.i sendmail
+is intended to run
+without the need for monitoring,
+it has a number of features
+that may be used to monitor or adjust the operation
+under unusual circumstances.
+These features are described.
+.pp
+Section one describes how to do a basic
+.i sendmail
+installation.
+Section two
+explains the day-to-day information you should know
+to maintain your mail system.
+If you have a relatively normal site,
+these two sections should contain sufficient information
+for you to install
+.i sendmail
+and keep it happy.
+Section three
+describes some parameters that may be safely tweaked.
+Section four
+has information regarding the command line arguments.
+Section five
+contains the nitty-gritty information about the configuration
+file.
+This section is for masochists
+and people who must write their own configuration file.
+Section six
+describes configuration that can be done at compile time.
+Section seven
+gives a brief description of differences
+in this version of
+.i sendmail .
+The appendixes give a brief
+but detailed explanation of a number of features
+not described in the rest of the paper.
+.bp 7
+.sh 1 "BASIC INSTALLATION"
+.pp
+There are two basic steps to installing
+.i sendmail .
+The hard part is to build the configuration table.
+This is a file that
+.i sendmail
+reads when it starts up
+that describes the mailers it knows about,
+how to parse addresses,
+how to rewrite the message header,
+and the settings of various options.
+Although the configuration table is quite complex,
+a configuration can usually be built
+by adjusting an existing off-the-shelf configuration.
+The second part is actually doing the installation,
+i.e., creating the necessary files, etc.
+.pp
+The remainder of this section will describe the installation of
+.i sendmail
+assuming you can use one of the existing configurations
+and that the standard installation parameters are acceptable.
+All pathnames and examples
+are given from the root of the
+.i sendmail
+subtree,
+normally
+.i /usr/src/usr.\*(SD/sendmail
+on 4.4BSD.
+.pp
+If you are loading this off the tape,
+continue with the next section.
+If you have a running binary already on your system,
+you should probably skip to section 1.2.
+.sh 2 "Compiling Sendmail"
+.pp
+All
+.i sendmail
+source is in the
+.i src
+subdirectory.
+If you are running on a 4.4BSD system,
+compile by typing
+.q make .
+On other systems, you may have to make some other adjustments.
+.sh 3 "Old versions of make"
+.pp
+If you are not running the new version of
+.b make
+you will probably have to use
+.(b
+make \-f Makefile.dist
+.)b
+This file does not assume several new syntaxes,
+including the
+.q +=
+syntax in macro definition
+and the
+.q ".include"
+syntax.
+.sh 3 "Compilation flags"
+.pp
+.i Sendmail
+supports two different formats
+for the
+.i aliases
+database.
+These formats are:
+.nr ii 1i
+.ip NDBM
+The ``new DBM'' format,
+available on nearly all systems around today.
+This was the preferred format prior to 4.4BSD.
+It allows such complex things as multiple databases
+and closing a currently open database.
+.ip NEWDB
+The new database package from Berkeley.
+If you have this, use it.
+It allows
+long records,
+multiple open databases,
+real in-memory caching,
+and so forth.
+You can define this in conjunction with one of the other two;
+if you do,
+old databases are read,
+but when a new database is created it will be in NEWDB format.
+As a nasty hack,
+if you have NEWDB, NDBM, and NIS defined,
+and if the file
+.i /var/yp/Makefile
+exists and is readable,
+.i sendmail
+will create both new and old versions of the alias file
+during a
+.i newalias
+command.
+This is required because the Sun NIS/YP system
+reads the DBM version of the alias file.
+It's ugly as sin,
+but it works.
+.lp
+If neither of these are defined,
+.i sendmail
+reads the alias file into memory on every invocation.
+This can be slow and should be avoided.
+.pp
+System V based systems can define
+SYSTEM5
+to make several small adjustments.
+This changes the handling of timezones
+and uses the much less efficient
+.i lockf
+call in preference to
+.i flock .
+These can be specified separately using the compilation flags
+SYS5TZ
+and
+LOCKF
+respectively.
+.pp
+If you don't have the
+.i unsetenv
+routine in your system library, define the UNSETENV compilation flag.
+.pp
+You may also have to define the compilation variable LA_TYPE
+to describe how your load average is computed.
+This and other flags are detailed in section 6.1.
+.sh 3 "Compilation and installation"
+.pp
+After making the local system configuration described above,
+You should be able to compile and install the system.
+Compilation can be performed using
+.q make\**
+.(f
+\**where you may have to replace
+.q make
+with
+.q "make \-f Makefile.dist"
+as appropriate.
+.)f
+in the
+.b sendmail/src
+directory.
+You may be able to install using
+.(b
+make install
+.)b
+This should install the binary in
+/usr/\*(SD
+and create links from
+/usr/\*(SB/newaliases
+and
+/usr/\*(SB/mailq
+to
+/usr/\*(SD/sendmail.
+On 4.4BSD systems it will also format and install man pages.
+.sh 2 "Configuration Files"
+.pp
+.i Sendmail
+cannot operate without a configuration file.
+The configuration defines the mail systems understood at this site,
+how to access them,
+how to forward email to remote mail systems,
+and a number of tuning parameters.
+This configuration file is detailed
+in the later portion of this document.
+.pp
+The
+.i sendmail
+configuration can be daunting at first.
+The world is complex,
+and the mail configuration reflects that.
+The distribution includes an m4-based configuration package
+that hides a lot of the complexity.
+.pp
+These configuration files are simpler than old versions
+largely because the world has become simpler;
+in particular,
+text-based host files are officially eliminated,
+obviating the need to
+.q hide
+hosts behind a registered internet gateway.
+.pp
+These files also assume that most of your neighbors
+use domain-based UUCP addressing;
+that is,
+instead of naming hosts as
+.q host!user
+they will use
+.q host.domain!user .
+The configuration files can be customized to work around this,
+but it is more complex.
+.pp
+I haven't tested these yet on an isolated LAN environment
+with a single UUCP connection to the outside world.
+If you are in such an environment,
+please send comments to
+sendmail@CS.Berkeley.EDU.
+.pp
+Our configuration files are processed by
+.i m4
+to facilitate local customization;
+the directory
+.i cf
+of the
+.i sendmail
+distribution directory
+contains the source files.
+This directory contains several subdirectories:
+.nr ii 1i
+.ip cf
+Both site-dependent and site-independent descriptions of hosts.
+These can be literal host names
+(e.g.,
+.q ucbvax.mc )
+when the hosts are gateways
+or more general descriptions
+(such as
+.q "tcpproto.mc"
+as a general description of an SMTP-connected host
+or
+.q "uucpproto.mc"
+as a general description of a UUCP-connected host).
+Files ending
+.b \&.mc
+(``Master Configuration'')
+are the input descriptions;
+the output is in the corresponding
+.b \&.cf
+file.
+The general structure of these files is described below.
+.ip domain
+Site-dependent subdomain descriptions.
+These are tied to the way your organization wants to do addressing.
+For example,
+.b domain/cs.exposed.m4
+is our description for hosts in the CS.Berkeley.EDU subdomain
+that want their individual hostname to be externally visible;
+.b domain/cs.hidden.m4
+is the same except that the hostname is hidden
+(everything looks like it comes from CS.Berkeley.EDU).
+These are referenced using the
+.sm DOMAIN
+.b m4
+macro in the
+.b \&.mc
+file.
+.ip feature
+Definitions of specific features that some particular host in your site
+might want.
+These are referenced using the
+.sm FEATURE
+.b m4
+macro.
+An example feature is
+use_cw_file
+(which tells
+.i sendmail
+to read an /etc/sendmail.cw file on startup
+to find the set of local names).
+.ip hack
+Local hacks, referenced using the
+.sm HACK
+.b m4
+macro.
+Try to avoid these.
+The point of having them here is to make it clear that they smell.
+.ip m4
+Site-independent
+.i m4 (1)
+include files that have information common to all configuration files.
+This can be thought of as a
+.q #include
+directory.
+.ip mailer
+Definitions of mailers,
+referenced using the
+.sm MAILER
+.b m4
+macro.
+Defined mailer types in this distribution are
+fax,
+local,
+smtp,
+uucp,
+and usenet.
+.ip ostype
+Definitions describing various operating system environments
+(such as the location of support files).
+These are referenced using the
+.sm OSTYPE
+.b m4
+macro.
+.ip sh
+Shell files used by the
+.b m4
+build process.
+You shouldn't have to mess with these.
+.ip siteconfig
+Local site configuration information,
+such as UUCP connectivity.
+They normally contain lists of site information, for example:
+.(b
+SITE(contessa)
+SITE(hoptoad)
+SITE(nkainc)
+SITE(well)
+.)b
+They are referenced using the SITECONFIG macro:
+.(b
+SITECONFIG(site.config.file, name_of_site, X)
+.)b
+where
+.i X
+is the macro/class name to use.
+It can be U
+(indicating locally connected hosts)
+or one of W, X, or Y
+for up to three remote UUCP hubs.
+.pp
+If you are in a new domain
+(e.g., a company),
+you will probably want to create a
+cf/domain
+file for your domain.
+This consists primarily of relay definitions:
+for example, Berkeley's domain definition
+defines relays for
+BitNET,
+CSNET,
+and UUCP.
+Of these,
+only the UUCP relay is particularly specific
+to Berkeley.
+All of these are internet-style domain names.
+Please check to make certain they are reasonable for your domain.
+.pp
+Subdomains at Berkeley are also represented in the
+cf/domain
+directory.
+For example,
+the domain
+cs-exposed
+is the Computer Science subdomain with the local hostname shown
+to other users;
+cs-hidden
+makes users appear to be from the CS.Berkeley.EDU subdomain
+(with no local host information included).
+You will probably have to update this directory
+to be appropriate for your domain.
+.pp
+You will have to use or create
+.b \&.mc
+files in the
+.i cf/cf
+subdirectory for your hosts.
+This is detailed in the
+cf/README
+file.
+.sh 2 "Details of Installation Files"
+.pp
+This subsection describes the files that
+comprise the
+.i sendmail
+installation.
+.sh 3 "/usr/\*(SD/sendmail"
+.pp
+The binary for
+.i sendmail
+is located in /usr/\*(SD\**.
+.(f
+\**This is usually
+/usr/sbin
+on 4.4BSD and newer systems;
+many systems install it in
+/usr/lib.
+I understand it is in /usr/ucblib
+on System V Release 4.
+.)f
+It should be setuid root.
+For security reasons,
+/, /usr, and /usr/\*(SD
+should be owned by root, mode 755\**.
+.(f
+\**Some vendors ship them owned by bin;
+this creates a security hole that is not actually related to
+.i sendmail .
+Other important directories that should have restrictive ownerships
+and permissions are
+/bin, /usr/bin, /etc, /usr/etc, /lib, and /usr/lib.
+.)f
+.sh 3 "/etc/sendmail.cf"
+.pp
+This is the configuration file for
+.i sendmail .
+This is the only non-library file name compiled into
+.i sendmail \**.
+.(f
+\**The system libraries can reference other files;
+in particular, system library subroutines that
+.i sendmail
+calls probably reference
+.i /etc/passwd
+and
+.i /etc/resolv.conf .
+.)f
+Some older systems install it in
+.b /usr/lib/sendmail.cf .
+.pp
+If you want to move this file,
+change
+.i src/pathnames.h .
+.pp
+The configuration file is normally created
+using the distribution files described above.
+If you have a particularly unusual system configuration
+you may need to create a special version.
+The format of this file is detailed in later sections
+of this document.
+.sh 3 "/usr/\*(SB/newaliases"
+.pp
+The
+.i newaliases
+command should just be a link to
+.i sendmail :
+.(b
+rm \-f /usr/\*(SB/newaliases
+ln \-s /usr/\*(SD/sendmail /usr/\*(SB/newaliases
+.)b
+This can be installed in whatever search path you prefer
+for your system.
+.sh 3 "/var/spool/mqueue"
+.pp
+The directory
+.i /var/spool/mqueue
+should be created to hold the mail queue.
+This directory should be mode 700
+and owned by root.
+.pp
+The actual path of this directory
+is defined in the
+.b Q
+option of the
+.i sendmail.cf
+file.
+.sh 3 "/etc/aliases*"
+.pp
+The system aliases are held in
+.q /etc/aliases .
+A sample is given in
+.q lib/aliases
+which includes some aliases which
+.i must
+be defined:
+.(b
+cp lib/aliases /etc/aliases
+.i "edit /etc/aliases"
+.)b
+You should extend this file with any aliases that are apropos to your system.
+.pp
+Normally
+.i sendmail
+looks at a version of these files maintained by the
+.i dbm \|(3)
+or
+.i db \|(3)
+routines.
+These are stored either in
+.q /etc/aliases.dir
+and
+.q /etc/aliases.pag
+or
+.q /etc/aliases.db
+depending on which database package you are using.
+These can initially be created as empty files,
+but they will have to be initialized promptly.
+These should be mode 644:
+.(b
+cp /dev/null /etc/aliases.dir
+cp /dev/null /etc/aliases.pag
+chmod 644 /etc/aliases.*
+newaliases
+.)b
+The
+.i db
+routines preset the mode reasonably,
+so this step can be skipped.
+The actual path of this file
+is defined in the
+.b A
+option of the
+.i sendmail.cf
+file.
+.sh 3 "/etc/rc"
+.pp
+It will be necessary to start up the
+.i sendmail
+daemon when your system reboots.
+This daemon performs two functions:
+it listens on the SMTP socket for connections
+(to receive mail from a remote system)
+and it processes the queue periodically
+to insure that mail gets delivered when hosts come up.
+.pp
+Add the following lines to
+.q /etc/rc
+(or
+.q /etc/rc.local
+as appropriate)
+in the area where it is starting up the daemons:
+.(b
+if [ \-f /usr/\*(SD/sendmail \-a \-f /etc/sendmail.cf ]; then
+	(cd /var/spool/mqueue; rm \-f [lnx]f*)
+	/usr/\*(SD/sendmail \-bd \-q30m &
+	echo \-n ' sendmail' >/dev/console
+fi
+.)b
+The
+.q cd
+and
+.q rm
+commands insure that all lock files have been removed;
+extraneous lock files may be left around
+if the system goes down in the middle of processing a message.
+The line that actually invokes
+.i sendmail
+has two flags:
+.q \-bd
+causes it to listen on the SMTP port,
+and
+.q \-q30m
+causes it to run the queue every half hour.
+.pp
+Some people use a more complex startup script,
+removing zero length qf files and df files for which there is no qf file.
+For example:
+.(b
+# remove zero length qf files
+for qffile in qf*
+do
+	if [ \-r $qffile ]
+	then
+		if [ ! \-s $qffile ]
+		then
+			echo \-n " <zero: $qffile>" > /dev/console
+			rm \-f $qffile
+		fi
+	fi
+done
+# rename tf files to be qf if the qf does not exist
+for tffile in tf*
+do
+	qffile=`echo $tffile | sed 's/t/q/'`
+	if [ \-r $tffile \-a ! \-f $qffile ]
+	then
+		echo \-n " <recovering: $tffile>" > /dev/console
+		mv $tffile $qffile
+	else
+		echo \-n " <extra: $tffile>" > /dev/console
+		rm \-f $tffile
+	fi
+done
+# remove df files with no corresponding qf files
+for dffile in df*
+do
+	qffile=`echo $dffile | sed 's/d/q/'`
+	if [ \-r $dffile \-a ! \-f $qffile ]
+	then
+		echo \-n " <incomplete: $dffile>" > /dev/console
+		mv $dffile `echo $dffile | sed 's/d/D/'`
+	fi
+done
+# announce files that have been saved during disaster recovery
+for xffile in [A-Z]f*
+do
+	echo \-n " <panic: $xffile>" > /dev/console
+done
+.)b
+.pp
+If you are not running a version of UNIX
+that supports Berkeley TCP/IP,
+do not include the
+.b \-bd
+flag.
+.sh 3 "/usr/lib/sendmail.hf"
+.pp
+This is the help file used by the SMTP
+.b HELP
+command.
+It should be copied from
+.q lib/sendmail.hf :
+.(b
+cp lib/sendmail.hf /usr/lib
+.)b
+The actual path of this file
+is defined in the
+.b H
+option of the
+.i sendmail.cf
+file.
+.sh 3 "/etc/sendmail.st"
+.pp
+If you wish to collect statistics
+about your mail traffic,
+you should create the file
+.q /etc/sendmail.st :
+.(b
+cp /dev/null /etc/sendmail.st
+chmod 666 /etc/sendmail.st
+.)b
+This file does not grow.
+It is printed with the program
+.q mailstats/mailstats.c.
+The actual path of this file
+is defined in the
+.b S
+option of the
+.i sendmail.cf
+file.
+.sh 3 "/usr/\*(SB/newaliases"
+.pp
+If
+.i sendmail
+is invoked as
+.q newaliases,
+it will simulate the
+.b \-bi
+flag
+(i.e., will rebuild the alias database;
+see below).
+This should be a link to /usr/\*(SD/sendmail.
+.sh 3 "/usr/\*(SB/mailq"
+.pp
+If
+.i sendmail
+is invoked as
+.q mailq,
+it will simulate the
+.b \-bp
+flag
+(i.e.,
+.i sendmail
+will print the contents of the mail queue;
+see below).
+This should be a link to /usr/\*(SD/sendmail.
+.sh 1 "NORMAL OPERATIONS"
+.sh 2 "The System Log"
+.pp
+The system log is supported by the
+.i syslogd \|(8)
+program.
+All messages from
+.i sendmail
+are logged under the
+.sm LOG_MAIL
+facility.
+.sh 3 "Format"
+.pp
+Each line in the system log
+consists of a timestamp,
+the name of the machine that generated it
+(for logging from several machines
+over the local area network),
+the word
+.q sendmail: ,
+and a message.
+.sh 3 "Levels"
+.pp
+If you have
+.i syslogd \|(8)
+or an equivalent installed,
+you will be able to do logging.
+There is a large amount of information that can be logged.
+The log is arranged as a succession of levels.
+At the lowest level
+only extremely strange situations are logged.
+At the highest level,
+even the most mundane and uninteresting events
+are recorded for posterity.
+As a convention,
+log levels under ten
+are considered generally
+.q useful;
+log levels above 64
+are reserved for debugging purposes.
+Levels from 11\-64 are reserved for verbose information
+that some sites might want.
+.pp
+A complete description of the log levels
+is given in section 4.6.
+.sh 2 "The Mail Queue"
+.pp
+The mail queue should be processed transparently.
+However, you may find that manual intervention is sometimes necessary.
+For example,
+if a major host is down for a period of time
+the queue may become clogged.
+Although
+.i sendmail
+ought to recover gracefully when the host comes up,
+you may find performance unacceptably bad in the meantime.
+.sh 3 "Printing the queue"
+.pp
+The contents of the queue can be printed
+using the
+.i mailq
+command
+(or by specifying the
+.b \-bp
+flag to
+.i sendmail ):
+.(b
+mailq
+.)b
+This will produce a listing of the queue id's,
+the size of the message,
+the date the message entered the queue,
+and the sender and recipients.
+.sh 3 "Forcing the queue"
+.pp
+.i Sendmail
+should run the queue automatically
+at intervals.
+The algorithm is to read and sort the queue,
+and then to attempt to process all jobs in order.
+When it attempts to run the job,
+.i sendmail
+first checks to see if the job is locked.
+If so, it ignores the job.
+.pp
+There is no attempt to insure that only one queue processor
+exists at any time,
+since there is no guarantee that a job cannot take forever
+to process
+(however,
+.i sendmail
+does include heuristics to try to abort jobs
+that are taking absurd amounts of time;
+technically, this violates RFC 821, but is blessed by RFC 1123).
+Due to the locking algorithm,
+it is impossible for one job to freeze the entire queue.
+However,
+an uncooperative recipient host
+or a program recipient
+that never returns
+can accumulate many processes in your system.
+Unfortunately,
+there is no completely general way to solve this.
+.pp
+In some cases,
+you may find that a major host going down
+for a couple of days
+may create a prohibitively large queue.
+This will result in
+.i sendmail
+spending an inordinate amount of time
+sorting the queue.
+This situation can be fixed by moving the queue to a temporary place
+and creating a new queue.
+The old queue can be run later when the offending host returns to service.
+.pp
+To do this,
+it is acceptable to move the entire queue directory:
+.(b
+cd /var/spool
+mv mqueue omqueue; mkdir mqueue; chmod 700 mqueue
+.)b
+You should then kill the existing daemon
+(since it will still be processing in the old queue directory)
+and create a new daemon.
+.pp
+To run the old mail queue,
+run the following command:
+.(b
+/usr/\*(SD/sendmail \-oQ/var/spool/omqueue \-q
+.)b
+The
+.b \-oQ
+flag specifies an alternate queue directory
+and the
+.b \-q
+flag says to just run every job in the queue.
+If you have a tendency toward voyeurism,
+you can use the
+.b \-v
+flag to watch what is going on.
+.pp
+When the queue is finally emptied,
+you can remove the directory:
+.(b
+rmdir /var/spool/omqueue
+.)b
+.sh 2 "The Alias Database"
+.pp
+The alias database exists in two forms.
+One is a text form,
+maintained in the file
+.i /etc/aliases.
+The aliases are of the form
+.(b
+name: name1, name2, ...
+.)b
+Only local names may be aliased;
+e.g.,
+.(b
+eric@prep.ai.MIT.EDU: eric@CS.Berkeley.EDU
+.)b
+will not have the desired effect.
+Aliases may be continued by starting any continuation lines
+with a space or a tab.
+Blank lines and lines beginning with a sharp sign
+(\c
+.q # )
+are comments.
+.pp
+The second form is processed by the
+.i dbm \|(3)
+(or
+.i db \|(3))
+library.
+This form is in the files
+.i /etc/aliases.dir
+and
+.i /etc/aliases.pag.
+This is the form that
+.i sendmail
+actually uses to resolve aliases.
+This technique is used to improve performance.
+.pp
+You can also use
+.sm NIS -based
+alias files.
+For example, the specification:
+.(b
+OA/etc/aliases
+OAnis:mail.aliases@my.nis.domain
+.)b
+will first search the /etc/aliases file
+and then the map named
+.q mail.aliases
+in
+.q my.nis.domain .
+Warning: if you build your own
+.sm NIS -based
+alias files,
+be sure to provide the
+.b \-l
+flag to
+.i makedbm (8)
+to map upper case letters in the keys to lower case;
+otherwise, aliases with upper case letters in their names
+won't match incoming addresses.
+.pp
+Additional flags can be added after the colon
+exactly like a
+.b K
+line \(em for example:
+.(b
+OAnis:-N mail.aliases@my.nis.domain
+.)b
+will search the appropriate NIS map and always include null bytes in the key.
+.sh 3 "Rebuilding the alias database"
+.pp
+The DB or DBM version of the database
+may be rebuilt explicitly by executing the command
+.(b
+newaliases
+.)b
+This is equivalent to giving
+.i sendmail
+the
+.b \-bi
+flag:
+.(b
+/usr/\*(SD/sendmail \-bi
+.)b
+.pp
+If the
+.q D
+option is specified in the configuration,
+.i sendmail
+will rebuild the alias database automatically
+if possible
+when it is out of date.
+Auto-rebuild can be dangerous
+on heavily loaded machines
+with large alias files;
+if it might take more than five minutes
+to rebuild the database,
+there is a chance that several processes will start the rebuild process
+simultaneously.
+.pp
+If you have multiple aliases databases specified,
+the
+.b \-bi
+flag rebuilds all the database types it understands
+(for example, it can rebuild dbm databases but not nis databases).
+.sh 3 "Potential problems"
+.pp
+There are a number of problems that can occur
+with the alias database.
+They all result from a
+.i sendmail
+process accessing the DBM version
+while it is only partially built.
+This can happen under two circumstances:
+One process accesses the database
+while another process is rebuilding it,
+or the process rebuilding the database dies
+(due to being killed or a system crash)
+before completing the rebuild.
+.pp
+Sendmail has two techniques to try to relieve these problems.
+First, it ignores interrupts while rebuilding the database;
+this avoids the problem of someone aborting the process
+leaving a partially rebuilt database.
+Second,
+at the end of the rebuild
+it adds an alias of the form
+.(b
+@: @
+.)b
+(which is not normally legal).
+Before
+.i sendmail
+will access the database,
+it checks to insure that this entry exists\**.
+.(f
+\**The
+.q a
+option is required in the configuration
+for this action to occur.
+This should normally be specified.
+.)f
+.sh 3 "List owners"
+.pp
+If an error occurs on sending to a certain address,
+say
+.q \fIx\fP ,
+.i sendmail
+will look for an alias
+of the form
+.q owner-\fIx\fP
+to receive the errors.
+This is typically useful
+for a mailing list
+where the submitter of the list
+has no control over the maintenance of the list itself;
+in this case the list maintainer would be the owner of the list.
+For example:
+.(b
+unix-wizards: eric@ucbarpa, wnj@monet, nosuchuser,
+	sam@matisse
+owner-unix-wizards: eric@ucbarpa
+.)b
+would cause
+.q eric@ucbarpa
+to get the error that will occur
+when someone sends to
+unix-wizards
+due to the inclusion of
+.q nosuchuser
+on the list.
+.pp
+List owners also cause the envelope sender address to be modified.
+The contents of the owner alias are used if they point to a single user,
+otherwise the name of the alias itself is used.
+For this reason, and to obey Internet conventions,
+a typical scheme would be:
+.(b
+list:	some, set, of, addresses
+list-request:	list-admin-1, list-admin-2, ...
+owner-list:	list-request
+.)b
+.sh 2 "User Information Database"
+.pp
+If you have a version of
+.i sendmail
+with the user information database
+compiled in,
+and you have specified one or more databases using the
+.b U
+option,
+the databases will be searched for a
+.i user :maildrop
+entry.
+If found, the mail will be sent to the specified address.
+.pp
+If the first token passed to user part of the
+.q local
+mailer is an at sign,
+the at sign will be stripped off
+and this step will be skipped.
+.sh 2 "Per-User Forwarding (.forward Files)"
+.pp
+As an alternative to the alias database,
+any user may put a file with the name
+.q .forward
+in his or her home directory.
+If this file exists,
+.i sendmail
+redirects mail for that user
+to the list of addresses listed in the .forward file.
+For example, if the home directory for user
+.q mckusick
+has a .forward file with contents:
+.(b
+mckusick@ernie
+kirk@calder
+.)b
+then any mail arriving for
+.q mckusick
+will be redirected to the specified accounts.
+.pp
+Actually, the configuration file defines a sequence of filenames to check.
+By default, this is the user's .forward file,
+but can be defined to be more generally using the
+.b J
+option.
+If you change this,
+you will have to inform your user base of the change;
+\&.forward is pretty well incorporated into the collective subconscious.
+.sh 2 "Special Header Lines"
+.pp
+Several header lines have special interpretations
+defined by the configuration file.
+Others have interpretations built into
+.i sendmail
+that cannot be changed without changing the code.
+These builtins are described here.
+.sh 3 "Return-Receipt-To:"
+.pp
+If this header is sent,
+a message will be sent to any specified addresses
+when the final delivery is complete,
+that is,
+when successfully delivered to a mailer with the
+.b l
+flag (local delivery) set in the mailer descriptor\**.
+.(f
+\**Some sites disable this header,
+and other (non-\c
+.i sendmail )
+systems do not implement it.
+Do not assume that a failure to get a return receipt
+means that the mail did not arrive.
+Also, do not assume that getting a return receipt
+means that the mail has been read;
+it just means that the message has been delivered
+to the recipient's mailbox.
+.)f
+This header can be disabled with the
+.q noreceipts
+privacy flag.
+.sh 3 "Errors-To:"
+.pp
+If errors occur anywhere during processing,
+this header will cause error messages to go to
+the listed addresses.
+This is intended for mailing lists.
+.pp
+The Errors-To: header was created in the bad old days
+when UUCP didn't understand the distinction between an envelope and a header;
+this was a hack to provide what should now be passed
+as the envelope sender address.
+It should go away.
+It is only used if the
+.b l
+option is set.
+.sh 3 "Apparently-To:"
+.pp
+If a message comes in with no recipients listed in the message
+(in a To:, Cc:, or Bcc: line)
+then
+.i sendmail
+will add an
+.q "Apparently-To:"
+header line for any recipients it is aware of.
+This is not put in as a standard recipient line
+to warn any recipients that the list is not complete.
+.pp
+At least one recipient line is required under RFC 822.
+.sh 2 "IDENT Protocol Support"
+.pp
+.i Sendmail
+supports the IDENT protocol as defined in RFC 1413.
+Although this enhances identification
+of the author of an email message
+by doing a ``call back'' to the originating system to include
+the owner of a particular TCP connection
+in the audit trail
+it is in no sense perfect;
+a determined forger can easily spoof the IDENT protocol.
+The following description is excerpted from RFC 1413:
+.ba +5
+.lp
+6.  Security Considerations
+.lp
+The information returned by this protocol is at most as trustworthy
+as the host providing it OR the organization operating the host.  For
+example, a PC in an open lab has few if any controls on it to prevent
+a user from having this protocol return any identifier the user
+wants.  Likewise, if the host has been compromised the information
+returned may be completely erroneous and misleading.
+.lp
+The Identification Protocol is not intended as an authorization or
+access control protocol.  At best, it provides some additional
+auditing information with respect to TCP connections.  At worst, it
+can provide misleading, incorrect, or maliciously incorrect
+information.
+.lp
+The use of the information returned by this protocol for other than
+auditing is strongly discouraged.  Specifically, using Identification
+Protocol information to make access control decisions - either as the
+primary method (i.e., no other checks) or as an adjunct to other
+methods may result in a weakening of normal host security.
+.lp
+An Identification server may reveal information about users,
+entities, objects or processes which might normally be considered
+private.  An Identification server provides service which is a rough
+analog of the CallerID services provided by some phone companies and
+many of the same privacy considerations and arguments that apply to
+the CallerID service apply to Identification.  If you wouldn't run a
+"finger" server due to privacy considerations you may not want to run
+this protocol.
+.ba
+.sh 1 "ARGUMENTS"
+.pp
+The complete list of arguments to
+.i sendmail
+is described in detail in Appendix A.
+Some important arguments are described here.
+.sh 2 "Queue Interval"
+.pp
+The amount of time between forking a process
+to run through the queue
+is defined by the
+.b \-q
+flag.
+If you run in mode
+.b f
+or
+.b a
+this can be relatively large,
+since it will only be relevant
+when a host that was down comes back up.
+If you run in
+.b q
+mode
+it should be relatively short,
+since it defines the maximum amount of time that a message
+may sit in the queue.
+.pp
+RFC 1123 section 5.3.1.1 says that this value should be at least 30 minutes
+(although that probably doesn't make sense if you use ``queue-only'' mode).
+.sh 2 "Daemon Mode"
+.pp
+If you allow incoming mail over an IPC connection,
+you should have a daemon running.
+This should be set by your
+.i /etc/rc
+file using the
+.b \-bd
+flag.
+The
+.b \-bd
+flag and the
+.b \-q
+flag may be combined in one call:
+.(b
+/usr/\*(SD/sendmail \-bd \-q30m
+.)b
+.sh 2 "Forcing the Queue"
+.pp
+In some cases you may find that the queue has gotten clogged for some reason.
+You can force a queue run
+using the
+.b \-q
+flag (with no value).
+It is entertaining to use the
+.b \-v
+flag (verbose)
+when this is done to watch what happens:
+.(b
+/usr/\*(SD/sendmail \-q \-v
+.)b
+.pp
+You can also limit the jobs to those with a particular queue identifier,
+sender, or recipient
+using one of the queue modifiers.
+For example,
+.q \-qRberkeley
+restricts the queue run to jobs that have the string
+.q berkeley
+somewhere in one of the recipient addresses.
+Similarly,
+.q \-qSstring
+limits the run to particular senders and
+.q \-qIstring
+limits it to particular identifiers.
+.sh 2 "Debugging"
+.pp
+There are a fairly large number of debug flags
+built into
+.i sendmail .
+Each debug flag has a number and a level,
+where higher levels means to print out more information.
+The convention is that levels greater than nine are
+.q absurd,
+i.e.,
+they print out so much information that you wouldn't normally
+want to see them except for debugging that particular piece of code.
+Debug flags are set using the
+.b \-d
+option;
+the syntax is:
+.(b
+.ta \w'debug-option  'u
+debug-flag:	\fB\-d\fP debug-list
+debug-list:	debug-option [ , debug-option ]
+debug-option:	debug-range [ . debug-level ]
+debug-range:	integer | integer \- integer
+debug-level:	integer
+.)b
+where spaces are for reading ease only.
+For example,
+.(b
+\-d12	Set flag 12 to level 1
+\-d12.3	Set flag 12 to level 3
+\-d3-17	Set flags 3 through 17 to level 1
+\-d3-17.4	Set flags 3 through 17 to level 4
+.)b
+For a complete list of the available debug flags
+you will have to look at the code
+(they are too dynamic to keep this documentation up to date).
+.sh 2 "Trying a Different Configuration File"
+.pp
+An alternative configuration file
+can be specified using the
+.b \-C
+flag; for example,
+.(b
+/usr/\*(SD/sendmail \-Ctest.cf
+.)b
+uses the configuration file
+.i test.cf
+instead of the default
+.i /etc/sendmail.cf.
+If the
+.b \-C
+flag has no value
+it defaults to
+.i sendmail.cf
+in the current directory.
+.sh 2 "Changing the Values of Options"
+.pp
+Options can be overridden using the
+.b \-o
+flag.
+For example,
+.(b
+/usr/\*(SD/sendmail \-oT2m
+.)b
+sets the
+.b T
+(timeout) option to two minutes
+for this run only.
+.pp
+Some options have security implications.
+Sendmail allows you to set these,
+but refuses to run as root thereafter.
+.sh 2 "Logging Traffic"
+.pp
+Many SMTP implementations do not fully implement the protocol.
+For example, some personal computer based SMTPs
+do not understand continuation lines in reply codes.
+These can be very hard to trace.
+If you suspect such a problem, you can set traffic logging using the
+.b \-X
+flag.
+For example,
+.(b
+/usr/\*(SD/sendmail \-X /tmp/traffic -bd
+.)b
+will log all traffic in the file
+.i /tmp/traffic .
+.pp
+This logs a lot of data very quickly and should never be used
+during normal operations.
+After starting up such a daemon,
+force the errant implementation to send a message to your host.
+All message traffic in and out of
+.i sendmail ,
+including the incoming SMTP traffic,
+will be logged in this file.
+.sh 2 "Dumping State"
+.pp
+You can ask
+.i sendmail
+to log a dump of the open files
+and the connection cache
+by sending it a
+.sm SIGUSR1
+signal.
+The results are logged at
+.sm LOG_DEBUG
+priority.
+.sh 1 "TUNING"
+.pp
+There are a number of configuration parameters
+you may want to change,
+depending on the requirements of your site.
+Most of these are set
+using an option in the configuration file.
+For example,
+the line
+.q OT5d
+sets option
+.q T
+to the value
+.q 5d
+(five days).
+.pp
+Most of these options have appropriate defaults for most sites.
+However,
+sites having very high mail loads may find they need to tune them
+as appropriate for their mail load.
+In particular,
+sites experiencing a large number of small messages,
+many of which are delivered to many recipients,
+may find that they need to adjust the parameters
+dealing with queue priorities.
+.sh 2 "Timeouts"
+.pp
+All time intervals are set
+using a scaled syntax.
+For example,
+.q 10m
+represents ten minutes, whereas
+.q 2h30m
+represents two and a half hours.
+The full set of scales is:
+.(b
+.ta 4n
+s	seconds
+m	minutes
+h	hours
+d	days
+w	weeks
+.)b
+.sh 3 "Queue interval"
+.pp
+The argument to the
+.b \-q
+flag
+specifies how often a sub-daemon will run the queue.
+This is typically set to between fifteen minutes
+and one hour.
+RFC 1123 section 5.3.1.1 recommends that this be at least 30 minutes.
+.sh 3 "Read timeouts"
+.pp
+It is possible to time out when reading the standard input
+or when reading from a remote SMTP server.
+These timeouts are set using the
+.b r
+option in the configuration file.
+The argument is a list of
+.i keyword=value
+pairs.
+The recognized keywords, their default values, and the minimum values
+allowed by RFC 1123 section 5.3.2 are:
+.nr ii 1i
+.ip initial
+The wait for the initial 220 greeting message
+[5m, 5m].
+.ip helo
+The wait for a reply from a HELO or EHLO command
+[5m, unspecified].
+This may require a host name lookup, so
+five minutes is probably a reasonable minimum.
+.ip mail\(dg
+The wait for a reply from a MAIL command
+[10m, 5m].
+.ip rcpt\(dg
+The wait for a reply from a RCPT command
+[1h, 5m].
+This should be long
+because it could be pointing at a list
+that takes a long time to expand.
+.ip datainit\(dg
+The wait for a reply from a DATA command
+[5m, 2m].
+.ip datablock\(dg
+The wait for reading a data block
+(that is, the body of the message).
+[1h, 3m].
+This should be long because it also applies to programs
+piping input to
+.i sendmail
+which have no guarantee of promptness.
+.ip datafinal\(dg
+The wait for a reply from the dot terminating a message.
+[1h, 10m].
+If this is shorter than the time actually needed
+for the receiver to deliver the message,
+duplicates will be generated.
+This is discussed in RFC 1047.
+.ip rset
+The wait for a reply from a RSET command
+[5m, unspecified].
+.ip quit
+The wait for a reply from a QUIT command
+[2m, unspecified].
+.ip misc
+The wait for a reply from miscellaneous (but short) commands
+such as NOOP (no-operation) and VERB (go into verbose mode).
+[2m, unspecified].
+.ip command\(dg
+In server SMTP,
+the time to wait for another command.
+[1h, 5m].
+.ip ident
+The timeout waiting for a reply to an IDENT query
+[30s, unspecified].
+.lp
+For compatibility with old configuration files,
+if no ``keyword='' is specified,
+all the timeouts marked with \(dg are set to the indicated value.
+.pp
+Many of the RFC 1123 minimum values
+may well be too short.
+.i Sendmail
+was designed to the RFC 822 protocols,
+which did not specify read timeouts;
+hence,
+.i sendmail
+does not guarantee to reply to messages promptly.
+In particular, a
+.q RCPT
+command specifying a mailing list
+will expand and verify the entire list;
+a large list on a slow system
+may take more than five minutes\**.
+.(f
+\**This verification includes looking up every address
+with the name server;
+this involves network delays,
+and can in some cases can be considerable.
+.)f
+I recommend a one hour timeout \*-
+since this failure is rare,
+a long timeout is not onerous
+and may ultimately help reduce network load.
+.pp
+For example, the line:
+.(b
+Orcommand=25m,datablock=3h
+.)b
+sets the server SMTP command timeout to 25 minutes
+and the input data block timeout to three hours.
+.sh 3 "Message timeouts"
+.pp
+After sitting in the queue for a few days,
+a message will time out.
+This is to insure that at least the sender is aware
+of the inability to send a message.
+The timeout is typically set to three days.
+This timeout is set using the
+.b T
+option in the configuration file.
+.pp
+The time of submission is set in the queue,
+rather than the amount of time left until timeout.
+As a result, you can flush messages that have been hanging
+for a short period
+by running the queue
+with a short message timeout.
+For example,
+.(b
+/usr/\*(SD/sendmail \-oT1d \-q
+.)b
+will run the queue
+and flush anything that is one day old.
+.pp
+Since this option is global,
+and since you can not
+.i "a priori"
+know how long another host outside your domain will be down,
+a five day timeout is recommended.
+This allows a recipient to fix the problem even if it occurs
+at the beginning of a long weekend.
+RFC 1123 section 5.3.1.1 says that this parameter
+should be ``at least 4\-5 days''.
+.pp
+The
+.b T
+option can also take a second timeout indicating a time after which
+a warning message should be sent;
+the two timeouts are separated by a slash.
+For example, the value
+.(b
+5d/4h
+.)b
+causes email to fail after five days,
+but a warning message will be sent after four hours.
+This should be large enough that the message will have been tried
+several times.
+.sh 2 "Forking During Queue Runs"
+.pp
+By setting the
+.b Y
+option,
+.i sendmail
+will fork before each individual message
+while running the queue.
+This will prevent
+.i sendmail
+from consuming large amounts of memory,
+so it may be useful in memory-poor environments.
+However, if the
+.b Y
+option is not set,
+.i sendmail
+will keep track of hosts that are down during a queue run,
+which can improve performance dramatically.
+.pp
+If the
+.b Y
+option is set,
+.i sendmail
+can not use connection caching.
+.sh 2 "Queue Priorities"
+.pp
+Every message is assigned a priority when it is first instantiated,
+consisting of the message size (in bytes)
+offset by the message class times the
+.q "work class factor"
+and the number of recipients times the
+.q "work recipient factor."
+The priority is used to order the queue.
+Higher numbers for the priority mean that the message will be processed later
+when running the queue.
+.pp
+The message size is included so that large messages are penalized
+relative to small messages.
+The message class allows users to send
+.q "high priority"
+messages by including a
+.q Precedence:
+field in their message;
+the value of this field is looked up in the
+.b P
+lines of the configuration file.
+Since the number of recipients affects the amount of load a message presents
+to the system,
+this is also included into the priority.
+.pp
+The recipient and class factors
+can be set in the configuration file using the
+.b y
+and
+.b z
+options respectively.
+They default to 30000 (for the recipient factor)
+and 1800
+(for the class factor).
+The initial priority is:
+.EQ
+pri = msgsize - (class times bold z) + (nrcpt times bold y)
+.EN
+(Remember, higher values for this parameter actually mean
+that the job will be treated with lower priority.)
+.pp
+The priority of a job can also be adjusted each time it is processed
+(that is, each time an attempt is made to deliver it)
+using the
+.q "work time factor,"
+set by the
+.b Z
+option.
+This is added to the priority,
+so it normally decreases the precedence of the job,
+on the grounds that jobs that have failed many times
+will tend to fail again in the future.
+The
+.b Z
+option defaults to 90000.
+.sh 2 "Load Limiting"
+.pp
+.i Sendmail
+can be asked to queue (but not deliver)
+mail if the system load average gets too high
+using the
+.b x
+option.
+When the load average exceeds the value of the
+.b x
+option,
+the delivery mode is set to
+.b q
+(queue only)
+if the
+.i "Queue Factor"
+(\c
+.b q
+option)
+divided by the difference in the current load average and the
+.b x
+option
+plus one
+exceeds the priority of the message \(em
+that is, the message is queued iff:
+.EQ
+pri > { bold q } over { LA - { bold x } + 1 }
+.EN
+The
+.b q
+option defaults to 600000,
+so each point of load average is worth 600000
+priority points
+(as described above).
+.pp
+For drastic cases,
+the
+.b X
+option defines a load average at which
+.i sendmail
+will refuse
+to accept network connections.
+Locally generated mail
+(including incoming UUCP mail)
+is still accepted.
+.sh 2 "Delivery Mode"
+.pp
+There are a number of delivery modes that
+.i sendmail
+can operate in,
+set by the
+.q d
+configuration option.
+These modes
+specify how quickly mail will be delivered.
+Legal modes are:
+.(b
+.ta 4n
+i	deliver interactively (synchronously)
+b	deliver in background (asynchronously)
+q	queue only (don't deliver)
+.)b
+There are tradeoffs.
+Mode
+.q i
+passes the maximum amount of information to the sender,
+but is hardly ever necessary.
+Mode
+.q q
+puts the minimum load on your machine,
+but means that delivery may be delayed for up to the queue interval.
+Mode
+.q b
+is probably a good compromise.
+However, this mode can cause large numbers of processes
+if you have a mailer that takes a long time to deliver a message.
+.pp
+If you run in mode
+.q q
+(queue only)
+or
+.q b
+(deliver in background)
+.i sendmail
+will not expand aliases and follow .forward files
+upon initial receipt of the mail.
+This speeds up the response to RCPT commands.
+.sh 2 "Log Level"
+.pp
+The level of logging can be set for
+.i sendmail .
+The default using a standard configuration table is level 9.
+The levels are as follows:
+.nr ii 0.5i
+.ip 0
+No logging.
+.ip 1
+Serious system failures and potential security problems.
+.ip 2
+Lost communications (network problems) and protocol failures.
+.ip 3
+Other serious failures.
+.ip 4
+Minor failures.
+.ip 5
+Message collection statistics.
+.ip 6
+Creation of error messages,
+VRFY and EXPN commands.
+.ip 7
+Delivery failures (host or user unknown, etc.).
+.ip 8
+Successful deliveries.
+.ip 9
+Messages being deferred
+(due to a host being down, etc.).
+.ip 10
+Database expansion (alias, forward, and userdb lookups).
+.ip 15
+Automatic alias database rebuilds.
+.ip 20
+Logs attempts to run locked queue files.
+These are not errors,
+but can be useful to note if your queue appears to be clogged.
+.ip 30
+Lost locks (only if using lockf instead of flock).
+.lp
+Additionally,
+values above 64 are reserved for extremely verbose debuggging output.
+No normal site would ever set these.
+.sh 2 "File Modes"
+.pp
+There are a number of files
+that may have a number of modes.
+The modes depend on what functionality you want
+and the level of security you require.
+.sh 3 "To suid or not to suid?"
+.pp
+.i Sendmail
+can safely be made
+setuid to root.
+At the point where it is about to
+.i exec \|(2)
+a mailer,
+it checks to see if the userid is zero;
+if so,
+it resets the userid and groupid to a default
+(set by the
+.b u
+and
+.b g
+options).
+(This can be overridden
+by setting the
+.b S
+flag to the mailer
+for mailers that are trusted
+and must be called as root.)
+However,
+this will cause mail processing
+to be accounted
+(using
+.i sa \|(8))
+to root
+rather than to the user sending the mail.
+.sh 3 "Should my alias database be writable?"
+.pp
+At Berkeley
+we have the alias database
+(/etc/aliases*)
+mode 644.
+While this is not as flexible as if the database
+were more 666, it avoids potential security problems
+with a globally writable database.
+.pp
+The database that
+.i sendmail
+actually used
+is represented by the two files
+.i aliases.dir
+and
+.i aliases.pag
+(both in /etc)
+(or
+.i aliases.db
+if you are running with the new Berkeley database primitives).
+The mode on these files should match the mode
+on /etc/aliases.
+If
+.i aliases
+is writable
+and the
+DBM
+files
+(\c
+.i aliases.dir
+and
+.i aliases.pag )
+are not,
+users will be unable to reflect their desired changes
+through to the actual database.
+However,
+if
+.i aliases
+is read-only
+and the DBM files are writable,
+a slightly sophisticated user
+can arrange to steal mail anyway.
+.pp
+If your DBM files are not writable by the world
+or you do not have auto-rebuild enabled
+(with the
+.q D
+option),
+then you must be careful to reconstruct the alias database
+each time you change the text version:
+.(b
+newaliases
+.)b
+If this step is ignored or forgotten
+any intended changes will also be ignored or forgotten.
+.sh 2 "Connection Caching"
+.pp
+When processing the queue,
+.i sendmail
+will try to keep the last few open connections open
+to avoid startup and shutdown costs.
+This only applies to IPC connections.
+.pp
+When trying to open a connection
+the cache is first searched.
+If an open connection is found, it is probed to see if it is still active
+by sending a
+.sm NOOP
+command.
+It is not an error if this fails;
+instead, the connection is closed and reopened.
+.pp
+Two parameters control the connection cache.
+The
+.b k
+option defines the number of simultaneous open connections
+that will be permitted.
+If it is set to zero,
+connections will be closed as quickly as possible.
+The default is one.
+This should be set as appropriate for your system size;
+it will limit the amount of system resources that
+.i sendmail
+will use during queue runs.
+.pp
+The
+.b K
+option specifies the maximum time that any cached connection
+will be permitted to idle.
+When the idle time exceeds this value
+the connection is closed.
+This number should be small
+(under ten minutes)
+to prevent you from grabbing too many resources
+from other hosts.
+The default is five minutes.
+.sh 2 "Name Server Access"
+.pp
+If your system supports the name server,
+then the probability is that
+.i sendmail
+will be using it regardless of how you configure
+.i sendmail .
+In particular, the system routine
+.i gethostbyname (3)
+is used to look up host names,
+and most vendor versions try some combination of DNS, NIS,
+and file lookup in /etc/hosts.
+.pp
+However, if you do not have a nameserver configured at all,
+such as at a UUCP-only site,
+.i sendmail
+will get a
+.q "connection refused"
+message when it tries to connect to the name server
+(either indirectly by calling
+.i gethostbyname
+or directly by looking up MX records).
+If the
+.b I
+option is set,
+.i sendmail
+will interpret this to mean a temporary failure
+and will queue the mail for later processing;
+otherwise, it ignores the name server data.
+If your name server is running properly,
+the setting of this option is not relevant;
+however, it is important that it be set properly
+to make error handling work properly.
+.pp
+This option also allows you to tweak name server options.
+The command line takes a series of flags as documented in
+.i resolver (3)
+(with the leading
+.q RES_
+deleted).
+Each can be preceded by an optional `+' or `\(mi'.
+For example, the line
+.(b
+OITrue +AAONLY \(miDNSRCH
+.)b
+turns on the AAONLY (accept authoritative answers only)
+and turns off the DNSRCH (search the domain path) options.
+Most resolver libraries default DNSRCH, DEFNAMES, and RECURSE
+flags on and all others off.
+Note the use of the initial ``True'' \*-
+this is for compatibility with previous versions of
+.i sendmail ,
+but is not otherwise necessary.
+.pp
+Version level 1 configurations
+turn DNSRCH and DEFNAMES off when doing delivery lookups,
+but leave them on everywhere else.
+Version 8 of
+.i sendmail
+ignores them when doing canonification lookups
+(that is, when using $[ ... $]),
+and always does the search.
+If you don't want to do automatic name extension,
+don't call $[ ... $].
+.pp
+The search rules for $[ ... $] are somewhat different than usual.
+If the name (that is, the ``...'')
+has at least one dot, it always tries the unmodified name first.
+If that fails, it tries the reduced search path,
+and lastly tries the unmodified name
+(but only for names without a dot,
+since names with a dot have already been tried).
+This allows names such as
+``utc.CS''
+to match the site in Czechoslovakia
+rather than the site in your local Computer Science department.
+It also prefers A and CNAME records over MX records \*-
+that is, if it finds an MX record it makes note of it,
+but keeps looking.
+This way, if you have a wildcard MX record matching your domain,
+it will not assume that all names match.
+.sh 2 "Moving the Per-User Forward Files"
+.pp
+Some sites mount each user's home directory
+from a local disk on their workstation,
+so that local access is fast.
+However, the result is that .forward file lookups are slow.
+In some cases,
+mail can even be delivered on machines inappropriately
+because of a file server being down.
+The performance can be especially bad if you run the automounter.
+.pp
+The
+.b J
+option allows you to set a path of forward files.
+For example, the config file line
+.(b
+OJ/var/forward/$u:$z/.forward
+.)b
+would first look for a file with the same name as the user's login
+in /var/forward;
+if that is not found (or is inaccessible)
+the file
+.q \&.forward
+in the user's home directory is searched.
+A truly perverse site could also search by sender
+by using $r, $s, or $f.
+.pp
+If you create a directory such as /var/forward,
+it should be mode 1777
+(that is, the sticky bit should be set).
+Users should create the files mode 644.
+.sh 2 "Free Space"
+.pp
+On systems that have the
+.i statfs (2)
+system call,
+you can specify a minimum number of free blocks on the queue filesystem
+using the
+.b b
+option.
+If there are fewer than the indicated number of blocks free
+on the filesystem on which the queue is mounted
+the SMTP server will reject mail
+with the
+452 error code.
+This invites the SMTP client to try again later.
+.pp
+Beware of setting this option too high;
+it can cause rejection of email
+when that mail would be processed without difficulty.
+.pp
+This option can also specify an advertised
+.q "maximum message size"
+for hosts that speak ESMTP.
+.sh 2 "Privacy Flags"
+.pp
+The
+.b p
+option allows you to set certain
+``privacy''
+flags.
+Actually, many of them don't give you any extra privacy,
+rather just insisting that client SMTP servers
+use the HELO command
+before using certain commands.
+.pp
+The option takes a series of flag names;
+the final privacy is the inclusive or of those flags.
+For example:
+.(b
+Op needmailhelo, noexpn
+.)b
+insists that the HELO or EHLO command be used before a MAIL command is accepted
+and disables the EXPN command.
+.pp
+The
+.q restrictmailq
+option restricts printing the queue to the group that owns the queue directory.
+It is absurd to set this if you don't also protect the logs.
+.pp
+The
+.q restrictqrun
+option restricts people running the queue
+(that is, using the
+.b \-q
+command line flag)
+to root and the owner of the queue directory.
+.sh 2 "Send to Me Too"
+.pp
+Normally,
+.i sendmail
+deletes the (envelope) sender from any list expansions.
+For example, if
+.q matt
+sends to a list that contains
+.q matt
+as one of the members he won't get a copy of the message.
+If the
+.b \-m
+(me too)
+command line flag, or if the
+.b m
+option is set in the configuration file,
+this behaviour is supressed.
+Some sites like to run the
+.sm SMTP
+daemon with
+.b \-m .
+.sh 1 "THE WHOLE SCOOP ON THE CONFIGURATION FILE"
+.pp
+This section describes the configuration file
+in detail,
+including hints on how to write one of your own
+if you have to.
+.pp
+There is one point that should be made clear immediately:
+the syntax of the configuration file
+is designed to be reasonably easy to parse,
+since this is done every time
+.i sendmail
+starts up,
+rather than easy for a human to read or write.
+On the
+.q "future project"
+list is a
+configuration-file compiler.
+.pp
+An overview of the configuration file
+is given first,
+followed by details of the semantics.
+.sh 2 "Configuration File Lines"
+.pp
+The configuration file is organized as a series of lines,
+each of which begins with a single character
+defining the semantics for the rest of the line.
+Lines beginning with a space or a tab
+are continuation lines
+(although the semantics are not well defined in many places).
+Blank lines and lines beginning with a sharp symbol
+(`#')
+are comments.
+.sh 3 "R and S \*- rewriting rules"
+.pp
+The core of address parsing
+are the rewriting rules.
+These are an ordered production system.
+.i Sendmail
+scans through the set of rewriting rules
+looking for a match on the left hand side
+(LHS)
+of the rule.
+When a rule matches,
+the address is replaced by the right hand side
+(RHS)
+of the rule.
+.pp
+There are several sets of rewriting rules.
+Some of the rewriting sets are used internally
+and must have specific semantics.
+Other rewriting sets
+do not have specifically assigned semantics,
+and may be referenced by the mailer definitions
+or by other rewriting sets.
+.pp
+The syntax of these two commands are:
+.(b F
+.b S \c
+.i n
+.)b
+Sets the current ruleset being collected to
+.i n .
+If you begin a ruleset more than once
+it deletes the old definition.
+.(b F
+.b R \c
+.i lhs
+.i rhs
+.i comments
+.)b
+The
+fields must be separated
+by at least one tab character;
+there may be embedded spaces
+in the fields.
+The
+.i lhs
+is a pattern that is applied to the input.
+If it matches,
+the input is rewritten to the
+.i rhs .
+The
+.i comments
+are ignored.
+.pp
+Macro expansions of the form
+.b $ \c
+.i x
+are performed when the configuration file is read.
+Expansions of the form
+.b $& \c
+.i x
+are performed at run time using a somewhat less general algorithm.
+This for is intended only for referencing internally defined macros
+such as
+.b $h
+that are changed at runtime.
+.sh 4 "The left hand side"
+.pp
+The left hand side of rewriting rules contains a pattern.
+Normal words are simply matched directly.
+Metasyntax is introduced using a dollar sign.
+The metasymbols are:
+.(b
+.ta \w'\fB$=\fP\fIx\fP  'u
+\fB$*\fP	Match zero or more tokens
+\fB$+\fP	Match one or more tokens
+\fB$\-\fP	Match exactly one token
+\fB$=\fP\fIx\fP	Match any phrase in class \fIx\fP
+\fB$~\fP\fIx\fP	Match any word not in class \fIx\fP
+.)b
+If any of these match,
+they are assigned to the symbol
+.b $ \c
+.i n
+for replacement on the right hand side,
+where
+.i n
+is the index in the LHS.
+For example,
+if the LHS:
+.(b
+$\-:$+
+.)b
+is applied to the input:
+.(b
+UCBARPA:eric
+.)b
+the rule will match, and the values passed to the RHS will be:
+.(b
+.ta 4n
+$1	UCBARPA
+$2	eric
+.)b
+.pp
+Additionally, the LHS can include
+.b $@
+to match zero tokens.
+This is
+.i not
+bound to a
+.b $ \c
+.i N
+on the RHS, and is normally only used when it stands alone
+in order to match the null input.
+.sh 4 "The right hand side"
+.pp
+When the left hand side of a rewriting rule matches,
+the input is deleted and replaced by the right hand side.
+Tokens are copied directly from the RHS
+unless they begin with a dollar sign.
+Metasymbols are:
+.(b
+.ta \w'$#mailer\0\0\0'u
+\fB$\fP\fIn\fP	Substitute indefinite token \fIn\fP from LHS
+\fB$[\fP\fIname\fP\fB$]\fP	Canonicalize \fIname\fP
+\fB$(\fP\fImap key\fP \fB$@\fP\fIarguments\fP \fB$:\fP\fIdefault\fP \fB$)\fP
+	Generalized keyed mapping function
+\fB$>\fP\fIn\fP	\*(lqCall\*(rq ruleset \fIn\fP
+\fB$#\fP\fImailer\fP	Resolve to \fImailer\fP
+\fB$@\fP\fIhost\fP	Specify \fIhost\fP
+\fB$:\fP\fIuser\fP	Specify \fIuser\fP
+.)b
+.pp
+The
+.b $ \c
+.i n
+syntax substitutes the corresponding value from a
+.b $+ ,
+.b $\- ,
+.b $* ,
+.b $= ,
+or
+.b $~
+match on the LHS.
+It may be used anywhere.
+.pp
+A host name enclosed between
+.b $[
+and
+.b $]
+is looked up using the
+.i gethostent \|(3)
+routines and replaced by the canonical name\**.
+.(f
+\**This is actually
+completely equivalent
+to $(host \fIhostname\fP$).
+In particular, a
+.b $:
+default can be used.
+.)f
+For example,
+.q $[csam$]
+might become
+.q lbl-csam.arpa
+and
+.q $[[128.32.130.2]$]
+would become
+.q vangogh.CS.Berkeley.EDU.
+.i Sendmail
+recognizes it's numeric IP address
+without calling the name server
+and replaces it with it's canonical name.
+.pp
+The
+.b $(
+\&...
+.b $)
+syntax is a more general form of lookup;
+it uses a named map instead of an implicit map.
+If no lookup is found, the indicated
+.i default
+is inserted;
+if no default is specified and no lookup matches,
+the value is left unchanged.
+.pp
+The
+.b $> \c
+.i n
+syntax
+causes the remainder of the line to be substituted as usual
+and then passed as the argument to ruleset
+.i n .
+The final value of ruleset
+.i n
+then becomes
+the substitution for this rule.
+.pp
+The
+.b $#
+syntax should
+.i only
+be used in ruleset zero
+or a subroutine of ruleset zero.
+It causes evaluation of the ruleset to terminate immediately,
+and signals to
+.i sendmail
+that the address has completely resolved.
+The complete syntax is:
+.(b
+\fB$#\fP\fImailer\fP \fB$@\fP\fIhost\fP \fB$:\fP\fIuser\fP
+.)b
+This specifies the
+{mailer, host, user}
+3-tuple necessary to direct the mailer.
+If the mailer is local
+the host part may be omitted\**.
+.(f
+\**You may want to use it for special
+.q "per user"
+extensions.
+For example, at CMU you can send email to
+.q jgm+foo ;
+the part after the plus sign
+is not part of the user name,
+and is passed to the local mailer for local use.
+.)f
+The
+.i mailer
+must be a single word,
+but the
+.i host
+and
+.i user
+may be multi-part.
+If the
+.i mailer
+is the builtin IPC mailer,
+the
+.i host
+may be a colon-separated list of hosts
+that are searched in order for the first working address
+(exactly like MX records).
+The
+.i user
+is later rewritten by the mailer-specific envelope rewriting set
+and assigned to the
+.b $u
+macro.
+As a special case, if the value to
+.b $#
+is
+.q local
+and the first character of the
+.b $:
+value is
+.q @ ,
+the
+.q @
+is stripped off, and a flag is set in the address descriptor
+that causes sendmail to not do ruleset 5 processing.
+.pp
+Normally, a rule that matches is retried,
+that is,
+the rule loops until it fails.
+A RHS may also be preceded by a
+.b $@
+or a
+.b $:
+to change this behavior.
+A
+.b $@
+prefix causes the ruleset to return with the remainder of the RHS
+as the value.
+A
+.b $:
+prefix causes the rule to terminate immediately,
+but the ruleset to continue;
+this can be used to avoid continued application of a rule.
+The prefix is stripped before continuing.
+.pp
+The
+.b $@
+and
+.b $:
+prefixes may precede a
+.b $>
+spec;
+for example:
+.(b
+.ta 8n
+R$+	$: $>7 $1
+.)b
+matches anything,
+passes that to ruleset seven,
+and continues;
+the
+.b $:
+is necessary to avoid an infinite loop.
+.pp
+Substitution occurs in the order described,
+that is,
+parameters from the LHS are substituted,
+hostnames are canonicalized,
+.q subroutines
+are called,
+and finally
+.b $# ,
+.b $@ ,
+and
+.b $:
+are processed.
+.sh 4 "Semantics of rewriting rule sets"
+.pp
+There are five rewriting sets
+that have specific semantics.
+These are related as depicted by figure 2.
+.(z
+.hl
+.ie n \{\
+.(c
+                    +---+
+                 -->| 0 |-->resolved address
+                /   +---+
+               /            +---+   +---+
+              /        ---->| 1 |-->| S |--
+       +---+ / +---+  /     +---+   +---+  \e    +---+
+addr-->| 3 |-->| D |--                      --->| 4 |-->msg
+       +---+   +---+  \e     +---+   +---+  /    +---+
+                        --->| 2 |-->| R |--
+                            +---+   +---+
+.)c
+
+.\}
+.el .ie !"\*(.T"" \
+\{\
+.PS
+boxwid = 0.3i
+boxht = 0.3i
+movewid = 0.3i
+moveht = 0.3i
+linewid = 0.3i
+lineht = 0.3i
+
+	box invis "addr"; arrow
+Box3:	box "3"
+A1:	arrow
+BoxD:	box "D"; line; L1: Here
+C:	[
+	C1:	arrow; box "1"; arrow; box "S"; line; E1: Here
+		move to C1 down 0.5; right
+	C2:	arrow; box "2"; arrow; box "R"; line; E2: Here
+	] with .w at L1 + (0.5, 0)
+	move to C.e right 0.5
+L4:	arrow; box "4"; arrow; box invis "msg"
+	line from L1 to C.C1
+	line from L1 to C.C2
+	line from C.E1 to L4
+	line from C.E2 to L4
+	move to BoxD.n up 0.6; right
+Box0:	arrow; box "0"
+	arrow; box invis "resolved address" width 1.3
+	line from 1/3 of the way between A1 and BoxD.w to Box0
+.PE
+.\}
+.el .sp 2i
+.ce
+Figure 2 \*- Rewriting set semantics
+.(c
+D \*- sender domain addition
+S \*- mailer-specific sender rewriting
+R \*- mailer-specific recipient rewriting
+.)c
+.hl
+.)z
+.pp
+Ruleset three
+should turn the address into
+.q "canonical form."
+This form should have the basic syntax:
+.(b
+local-part@host-domain-spec
+.)b
+If no
+.q @
+sign is specified,
+then the
+host-domain-spec
+.i may
+be appended from the
+sender address
+(if the
+.b C
+flag is set in the mailer definition
+corresponding to the
+.i sending
+mailer).
+Ruleset three
+is applied by
+.i sendmail
+before doing anything with any address.
+.pp
+Ruleset zero
+is applied after ruleset three
+to addresses that are going to actually specify recipients.
+It must resolve to a
+.i "{mailer, host, user}"
+triple.
+The
+.i mailer
+must be defined in the mailer definitions
+from the configuration file.
+The
+.i host
+is defined into the
+.b $h
+macro
+for use in the argv expansion of the specified mailer.
+.pp
+Rulesets one and two
+are applied to all sender and recipient addresses respectively.
+They are applied before any specification
+in the mailer definition.
+They must never resolve.
+.pp
+Ruleset four is applied to all addresses
+in the message.
+It is typically used
+to translate internal to external form.
+.sh 4 "IPC mailers"
+.pp
+Some special processing occurs
+if the ruleset zero resolves to an IPC mailer
+(that is, a mailer that has
+.q [IPC]
+listed as the Path in the
+.b M
+configuration line.
+The host name passed after
+.q $@
+has MX expansion performed;
+this looks the name up in DNS to find alternate delivery sites.
+.pp
+The host name can also be provided as a dotted quad in square brackets;
+for example:
+.(b
+[128.32.149.78]
+.)b
+This causes direct conversion of the numeric value
+to a TCP/IP host address.
+.pp
+The host name passed in after the
+.q $@
+may also be a colon-separated list of hosts.
+Each is separately MX expanded and the results are concatenated
+to make (essentially) one long MX list.
+The intent here is to create
+.q fake
+MX records that are not published in DNS
+for private internal networks.
+.pp
+As a final special case, the host name can be passed in
+as a text string
+in square brackets:
+.(b
+[ucbvax.berkeley.edu]
+.)b
+This form avoids the MX mapping.
+.b N.B.:
+This is intended only for situations where you have a network firewall,
+so that your MX record points to a gateway machine;
+this machine could then do direct delivery to machines
+within your local domain.
+Use of this feature directly violates RFC 1123 section 5.3.5:
+it should not be used lightly.
+.sh 3 "D \*- define macro"
+.pp
+Macros are named with a single character.
+These may be selected from the entire ASCII set,
+but user-defined macros
+should be selected from the set of upper case letters only.
+Lower case letters
+and special symbols
+are used internally.
+.pp
+The syntax for macro definitions is:
+.(b F
+.b D \c
+.i x\|val
+.)b
+where
+.i x
+is the name of the macro
+and
+.i val
+is the value it should have.
+.pp
+Macros are interpolated
+using the construct
+.b $ \c
+.i x ,
+where
+.i x
+is the name of the macro to be interpolated.
+This interpolation is done when the configuration file is read,
+except in
+.b M
+lines.
+The special construct
+.b $& \c
+.i x
+can be used in
+.b R
+lines to get deferred interpolation.
+.pp
+Conditionals can be specified using the syntax:
+.(b
+$?x text1 $| text2 $.
+.)b
+This interpolates
+.i text1
+if the macro
+.b $x
+is set,
+and
+.i text2
+otherwise.
+The
+.q else
+(\c
+.b $| )
+clause may be omitted.
+.pp
+Lower case macro names are reserved to have
+special semantics,
+used to pass information in or out of
+.i sendmail ,
+and special characters are reserved to
+provide conditionals, etc.
+Upper case names
+(that is,
+.b $A
+through
+.b $Z )
+are specifically reserved for configuration file authors.
+.pp
+The following macros are defined and/or used internally by
+.i sendmail
+for interpolation into argv's for mailers
+or for other contexts.
+The ones marked \(dg are information passed into sendmail\**,
+.(f
+\**As of version 8.6,
+all of these macros have reasonable defaults.
+Previous versions required that they be defined.
+.)f
+the ones marked \(dd are information passed both in and out of sendmail,
+and the unmarked macros are passed out of sendmail
+but are not otherwise used internally.
+These macros are:
+.nr ii 5n
+.ip $a
+.b "The origination date in RFC 822 format."
+.ip $b
+.b "The current date in RFC 822 format."
+.ip $c
+.b "The hop count."
+.ip $d
+.b "The current date in UNIX (ctime) format."
+.ip $e\(dg
+.b "The SMTP entry message."
+This is printed out when SMTP starts up.
+The first word must be the
+.b $j
+macro as specified by RFC821.
+Defaults to
+.q "$j Sendmail $v ready at $b" .
+Commonly redefined to include the configuration version number, e.g.,
+.q "$j Sendmail $v/$Z ready at $b"
+.ip $f
+.b "The sender (from) address."
+.ip $g
+.b "The sender address relative to the recipient."
+.ip $h
+.b "The recipient host."
+.ip $i
+.b "The queue id."
+.ip $j\(dd
+.b "The \*(lqofficial\*(rq domain name for this site."
+This is fully qualified if the full qualification can be found.
+It
+.i must
+be redefined to be the fully qualified domain name
+if your system is not configured so that information can find
+it automatically.
+.ip $k
+.b "The UUCP node name (from the uname system call)."
+.ip $l\(dg
+.b "The format of the UNIX from line."
+Unless you have changed the UNIX mailbox format,
+you should not change the default,
+which is
+.q "From $g  $d" .
+.ip $m
+.b "The domain part of the \fIgethostname\fP return value."
+Under normal circumstances,
+.b $j
+is equivalent to
+.b $w.$m .
+.ip $n\(dg
+.b "The name of the daemon (for error messages)."
+Defaults to
+.q MAILER-DAEMON .
+.ip $o\(dg
+.b "The set of \*(lqoperators\*(rq in addresses."
+A list of characters
+which will be considered tokens
+and which will separate tokens
+when doing parsing.
+For example, if
+.q @
+were in the
+.b $o
+macro, then the input
+.q a@b
+would be scanned as three tokens:
+.q a,
+.q @,
+and
+.q b.
+Defaults to
+.q ".:@[]" ,
+which is the minimum set necessary to do RFC 822 parsing;
+a richer set of operators is
+.q ".:%@!/[]" ,
+which adds support for UUCP, the %-hack, and X.400 addresses.
+.ip $p
+.b "Sendmail's process id."
+.ip $q\(dg
+.b "Default format of sender address."
+The
+.b $q
+macro specifies how an address should appear in a message
+when it is defaulted.
+Defaults to
+.q "<$g>" .
+It is commonly redefined to be
+.q "$?x$x <$g>$|$g$."
+or
+.q "$g$?x ($x)$." ,
+corresponding to the following two formats:
+.(b
+Eric Allman <eric@CS.Berkeley.EDU>
+eric@CS.Berkeley.EDU (Eric Allman)
+.)b
+.i Sendmail
+properly quotes names that have special characters
+if the first form is used.
+.ip $r
+.b "Protocol used to receive the message."
+.ip $s
+.b "Sender's host name."
+.ip $t
+.b "A numeric representation of the current time."
+.ip $u
+.b "The recipient user."
+.ip $v
+.b "The version number of \fIsendmail\fP."
+.ip $w\(dd
+.b "The hostname of this site."
+.pp
+The
+.b $w
+macro is set to the root name of this host (but see below for caveats).
+.ip $x
+.b "The full name of the sender."
+.ip $z
+.b "The home directory of the recipient."
+.ip $_
+.b "The validated sender address."
+.pp
+There are three types of dates that can be used.
+The
+.b $a
+and
+.b $b
+macros are in RFC 822 format;
+.b $a
+is the time as extracted from the
+.q Date:
+line of the message
+(if there was one),
+and
+.b $b
+is the current date and time
+(used for postmarks).
+If no
+.q Date:
+line is found in the incoming message,
+.b $a
+is set to the current time also.
+The
+.b $d
+macro is equivalent to the
+.b $b
+macro in UNIX
+(ctime)
+format.
+.pp
+The macros
+.b $w ,
+.b $j ,
+and
+.b $m
+are set to the identity of this host.
+.i Sendmail
+tries to find the fully qualified name of the host
+if at all possible;
+it does this by calling
+.i gethostname (2)
+to get the current hostname
+and then passing that to
+.i gethostbyname (3)
+which is supposed to return the canonical version of that host name.\**
+.(f
+\**For example, on some systems
+.i gethostname
+might return
+.q foo
+which would be mapped to
+.q foo.bar.com
+by
+.i gethostbyname .
+.)f
+Assuming this is successful,
+.b $j
+is set to the fully qualified name
+and
+.b $m
+is set to the domain part of the name
+(everything after the first dot).
+The
+.b $w
+macro is set to the first word
+(everything before the first dot)
+if you have a level 5 or higher configuration file;
+otherwise, it is set to the same value as
+.b $j .
+If the canonification is not successful,
+it is imperative that the config file set
+.b $j
+to the fully qualified domain name\**.
+.(f
+\**Older versions of sendmail didn't pre-define
+.b $j
+at all, so up until 8.6,
+config files
+.i always
+had to define
+.b $j .
+.)f
+.pp
+The
+.b $f
+macro is the id of the sender
+as originally determined;
+when mailing to a specific host
+the
+.b $g
+macro is set to the address of the sender
+.ul
+relative to the recipient.
+For example,
+if I send to
+.q bollard@matisse.CS.Berkeley.EDU
+from the machine
+.q vangogh.CS.Berkeley.EDU
+the
+.b $f
+macro will be
+.q eric
+and the
+.b $g
+macro will be
+.q eric@vangogh.CS.Berkeley.EDU.
+.pp
+The
+.b $x
+macro is set to the full name of the sender.
+This can be determined in several ways.
+It can be passed as flag to
+.i sendmail .
+The second choice is the value of the
+.q Full-name:
+line in the header if it exists,
+and the third choice is the comment field
+of a
+.q From:
+line.
+If all of these fail,
+and if the message is being originated locally,
+the full name is looked up in the
+.i /etc/passwd
+file.
+.pp
+When sending,
+the
+.b $h ,
+.b $u ,
+and
+.b $z
+macros get set to the host, user, and home directory
+(if local)
+of the recipient.
+The first two are set from the
+.b $@
+and
+.b $:
+part of the rewriting rules, respectively.
+.pp
+The
+.b $p
+and
+.b $t
+macros are used to create unique strings
+(e.g., for the
+.q Message-Id:
+field).
+The
+.b $i
+macro is set to the queue id on this host;
+if put into the timestamp line
+it can be extremely useful for tracking messages.
+The
+.b $v
+macro is set to be the version number of
+.i sendmail ;
+this is normally put in timestamps
+and has been proven extremely useful for debugging.
+.pp
+The
+.b $c
+field is set to the
+.q "hop count,"
+i.e., the number of times this message has been processed.
+This can be determined
+by the
+.b \-h
+flag on the command line
+or by counting the timestamps in the message.
+.pp
+The
+.b $r
+and
+.b $s
+fields are set to the protocol used to communicate with
+.i sendmail
+and the sending hostname.
+.pp
+The
+.b $_
+is set to a validated sender host name.
+If the sender is running an RFC 1413 compliant IDENT server,
+it will include the user name on that host.
+.sh 3 "C and F \*- define classes"
+.pp
+Classes of phrases may be defined
+to match on the left hand side of rewriting rules,
+where a
+.q phrase
+is a sequence of characters that do not contain space characters.
+For example
+a class of all local names for this site
+might be created
+so that attempts to send to oneself
+can be eliminated.
+These can either be defined directly in the configuration file
+or read in from another file.
+Classes may be given names
+from the set of upper case letters.
+Lower case letters and special characters
+are reserved for system use.
+.pp
+The syntax is:
+.(b F
+.b C \c
+.i c\|phrase1
+.i phrase2...
+.br
+.b F \c
+.i c\|file
+.)b
+The first form defines the class
+.i c
+to match any of the named words.
+It is permissible to split them among multiple lines;
+for example, the two forms:
+.(b
+CHmonet ucbmonet
+.)b
+and
+.(b
+CHmonet
+CHucbmonet
+.)b
+are equivalent.
+The second form
+reads the elements of the class
+.i c
+from the named
+.i file .
+.pp
+The
+.b $~
+(match entries not in class)
+only matches a single word;
+multi-word entries in the class are ignored in this context.
+.pp
+The class
+.b $=w
+is set to be the set of all names
+this host is known by.
+This can be used to match local hostnames.
+.pp
+The class
+.b $=k
+is set to be the same as
+.b $k ,
+that is, the UUCP node name.
+.pp
+The class
+.b $=m
+is set to the set of domains by which this host is known,
+initially just
+.b $m .
+.pp
+.i Sendmail
+can be compiled to allow a
+.i scanf (3)
+string on the
+.b F
+line.
+This lets you do simplistic parsing of text files.
+For example, to read all the user names in your system
+.i /etc/passwd
+file into a class, use
+.(b
+FL/etc/passwd %[^:]
+.)b
+which reads every line up to the first colon.
+.sh 3 "M \*- define mailer"
+.pp
+Programs and interfaces to mailers
+are defined in this line.
+The format is:
+.(b F
+.b M \c
+.i name ,
+{\c
+.i field =\c
+.i value \|}*
+.)b
+where
+.i name
+is the name of the mailer
+(used internally only)
+and the
+.q field=name
+pairs define attributes of the mailer.
+Fields are:
+.(b
+.ta 1i
+Path	The pathname of the mailer
+Flags	Special flags for this mailer
+Sender	A rewriting set for sender addresses
+Recipient	A rewriting set for recipient addresses
+Argv	An argument vector to pass to this mailer
+Eol	The end-of-line string for this mailer
+Maxsize	The maximum message length to this mailer
+Linelimit	The maximum line length in the message body
+Directory	The working directory for the mailer
+.)b
+Only the first character of the field name is checked.
+.pp
+The following flags may be set in the mailer description.
+Any other flags may be used freely
+to conditionally assign headers to messages
+destined for particular mailers.
+.nr ii 4n
+.ip a
+Run Extended SMTP (ESMTP) protocol (defined in RFCs 1425, 1426, and 1427).
+.ip b
+Force a blank line on the end of a message.
+This is intended to work around some stupid versions of
+/bin/mail
+that require a blank line, but do not provide it themselves.
+It would not normally be used on network mail.
+.ip c
+Do not include comments in addresses.
+This should only be used if you have to work around
+a remote mailer that gets confused by comments.
+.ip C
+If mail is
+.i received
+from a mailer with this flag set,
+any addresses in the header that do not have an at sign
+(\c
+.q @ )
+after being rewritten by ruleset three
+will have the
+.q @domain
+clause from the sender
+tacked on.
+This allows mail with headers of the form:
+.(b
+From: usera@hosta
+To: userb@hostb, userc
+.)b
+to be rewritten as:
+.(b
+From: usera@hosta
+To: userb@hostb, userc@hosta
+.)b
+automatically.
+.ip D
+This mailer wants a
+.q Date:
+header line.
+.ip e
+This mailer is expensive to connect to,
+so try to avoid connecting normally;
+any necessary connection will occur during a queue run.
+.ip E
+Escape lines beginning with
+.q From
+in the message with a `>' sign.
+.ip f
+The mailer wants a
+.b \-f
+.i from
+flag,
+but only if this is a network forward operation
+(i.e.,
+the mailer will give an error
+if the executing user
+does not have special permissions).
+.ip F
+This mailer wants a
+.q From:
+header line.
+.ip g
+Normally,
+.i sendmail
+sends internally generated email (e.g., error messages)
+using the null return address\**
+.(f
+\**Actually, this only applies to SMTP,
+which uses the ``MAIL FROM:<>'' command.
+.)f
+as required by RFC 1123.
+However, some mailers don't accept a null return address.
+If necessary,
+you can set the
+.b g
+flag to prevent
+.i sendmail
+from obeying the standards;
+error messages will be sent as from the MAILER-DAEMON
+(actually, the value of the
+.b $n
+macro).
+.ip h
+Upper case should be preserved in host names
+for this mailer.
+.ip I
+This mailer will be speaking SMTP
+to another
+.i sendmail
+\*-
+as such it can use special protocol features.
+This option is not required
+(i.e.,
+if this option is omitted the transmission will still operate successfully,
+although perhaps not as efficiently as possible).
+.ip l
+This mailer is local
+(i.e.,
+final delivery will be performed).
+.ip L
+Limit the line lengths as specified in RFC821.
+This deprecated option should be replaced by the
+.b L=
+mail declaration.
+For historic reasons, the
+.b L
+flag also sets the
+.b 7
+flag.
+.ip m
+This mailer can send to multiple users
+on the same host
+in one transaction.
+When a
+.b $u
+macro occurs in the
+.i argv
+part of the mailer definition,
+that field will be repeated as necessary
+for all qualifying users.
+.ip M
+This mailer wants a
+.q Message-Id:
+header line.
+.ip n
+Do not insert a UNIX-style
+.q From
+line on the front of the message.
+.ip p
+Use the route-addr style reverse-path in the SMTP
+.q "MAIL FROM:"
+command
+rather than just the return address;
+although this is required in RFC821 section 3.1,
+many hosts do not process reverse-paths properly.
+Reverse-paths are officially discouraged by RFC 1123.
+.ip P
+This mailer wants a
+.q Return-Path:
+line.
+.ip r
+Same as
+.b f ,
+but sends a
+.b \-r
+flag.
+.ip s
+Strip quote characters off of the address
+before calling the mailer.
+.ip S
+Don't reset the userid
+before calling the mailer.
+This would be used in a secure environment
+where
+.i sendmail
+ran as root.
+This could be used to avoid forged addresses.
+This flag is suppressed if given from an
+.q unsafe
+environment
+(e.g, a user's mail.cf file).
+.ip u
+Upper case should be preserved in user names
+for this mailer.
+.ip U
+This mailer wants Unix-style
+.q From
+lines with the ugly UUCP-style
+.q "remote from <host>"
+on the end.
+.ip x
+This mailer wants a
+.q Full-Name:
+header line.
+.ip X
+This mailer want to use the hidden dot algorithm
+as specified in RFC821;
+basically,
+any line beginning with a dot
+will have an extra dot prepended
+(to be stripped at the other end).
+This insures that lines in the message containing a dot
+will not terminate the message prematurely.
+.ip 7
+Strip all output to seven bits.
+This is the default if the
+.b L
+flag is set.
+Note that clearing this option is not
+sufficient to get full eight bit data passed through
+.i sendmail .
+If the
+.b 7
+option is set, this is essentially always set,
+since the eighth bit was stripped on input.
+.pp
+The mailer with the special name
+.q error
+can be used to generate a user error.
+The (optional) host field is an exit status to be returned,
+and the user field is a message to be printed.
+The exit status may be numeric or one of the values
+USAGE, NOUSER, NOHOST, UNAVAILABLE, SOFTWARE, TEMPFAIL, PROTOCOL, or CONFIG
+to return the corresponding EX_ exit code.
+For example, the entry:
+.(b
+$#error $@ NOHOST $: Host unknown in this domain
+.)b
+on the RHS of a rule
+will cause the specified error to be generated
+and the
+.q "Host unknown"
+exit status to be returned
+if the LHS matches.
+This mailer is only functional in ruleset zero.
+.pp
+The mailer named
+.q local
+.i must
+be defined in every configuration file.
+This is used to deliver local mail,
+and is treated specially in several ways.
+Additionally, three other mailers named
+.q prog ,
+.q *file* ,
+and
+.q *include*
+may be defined to tune the delivery of messages to programs,
+files,
+and :include: lists respectively.
+They default to:
+.(b
+Mprog, P=/bin/sh, F=lsD, A=sh \-c $u
+M*file*, P=/dev/null, F=lsDFMPEu, A=FILE
+M*include*, P=/dev/null, F=su, A=INCLUDE
+.)b
+.pp
+The Sender and Recipient rewriting sets
+may either be a simple integer
+or may be two integers separated by a slash;
+if so, the first rewriting set is applied to envelope
+addresses
+and the second is applied to headers.
+.pp
+The Directory
+is actually a colon-separated path of directories to try.
+For example, the definition
+.q D=$z:/
+first tries to execute in the recipient's home directory;
+if that is not available,
+it tries to execute in the root of the filesystem.
+This is intended to be used only on the
+.q prog
+mailer,
+since some shells (such as
+.i csh )
+refuse to execute if they cannot read the home directory.
+Since the queue directory is not normally readable by normal users
+.i csh
+scripts as recipients can fail.
+.sh 3 "H \*- define header"
+.pp
+The format of the header lines that
+.i sendmail
+inserts into the message
+are defined by the
+.b H
+line.
+The syntax of this line is:
+.(b F
+.b H [\c
+.b ? \c
+.i mflags \c
+.b ? ]\c
+.i hname \c
+.b :
+.i htemplate
+.)b
+Continuation lines in this spec
+are reflected directly into the outgoing message.
+The
+.i htemplate
+is macro expanded before insertion into the message.
+If the
+.i mflags
+(surrounded by question marks)
+are specified,
+at least one of the specified flags
+must be stated in the mailer definition
+for this header to be automatically output.
+If one of these headers is in the input
+it is reflected to the output
+regardless of these flags.
+.pp
+Some headers have special semantics
+that will be described below.
+.sh 3 "O \*- set option"
+.pp
+There are a number of
+.q random
+options that
+can be set from a configuration file.
+Options are represented by single characters.
+The syntax of this line is:
+.(b F
+.b O \c
+.i o\|value
+.)b
+This sets option
+.i o
+to be
+.i value .
+Depending on the option,
+.i value
+may be a string, an integer,
+a boolean
+(with legal values
+.q t ,
+.q T ,
+.q f ,
+or
+.q F ;
+the default is TRUE),
+or
+a time interval.
+.pp
+The options supported are:
+.nr ii 1i
+.ip a\fIN\fP
+If set,
+wait up to
+.i N
+minutes for an
+.q @:@
+entry to exist in the alias database
+before starting up.
+If it does not appear in
+.i N
+minutes,
+rebuild the database
+(if the
+.b D
+option is also set)
+or issue a warning.
+.ip "A\fIspec, spec, ...\fP"
+Specify possible alias file(s).
+Each
+.i spec
+should be in the format
+``\c
+.i class \c
+.b :
+.i file ''
+where
+.i class \c
+.b :
+is optional and defaults to ``implicit''.
+Depending on how
+.i sendmail
+is compiled, valid classes are
+.q implicit
+(search through a compiled-in list of alias file types,
+for back compatibility),
+.q hash
+(if
+.sm NEWDB
+is specified),
+.q dbm
+(if
+.sm NDBM
+is specified),
+.q stab
+(internal symbol table \*- not normally used
+unless you have no other database lookup),
+or
+.q nis
+(if
+.sm NIS
+is specified).
+If a list of
+.i spec s
+are provided,
+.i sendmail
+searches them in order.
+.ip b\fIN\fP/\fIM\fP
+Insist on at least
+.i N
+blocks free on the filesystem that holds the queue files
+before accepting email via SMTP.
+If there is insufficient space
+.i sendmail
+gives a 452 response
+to the MAIL command.
+This invites the sender to try again later.
+The optional
+.i M
+is a maximum message size advertised in the ESMTP EHLO response.
+It is currently otherwise unused.
+.ip B\fIc\fP
+Set the blank substitution character to
+.i c .
+Unquoted spaces in addresses are replaced by this character.
+Defaults to space (i.e., no change is made).
+.ip c
+If an outgoing mailer is marked as being expensive,
+don't connect immediately.
+This requires that queueing be compiled in,
+since it will depend on a queue run process to
+actually send the mail.
+.ip C\fIN\fP
+Checkpoints the queue every
+.i N
+(default 10)
+addresses sent.
+If your system crashes during delivery to a large list,
+this prevents retransmission to any but the last
+.I N
+recipients.
+.ip d\fIx\fP
+Deliver in mode
+.i x .
+Legal modes are:
+.(b
+.ta 4n
+i	Deliver interactively (synchronously)
+b	Deliver in background (asynchronously)
+q	Just queue the message (deliver during queue run)
+.)b
+Defaults to ``b'' if no option is specified,
+``i'' if it is specified but given no argument
+(i.e., ``Od'' is equivalent to ``Odi'').
+.ip D
+If set,
+rebuild the alias database if necessary and possible.
+If this option is not set,
+.i sendmail
+will never rebuild the alias database
+unless explicitly requested
+using
+.b \-bi .
+.ip e\fIx\fP
+Dispose of errors using mode
+.i x .
+The values for
+.i x
+are:
+.(b
+p	Print error messages (default)
+q	No messages, just give exit status
+m	Mail back errors
+w	Write back errors (mail if user not logged in)
+e	Mail back errors and give zero exit stat always
+.)b
+.ip E\fIfile/message\fP
+Prepend error messages with the indicated message.
+If it begins with a slash,
+it is assumed to be the pathname of a file
+containing a message (this is the recommended setting).
+Otherwise, it is a literal message.
+The error file might contain the name, email address, and/or phone number
+of a local postmaster who could provide assistance
+in to end users.
+If the option is missing or null,
+or if it names a file which does not exist or which is not readable,
+no message is printed.
+.ip f
+Save
+Unix-style
+.q From
+lines at the front of headers.
+Normally they are assumed redundant
+and discarded.
+.ip F\fImode\fP
+The file mode for queue files.
+.ip g\fIn\fP
+Set the default group id
+for mailers to run in
+to
+.i n .
+Defaults to 1.
+The value can also be given as a symbolic group name.
+.ip G
+Allow fuzzy matching on the GECOS field.
+If this flag is set,
+and the usual user name lookups fail
+(that is, there is no alias with this name and a
+.i getpwnam
+fails),
+sequentially search the password file
+for a matching entry in the GECOS field.
+This also requires that MATCHGECOS
+be turned on during compilation.
+This option is not recommended.
+.ip h\fIN\fP
+The maximum hop count.
+Messages that have been processed more than
+.i N
+times are assumed to be in a loop and are rejected.
+Defaults to 25.
+.ip H\fIfile\fP
+Specify the help file
+for SMTP.
+.ip i
+Ignore dots in incoming messages.
+This is always disabled (that is, dots are always accepted)
+when reading SMTP mail.
+.ip I
+Insist that the BIND name server be running
+to resolve host names.
+If this is not set and the name server is not running,
+the
+.i /etc/hosts
+file will be considered complete.
+In general, you do want to set this option
+if your
+.i /etc/hosts
+file does not include all hosts known to you
+or if you are using the MX (mail forwarding) feature of the BIND name server.
+The name server will still be consulted
+even if this option is not set, but
+.i sendmail
+will feel free to resort to reading
+.i /etc/hosts
+if the name server is not available.
+Thus, you should
+.i never
+set this option if you do not run the name server.
+.ip j
+If set, send error messages in MIME format
+(see RFC1341 and RFC1344 for details).
+.ip J\fIpath\fP
+Set the path for searching for users' .forward files.
+The default is
+.q $z/.forward .
+Some sites that use the automounter may prefer to change this to
+.q /var/forward/$u
+to search a file with the same name as the user in a system directory.
+It can also be set to a sequence of paths separated by colons;
+.i sendmail
+stops at the first file it can successfully and safely open.
+For example,
+.q /var/forward/$u:$z/.forward
+will search first in /var/forward/\c
+.i username
+and then in
+.i ~username /.forward
+(but only if the first file does not exist).
+.ip k\fIN\fP
+The maximum number of open connections that will be cached at a time.
+The default is one.
+This delays closing the current connection until
+either this invocation of
+.i sendmail
+needs to connect to another host
+or it terminates.
+Setting it to zero defaults to the old behavior,
+that is, connections are closed immediately.
+.ip K\fItimeout\fP
+The maximum amount of time a cached connection will be permitted to idle
+without activity.
+If this time is exceeded,
+the connection is immediately closed.
+This value should be small (on the order of ten minutes).
+Before
+.i sendmail
+uses a cached connection,
+it always sends a NOOP (no operation) command
+to check the connection;
+if this fails, it reopens the connection.
+This keeps your end from failing if the other end times out.
+The point of this option is to be a good network neighbor
+and avoid using up excessive resources
+on the other end.
+The default is five minutes.
+.ip l
+If there is an
+.q Errors-To:
+header, send error messages to the addresses listed there.
+They normally go to the envelope sender.
+Use of this option causes
+.i sendmail
+to violate RFC 1123.
+.ip L\fIn\fP
+Set the default log level to
+.i n .
+Defaults to 9.
+.ip m
+Send to me too,
+even if I am in an alias expansion.
+.ip M\fIx\|value\fP
+Set the macro
+.i x
+to
+.i value .
+This is intended only for use from the command line.
+.ip n
+Validate the RHS of aliases when rebuilding the alias database.
+.ip o
+Assume that the headers may be in old format,
+i.e.,
+spaces delimit names.
+This actually turns on
+an adaptive algorithm:
+if any recipient address contains a comma, parenthesis,
+or angle bracket,
+it will be assumed that commas already exist.
+If this flag is not on,
+only commas delimit names.
+Headers are always output with commas between the names.
+.ip O\fIoptions\fP
+Set server SMTP options.
+The options are
+.i key=value
+pairs.
+Known keys are:
+.(b
+.ta 1i
+Port	Name/number of listening port (defaults to "smtp")
+Addr	Address mask (defaults INADDR_ANY)
+Family	Address family (defaults to INET)
+Listen	Size of listen queue (defaults to 10)
+.)b
+The
+.i Addr ess
+mask may be a numeric address in dot notation
+or a network name.
+.ip p\fI\|opt,opt,...\fP
+Set the privacy
+.i opt ions.
+``Privacy'' is really a misnomer;
+many of these are just a way of insisting on stricter adherence
+to the SMTP protocol.
+The
+.i opt ions
+can be selected from:
+.(b
+.ta \w'needvrfyhelo'u+3n
+public	Allow open access
+needmailhelo	Insist on HELO or EHLO command before MAIL
+needexpnhelo	Insist on HELO or EHLO command before EXPN
+noexpn	Disallow EXPN entirely
+needvrfyhelo	Insist on HELO or EHLO command before VRFY
+novrfy	Disallow VRFY entirely
+restrictmailq	Restrict mailq command
+restrictqrun	Restrict \-q command line flag
+noreceipts	Ignore Return-Receipt-To: header
+goaway	Disallow essentially all SMTP status queries
+authwarnings	Put X-Authentication-Warning: headers in messages
+.)b
+The
+.q goaway
+pseudo-flag sets all flags except
+.q restrictmailq
+and
+.q restrictqrun .
+If mailq is restricted,
+only people in the same group as the queue directory
+can print the queue.
+If queue runs are restricted,
+only root and the owner of the queue directory
+can run the queue.
+Authentication Warnings add warnings about various conditions
+that may indicate attempts to spoof the mail system,
+such as using an non-standard queue directory.
+.ip P\fIpostmaster\fP
+If set,
+copies of error messages will be sent to the named
+.i postmaster .
+Only the header of the failed message is sent.
+Since most errors are user problems,
+this is probably not a good idea on large sites,
+and arguably contains all sorts of privacy violations,
+but it seems to be popular with certain operating systems vendors.
+.ip q\fIfactor\fP
+Use
+.i factor
+as the multiplier in the map function
+to decide when to just queue up jobs rather than run them.
+This value is divided by the difference between the current load average
+and the load average limit
+(\c
+.b x
+flag)
+to determine the maximum message priority
+that will be sent.
+Defaults to 600000.
+.ip Q\fIdir\fP
+Use the named
+.i dir
+as the queue directory.
+.ip r\|\fItimeouts\fP
+Timeout reads after
+.i time
+interval.
+The
+.i timeouts
+argument is a list of
+.i keyword=value
+pairs.
+The recognized timeouts and their default values, and their
+minimum values specified in RFC 1123 section 5.3.2 are:
+.(b
+.ta \w'datafinal'u+3n
+initial	wait for initial greeting message [5m, 5m]
+helo	reply to HELO or EHLO command [5m, none]
+mail	reply to MAIL command [10m, 5m]
+rcpt	reply to RCPT command [1h, 5m]
+datainit	reply to DATA command [5m, 2m]
+datablock	data block read [1h, 3m]
+datafinal	reply to final ``.'' in data [1h, 10m]
+rset	reply to RSET command [5m, none]
+quit	reply to QUIT command [2m, none]
+misc	reply to NOOP and VERB commands [2m, none]
+command	command read [1h, 5m]
+ident	IDENT protocol timeout [30s, none]
+.)b
+All but
+.q command
+apply to client SMTP.
+For back compatibility,
+a timeout with no ``keyword='' part
+will set all of the longer values.
+.ip R
+Normally,
+.i sendmail
+tries to eliminate any unnecessary explicit routes
+when sending an error message
+(as discussed in RFC 1123 \(sc 5.2.6).
+For example,
+when sending an error message to
+.(b
+<@known1,@known2,@unknown:user@known3>
+.)b
+.i sendmail
+will strip off the
+.q @known1
+in order to make the route as direct as possible.
+However, if the
+.b R
+option is set, this will be disabled,
+and the mail will be sent to the first address in the route,
+even if later addresses are known.
+This may be useful if you are caught behind a firewall.
+.ip s
+Be super-safe when running things,
+i.e.,
+always instantiate the queue file,
+even if you are going to attempt immediate delivery.
+.i Sendmail
+always instantiates the queue file
+before returning control the client
+under any circumstances.
+.ip S\fIfile\fP
+Log statistics in the named
+.i file .
+.ip t\fItzinfo\fP
+Set the local time zone info to
+.i tzinfo
+\*- for example,
+.q PST8PDT .
+Actually, if this is not set,
+the TZ environment variable is cleared (so the system default is used);
+if set but null, the user's TZ variable is used,
+and if set and non-null the TZ variable is set to this value.
+.ip T\fIrtime/wtime\fP
+Set the queue timeout to
+.i rtime .
+After this interval,
+messages that have not been successfully sent
+will be returned to the sender.
+Defaults to five days.
+The optional
+.i wtime
+is the time after which a warning message is sent.
+If it is missing or zero
+then no warning messages are sent.
+.ip u\fIn\fP
+Set the default userid for mailers to
+.i n .
+Mailers without the
+.i S
+flag in the mailer definition
+will run as this user.
+Defaults to 1.
+The value can also be given as a symbolic user name.
+.ip U\fIudbspec\fP
+The user database specification.
+.ip v
+Run in verbose mode.
+If this is set,
+.i sendmail
+adjusts options
+.b c
+(don't connect to expensive mailers)
+and
+.b d
+(delivery mode)
+so that all mail is delivered completely
+in a single job
+so that you can see the entire delivery process.
+Option
+.b v
+should
+.i never
+be set in the configuration file;
+it is intended for command line use only.
+.ip V\fIfallbackhost\fP
+If specified, the
+.i fallbackhost
+acts like a very low priority MX
+on every host.
+This is intended to be used by sites with poor network connectivity.
+.ip w
+If you are the
+.q best
+(that is, lowest preference)
+MX for a given host,
+you should normally detect this situation
+and treat that condition specially,
+by forwarding the mail to a UUCP feed,
+treating it as local,
+or whatever.
+However, in some cases (such as Internet firewalls)
+you may want to try to connect directly to that host
+as though it had no MX records at all.
+Setting this option causes
+.i sendmail
+to try this.
+The downside is that errors in your configuration
+are likely to be diagnosed as
+.q "host unknown"
+or
+.q "message timed out"
+instead of something more meaningful.
+This option is disrecommended.
+.ip x\fILA\fP
+When the system load average exceeds
+.i LA ,
+just queue messages
+(i.e., don't try to send them).
+Defaults to 8.
+.ip X\fILA\fP
+When the system load average exceeds
+.i LA ,
+refuse incoming SMTP connections.
+Defaults to 12.
+.ip y\fIfact\fP
+The indicated
+.i fact or
+is added to the priority (thus
+.i lowering
+the priority of the job)
+for each recipient,
+i.e., this value penalizes jobs with large numbers of recipients.
+Defaults to 30000.
+.ip Y
+If set,
+deliver each job that is run from the queue in a separate process.
+Use this option if you are short of memory,
+since the default tends to consume considerable amounts of memory
+while the queue is being processed.
+.ip z\fIfact\fP
+The indicated
+.i fact or
+is multiplied by the message class
+(determined by the Precedence: field in the user header
+and the
+.b P
+lines in the configuration file)
+and subtracted from the priority.
+Thus, messages with a higher Priority: will be favored.
+Defaults to 1800.
+.ip Z\fIfact\fP
+The
+.i fact or
+is added to the priority
+every time a job is processed.
+Thus,
+each time a job is processed,
+its priority will be decreased by the indicated value.
+In most environments this should be positive,
+since hosts that are down are all too often down for a long time.
+Defaults to 90000.
+.ip 7
+Strip input to seven bits for compatibility with old systems.
+This shouldn't be necessary.
+.lp
+All options can be specified on the command line using the
+\-o flag,
+but most will cause
+.i sendmail
+to relinquish its setuid permissions.
+The options that will not cause this are
+b, d, e, i, L, m, o, p, r, s, v, C, and 7.
+Also, M (define macro) when defining the r or s macros
+is also considered
+.q safe .
+.sh 3 "P \*- precedence definitions"
+.pp
+Values for the
+.q "Precedence:"
+field may be defined using the
+.b P
+control line.
+The syntax of this field is:
+.(b
+\fBP\fP\fIname\fP\fB=\fP\fInum\fP
+.)b
+When the
+.i name
+is found in a
+.q Precedence:
+field,
+the message class is set to
+.i num .
+Higher numbers mean higher precedence.
+Numbers less than zero
+have the special property
+that if an error occurs during processing
+the body of the message will not be returned;
+this is expected to be used for
+.q "bulk"
+mail such as through mailing lists.
+The default precedence is zero.
+For example,
+our list of precedences is:
+.(b
+Pfirst-class=0
+Pspecial-delivery=100
+Plist=\-30
+Pbulk=\-60
+Pjunk=\-100
+.)b
+People writing mailing list exploders
+are encouraged to use
+.q "Precedence: list" .
+Older versions of
+.i sendmail
+(which discarded all error returns for negative precedences)
+didn't recognize this name, giving it a default precedence of zero.
+This allows list maintainers to see error returns
+on both old and new versions of
+.i sendmail .
+.sh 3 "V \*- configuration version level"
+.pp
+To provide compatibility with old configuration files,
+the
+.b V
+line has been added to define some very basic semantics
+of the configuration file.
+These are not intended to be long term supports;
+rather, they describe compatibility features
+which will probably be removed in future releases.
+.pp
+.b N.B.:
+these version
+.i levels
+have nothing
+to do with the version
+.i number
+on the files.
+For example,
+as of this writing
+version 8 config files
+(specifically, 8.6)
+used version level 5 configurations.
+.pp
+.q Old
+configuration files are defined as version level one.
+Version level two files make the following changes:
+.np
+Host name canonification ($[ ... $])
+appends a dot if the name is recognized;
+this gives the config file a way of finding out if anything matched.
+(Actually, this just initializes the
+.q host
+map with the
+.q \-a.
+flag \*- you can reset it to anything you prefer
+by declaring the map explicitly.)
+.np
+Default host name extension is consistent throughout processing;
+version level one configurations turned off domain extension
+(that is, adding the local domain name)
+during certain points in processing.
+Version level two configurations are expected to include a trailing dot
+to indicate that the name is already canonical.
+.np
+Local names that are not aliases
+are passed through a new distinguished ruleset five;
+this can be used to append a local relay.
+This behaviour can be prevented by resolving the local name
+with an initial `@'.
+That is, something that resolves to a local mailer and a user name of
+.q vikki
+will be passed through ruleset five,
+but a user name of
+.q @vikki
+will have the `@' stripped,
+will not be passed through ruleset five,
+but will otherwise be treated the same as the prior example.
+The expectation is that this might be used to implement a policy
+where mail sent to
+.q vikki
+was handled by a central hub,
+but mail sent to
+.q vikki@localhost
+was delivered directly.
+.pp
+Version level three files
+allow # initiated comments on all lines.
+Exceptions are backslash escaped # marks
+and the $# syntax.
+.pp
+Version level four configurations
+are completely equivalent to level three
+for historical reasons.
+.pp
+Version level five configuration files
+change the default definition of
+.b $w
+to be just the first component of the hostname.
+.pp
+The
+.b V
+line may have an optional
+.b / \c
+.i vendor
+to indicate that this configuration file uses modifications
+specific to a particular vendor\**.
+.(f
+\**And of course, vendors are encouraged to add themselves
+to the list of recognized vendors by editing the routine
+.i setvendor
+in
+.i conf.c .
+.)f
+.sh 3 "K \*- key file declaration"
+.pp
+Special maps can be defined using the line:
+.(b
+Kmapname mapclass arguments
+.)b
+The
+.i mapname
+is the handle by which this map is referenced in the rewriting rules.
+The
+.i mapclass
+is the name of a type of map;
+these are compiled in to
+.i sendmail .
+The
+.i arguments
+are interpreted depending on the class;
+typically,
+there would be a single argument naming the file containing the map.
+.pp
+Maps are referenced using the syntax:
+.(b
+$( \fImap\fP \fIkey\fP $@ \fIarguments\fP $: \fIdefault\fP $)
+.)b
+where either or both of the
+.i arguments
+or
+.i default
+portion may be omitted.
+The
+.i arguments
+may appear more than once.
+The indicated
+.i key
+and
+.i arguments
+are passed to the appropriate mapping function.
+If it returns a value, it replaces the input.
+If it does not return a value and the
+.i default
+is specified, the
+.i default
+replaces the input.
+Otherwise, the input is unchanged.
+.pp
+During replacement of either a map value or default
+the string
+.q %\fIn\fP
+(where
+.i n
+is a digit)
+is replaced by the corresponding
+.i argument .
+Argument zero
+is always the database key.
+For example, the rule
+.(b
+.ta 1.5i
+R$- ! $+	$: $(uucp $1 $@ $2 $: %1 @ %0 . UUCP $)
+.)b
+Looks up the UUCP name in a (user defined) UUCP map;
+if not found it turns it into
+.q \&.UUCP
+form.
+The database might contain records like:
+.(b
+decvax	%1@%0.DEC.COM
+research	%1@%0.ATT.COM
+.)b
+.pp
+The built in map with both name and class
+.q host
+is the host name canonicalization lookup.
+Thus,
+the syntax:
+.(b
+$(host \fIhostname\fP$)
+.)b
+is equivalent to:
+.(b
+$[\fIhostname\fP$]
+.)b
+.pp
+There are four predefined database lookup classes:
+.q dbm ,
+.q btree ,
+.q hash ,
+and
+.q nis .
+The first requires that
+.i sendmail
+be compiled with the
+.b ndbm
+library;
+the second two require the
+.b db
+library,
+and the third requires that
+.i sendmail
+be compiled with NIS support.
+All four accept as arguments the same optional flags
+and a filename
+(or a mapname for NIS;
+the filename is the root of the database path,
+so that
+.q .db
+or some other extension appropriate for the database type
+will be added to get the actual database name).
+Known flags are:
+.ip "\-o"
+Indicates that this map is optional \*- that is,
+if it cannot be opened,
+no error is produced,
+and
+.i sendmail
+will behave as if the map existed but was empty.
+.ip "\-N"
+Normally when maps are written,
+the trailing null byte is not included as part of the key.
+If this flag is indicated it will be included.
+During lookups, only the null-byte-included form will be searched.
+See also
+.b \-O.
+.ip "\-O"
+If neither
+.b \-N
+or
+.b \-O
+are specified,
+.i sendmail
+uses an adaptive algorithm to decide whether or not to look for null bytes
+on the end of keys.
+It starts by trying both;
+if it finds any key with a null byte it never tries again without a null byte
+and vice versa.
+If this flag is specified,
+it never tries with a null byte;
+this can speed matches but is never necessary.
+If both
+.b \-N
+and
+.b \-O
+are specified,
+.i sendmail
+will never try any matches at all \(em
+that is, everything will appear to fail.
+.ip "\-a\fIx\fP"
+Append the string
+.i x
+on successful matches.
+For example, the default
+.i host
+map appends a dot on successful matches.
+.ip "\-f"
+Do not fold upper to lower case before looking up the key.
+.ip "\-m"
+Match only (without replacing the value).
+If you only care about the existence of a key and not the value
+(as you might when searching the NIS map
+.q hosts.byname
+for example),
+this flag prevents the map from substituting the value.
+However,
+The \-a argument is still appended on a match,
+and the default is still taken if the match fails.
+.pp
+The
+.i dbm
+map appends the strings
+.q \&.pag
+and
+.q \&.dir
+to the given filename;
+the two
+.i db -based
+maps append
+.q \&.db .
+For example, the map specification
+.(b
+Kuucp dbm \-o \-N /usr/lib/uucpmap
+.)b
+specifies an optional map named
+.q uucp
+of class
+.q dbm ;
+it always has null bytes at the end of every string,
+and the data is located in
+/usr/lib/uucpmap.{dir,pag}.
+.pp
+The program
+.i makemap (8)
+can be used to build any of the three database-oriented maps.
+It takes the following flags:
+.ip \-f
+Fold upper to lower case in the map.
+.ip \-N
+Include null bytes in keys.
+.ip \-o
+Append to an existing (old) file.
+.ip \-r
+Allow replacement of existing keys;
+normally, re-inserting an existing key is an error.
+.ip \-v
+Print what is happening.
+.lp
+The
+.i sendmail
+daemon does not have to be restarted to read the new maps
+as long as you change them in place;
+file locking is used so that the maps won't be read
+while they are being updated.\**
+.(f
+\**That is, don't create new maps and then use
+.i mv (1)
+to move them into place.
+I consider this a shortfall (a.k.a. bug) in
+.i sendmail
+which should be fixed in a future release.
+.)f
+.pp
+There are also two builtin maps that are,
+strictly speaking,
+not database lookups.
+.pp
+The
+.q host
+map does host domain canonification;
+given a host name it calls the name server
+to find the canonical name for that host.
+.pp
+The
+.q dequote
+map strips double quotes (") from a name.
+It does not strip backslashes.
+It will not strip quotes if the resulting string
+would contain unscannable syntax
+(that is, basic errors like unbalanced angle brackets;
+more sophisticated errors such as unknown hosts are not checked).
+The intent is for use when trying to accept mail from systems such as
+DECnet
+that routinely quote odd syntax such as
+.(b
+"49ers::ubell"
+.)b
+A typical usage is probably something like:
+.(b
+Kdequote dequote
+
+\&...
+
+R$\-	$: $(dequote $1 $)
+R$\- $+	$: $>3 $1 $2
+.)b
+Care must be taken to prevent unexpected results;
+for example,
+.(b
+"|someprogram < input > output"
+.)b
+will have quotes stripped,
+but the result is probably not what you had in mind.
+Fortunately these cases are rare.
+.pp
+New classes can be added in the routine
+.b setupmaps
+in file
+.b conf.c .
+.sh 2 "Building a Configuration File From Scratch"
+.pp
+Building a configuration table from scratch is an extremely difficult job.
+Fortunately,
+it is almost never necessary to do so;
+nearly every situation that may come up
+may be resolved by changing an existing table.
+In any case,
+it is critical that you understand what it is that you are trying to do
+and come up with a philosophy for the configuration table.
+This section is intended to explain what the real purpose
+of a configuration table is
+and to give you some ideas
+for what your philosophy might be.
+.pp
+.b "Do not even consider"
+writing your own configuration file
+without carefully studying
+RFC 821, 822, and 1123.
+You should also read RFC 976
+if you are doing UUCP exchange.
+.sh 3 "What you are trying to do"
+.pp
+The configuration table has three major purposes.
+The first and simplest
+is to set up the environment for
+.i sendmail .
+This involves setting the options,
+defining a few critical macros,
+etc.
+Since these are described in other places,
+we will not go into more detail here.
+.pp
+The second purpose is to rewrite addresses in the message.
+This should typically be done in two phases.
+The first phase maps addresses in any format
+into a canonical form.
+This should be done in ruleset three.
+The second phase maps this canonical form
+into the syntax appropriate for the receiving mailer.
+.i Sendmail
+does this in three subphases.
+Rulesets one and two
+are applied to all sender and recipient addresses respectively.
+After this,
+you may specify per-mailer rulesets
+for both sender and recipient addresses;
+this allows mailer-specific customization.
+Finally,
+ruleset four is applied to do any default conversion
+to external form.
+.pp
+The third purpose
+is to map addresses into the actual set of instructions
+necessary to get the message delivered.
+Ruleset zero must resolve to the internal form,
+which is in turn used as a pointer to a mailer descriptor.
+The mailer descriptor describes the interface requirements
+of the mailer.
+.sh 3 "Philosophy"
+.pp
+The particular philosophy you choose will depend heavily
+on the size and structure of your organization.
+I will present a few possible philosophies here.
+There are as many philosophies as there are config designers;
+feel free to develop your own.
+.pp
+One general point applies to all of these philosophies:
+it is almost always a mistake
+to try to do full host route resolution.
+For example,
+if you are on a UUCP-only site
+and you are trying to get names of the form
+.q user@host
+to the Internet,
+it does not pay to route them to
+.q xyzvax!decvax!ucbvax!c70!user@host
+since you then depend on several links not under your control,
+some of which are likely to misparse it anyway.
+The best approach to this problem
+is to simply forward the message for
+.q user@host
+to
+.q xyzvax
+and let xyzvax
+worry about it from there.
+In summary,
+just get the message closer to the destination,
+rather than determining the full path.
+.sh 4 "Large site, many hosts \*- minimum information"
+.pp
+Berkeley is an example of a large site,
+i.e., more than two or three hosts
+and multiple mail connections.
+We have decided that the only reasonable philosophy
+in our environment
+is to designate one host as the guru for our site.
+It must be able to resolve any piece of mail it receives.
+The other sites should have the minimum amount of information
+they can get away with.
+In addition,
+any information they do have
+should be hints rather than solid information.
+.pp
+For example,
+a typical site on our local ether network is
+.q monet
+(actually
+.q monet.CS.Berkeley.EDU ).
+When monet receives mail for delivery,
+it checks whether it knows
+that the destination host is directly reachable;
+if so, mail is sent to that host.
+If it receives mail for any unknown host,
+it just passes it directly to
+.q ucbvax.CS.Berkeley.EDU ,
+our master host.
+Ucbvax may determine that the host name is illegal
+and reject the message,
+or may be able to do delivery.
+However, it is important to note that when a new mail connection is added,
+the only host that
+.i must
+have its tables updated
+is ucbvax;
+the others
+.i may
+be updated if convenient,
+but this is not critical.
+.pp
+This picture is slightly muddied
+due to network connections that are not actually located
+on ucbvax.
+For example,
+some UUCP connections are currently on
+.q ucbarpa.
+However,
+monet
+.i "does not"
+know about this;
+the information is hidden totally between ucbvax and ucbarpa.
+Mail going from monet to a UUCP host
+is transferred via the ethernet
+from monet to ucbvax,
+then via the ethernet from ucbvax to ucbarpa,
+and then is submitted to UUCP.
+Although this involves some extra hops,
+we feel this is an acceptable tradeoff.
+.pp
+An interesting point is that it would be possible
+to update monet
+to send appropriate UUCP mail directly to ucbarpa
+if the load got too high;
+if monet failed to note a host as connected to ucbarpa
+it would go via ucbvax as before,
+and if monet incorrectly sent a message to ucbarpa
+it would still be sent by ucbarpa
+to ucbvax as before.
+The only problem that can occur is loops,
+for example,
+if ucbarpa thought that ucbvax had the UUCP connection
+and vice versa.
+For this reason,
+updates should
+.i always
+happen to the master host first.
+.pp
+This philosophy results as much from the need
+to have a single source for the configuration files
+(typically built using
+.i m4 \|(1)
+or some similar tool)
+as any logical need.
+Maintaining more than three separate tables by hand
+is essentially an impossible job.
+.sh 4 "Small site \*- complete information"
+.pp
+A small site
+(two or three hosts and few external connections)
+may find it more reasonable to have complete information
+at each host.
+This would require that each host
+know exactly where each network connection is,
+possibly including the names of each host on that network.
+As long as the site remains small
+and the configuration remains relatively static,
+the update problem will probably not be too great.
+.sh 4 "Single host"
+.pp
+This is in some sense the trivial case.
+The only major issue is trying to insure that you don't
+have to know too much about your environment.
+For example,
+if you have a UUCP connection
+you might find it useful to know about the names of hosts
+connected directly to you,
+but this is really not necessary
+since this may be determined from the syntax.
+.sh 4 "A completely different philosophy"
+.pp
+This is adapted from Bruce Lilly.
+Any errors in interpretation are mine.
+.pp
+Do minimal changes in ruleset 3:
+fix some common but unambiguous errors (e.g. trailing dot on domains) and
+hide bang paths foo!bar into bar@foo.UUCP.
+The resulting "canonical" form is any valid RFC822/RFC1123/RFC976 address.
+.pp
+Ruleset 0 does the bulk of the work.
+It removes the trailing "@.UUCP" that hides bang paths,
+strips anything not needed to resolve,
+e.g. the phrase from phrase <route-addr> and from named groups,
+rejects unparseable addresses using $#error,
+and finally
+resolves to a mailer/host/user triple.
+Ruleset 0 is rather lengthy
+as it has to handle 3 basic address forms:
+RFC976 bang paths,
+RFC1123 %-hacks
+(including vanilla RFC822 local-part@domain),
+and RFC822 source routes.
+It's also complicated by having to handle named lists.
+.pp
+The header rewriting rulesets 1 and 2
+remove the trailing "@.UUCP" that hides bang paths.
+Ruleset 2 also strips the $# mailer $@ host (for test mode).
+.pp
+Ruleset 4 does absolutely nothing.
+.pp
+The per-mailer rewriting rulesets conform the envelope and
+header addresses to the requirements of the specific
+mailer.
+.pp
+Lots of rulesets-as-subroutines are used.
+.pp
+As a result, header addresses are subject to minimal munging
+(per RFC1123), and the general plan is per RFC822 sect. 3.4.10.
+.sh 3 "Relevant issues"
+.pp
+The canonical form you use
+should almost certainly be as specified in
+the Internet protocols
+RFC819 and RFC822.
+Copies of these RFC's are included on the
+.i sendmail
+tape
+as
+.i doc/rfc819.lpr
+and
+.i doc/rfc822.lpr .
+.pp
+RFC822
+describes the format of the mail message itself.
+.i Sendmail
+follows this RFC closely,
+to the extent that many of the standards described in this document
+can not be changed without changing the code.
+In particular,
+the following characters have special interpretations:
+.(b
+< > ( ) " \e
+.)b
+Any attempt to use these characters for other than their RFC822
+purpose in addresses is probably doomed to disaster.
+.pp
+RFC819
+describes the specifics of the domain-based addressing.
+This is touched on in RFC822 as well.
+Essentially each host is given a name
+which is a right-to-left dot qualified pseudo-path
+from a distinguished root.
+The elements of the path need not be physical hosts;
+the domain is logical rather than physical.
+For example,
+at Berkeley
+one legal host might be
+.q a.CC.Berkeley.EDU ;
+reading from right to left,
+.q EDU
+is a top level domain
+comprising educational institutions,
+.q Berkeley
+is a logical domain name,
+.q CC
+represents the Computer Center,
+(in this case a strictly logical entity),
+and
+.q a
+is a host in the Computer Center.
+.pp
+Beware when reading RFC819
+that there are a number of errors in it.
+.sh 3 "How to proceed"
+.pp
+Once you have decided on a philosophy,
+it is worth examining the available configuration tables
+to decide if any of them are close enough
+to steal major parts of.
+Even under the worst of conditions,
+there is a fair amount of boiler plate that can be collected safely.
+.pp
+The next step is to build ruleset three.
+This will be the hardest part of the job.
+Beware of doing too much to the address in this ruleset,
+since anything you do will reflect through
+to the message.
+In particular,
+stripping of local domains is best deferred,
+since this can leave you with addresses with no domain spec at all.
+Since
+.i sendmail
+likes to append the sending domain to addresses with no domain,
+this can change the semantics of addresses.
+Also try to avoid
+fully qualifying domains in this ruleset.
+Although technically legal,
+this can lead to unpleasantly and unnecessarily long addresses
+reflected into messages.
+The Berkeley configuration files
+define ruleset nine
+to qualify domain names and strip local domains.
+This is called from ruleset zero
+to get all addresses into a cleaner form.
+.pp
+Once you have ruleset three finished,
+the other rulesets should be relatively trivial.
+If you need hints,
+examine the supplied configuration tables.
+.sh 3 "Testing the rewriting rules \*- the \-bt flag"
+.pp
+When you build a configuration table,
+you can do a certain amount of testing
+using the
+.q "test mode"
+of
+.i sendmail .
+For example,
+you could invoke
+.i sendmail
+as:
+.(b
+sendmail \-bt \-Ctest.cf
+.)b
+which would read the configuration file
+.q test.cf
+and enter test mode.
+In this mode,
+you enter lines of the form:
+.(b
+rwset address
+.)b
+where
+.i rwset
+is the rewriting set you want to use
+and
+.i address
+is an address to apply the set to.
+Test mode shows you the steps it takes
+as it proceeds,
+finally showing you the address it ends up with.
+You may use a comma separated list of rwsets
+for sequential application of rules to an input.
+For example:
+.(b
+3,1,21,4 monet:bollard
+.)b
+first applies ruleset three to the input
+.q monet:bollard.
+Ruleset one is then applied to the output of ruleset three,
+followed similarly by rulesets twenty-one and four.
+.pp
+If you need more detail,
+you can also use the
+.q \-d21
+flag to turn on more debugging.
+For example,
+.(b
+sendmail \-bt \-d21.99
+.)b
+turns on an incredible amount of information;
+a single word address
+is probably going to print out several pages worth of information.
+.pp
+You should be warned that internally,
+.i sendmail
+applies ruleset 3 to all addresses.
+In this version of
+.i sendmail ,
+you will have to do that manually.
+For example, older versions allowed you to use
+.(b
+0 bruce@broadcast.sony.com
+.)b
+This version requires that you use:
+.(b
+3,0 bruce@broadcast.sony.com
+.)b
+.sh 3 "Building mailer descriptions"
+.pp
+To add an outgoing mailer to your mail system,
+you will have to define the characteristics of the mailer.
+.pp
+Each mailer must have an internal name.
+This can be arbitrary,
+except that the names
+.q local
+and
+.q prog
+must be defined.
+.pp
+The pathname of the mailer must be given in the P field.
+If this mailer should be accessed via an IPC connection,
+use the string
+.q [IPC]
+instead.
+.pp
+The F field defines the mailer flags.
+You should specify an
+.q f
+or
+.q r
+flag to pass the name of the sender as a
+.b \-f
+or
+.b \-r
+flag respectively.
+These flags are only passed if they were passed to
+.i sendmail ,
+so that mailers that give errors under some circumstances
+can be placated.
+If the mailer is not picky
+you can just specify
+.q "\-f $g"
+in the argv template.
+If the mailer must be called as
+.b root
+the
+.q S
+flag should be given;
+this will not reset the userid
+before calling the mailer\**.
+.(f
+\**\c
+.i Sendmail
+must be running setuid to root
+for this to work.
+.)f
+If this mailer is local
+(i.e., will perform final delivery
+rather than another network hop)
+the
+.q l
+flag should be given.
+Quote characters
+(backslashes and " marks)
+can be stripped from addresses if the
+.q s
+flag is specified;
+if this is not given
+they are passed through.
+If the mailer is capable of sending to more than one user
+on the same host
+in a single transaction
+the
+.q m
+flag should be stated.
+If this flag is on,
+then the argv template containing
+.b $u
+will be repeated for each unique user
+on a given host.
+The
+.q e
+flag will mark the mailer as being
+.q expensive,
+which will cause
+.i sendmail
+to defer connection
+until a queue run\**.
+.(f
+\**The
+.q c
+configuration option must be given
+for this to be effective.
+.)f
+.pp
+An unusual case is the
+.q C
+flag.
+This flag applies to the mailer that the message is received from,
+rather than the mailer being sent to;
+if set,
+the domain spec of the sender
+(i.e., the
+.q @host.domain
+part)
+is saved
+and is appended to any addresses in the message
+that do not already contain a domain spec.
+For example,
+a message of the form:
+.(b
+From: eric@vangogh.CS.Berkeley.EDU
+To: wnj@monet.CS.Berkeley.EDU, mckusick
+.)b
+will be modified to:
+.(b
+From: eric@vangogh.CS.Berkeley.EDU
+To: wnj@monet.CS.Berkeley.EDU, mckusick@vangogh.CS.Berkeley.EDU
+.)b
+.i "if and only if"
+the
+.q C
+flag is defined in the mailer resolved to
+by running
+.q eric@vangogh.CS.Berkeley.EDU
+through rulesets 3 and 0.
+.pp
+Other flags are described
+in Appendix C.
+.pp
+The S and R fields in the mailer description
+are per-mailer rewriting sets
+to be applied to sender and recipient addresses
+respectively.
+These are applied after the sending domain is appended
+and the general rewriting sets
+(numbers one and two)
+are applied,
+but before the output rewrite
+(ruleset four)
+is applied.
+A typical use is to append the current domain
+to addresses that do not already have a domain.
+For example,
+a header of the form:
+.(b
+From: eric
+.)b
+might be changed to be:
+.(b
+From: eric@vangogh.CS.Berkeley.EDU
+.)b
+or
+.(b
+From: ucbvax!eric
+.)b
+depending on the domain it is being shipped into.
+These sets can also be used
+to do special purpose output rewriting
+in cooperation with ruleset four.
+.pp
+The S and R fields
+can be specified as two numbers separated by a slash
+(e.g.,
+.q "S=10/11" ),
+meaning that all envelope addresses will be processed through ruleset 10
+and all header addresses will be processed through ruleset 11.
+With only one number specified,
+both envelope and header rewriting sets are set to the indicated ruleset.
+.pp
+The E field defines the string to use
+as an end-of-line indication.
+A string containing only newline is the default.
+The usual backslash escapes
+(\er, \en, \ef, \eb)
+may be used.
+.pp
+Finally,
+an argv template is given as the A field.
+It may have embedded spaces.
+If there is no argv with a
+.b $u
+macro in it,
+.i sendmail
+will speak SMTP
+to the mailer.
+If the pathname for this mailer is
+.q [IPC],
+the argv should be
+.(b
+IPC $h [ \fIport\fP ]
+.)b
+where
+.i port
+is the optional port number
+to connect to.
+.pp
+For example,
+the specifications:
+.(b
+.ta \w'Mlocal, 'u +\w'P=/bin/mail, 'u +\w'F=rlsm, 'u +\w'S=10, 'u +\w'R=20, 'u
+Mlocal,	P=/bin/mail,	F=rlsm	S=10,	R=20,	A=mail \-d $u
+Mether,	P=[IPC],	F=meC,	S=11,	R=21,	A=IPC $h, M=100000
+.)b
+specifies a mailer to do local delivery
+and a mailer for ethernet delivery.
+The first is called
+.q local,
+is located in the file
+.q /bin/mail,
+takes a picky
+.b \-r
+flag,
+does local delivery,
+quotes should be stripped from addresses,
+and multiple users can be delivered at once;
+ruleset ten
+should be applied to sender addresses in the message
+and ruleset twenty
+should be applied to recipient addresses;
+the argv to send to a message will be the word
+.q mail,
+the word
+.q \-d,
+and words containing the name of the receiving user.
+If a
+.b \-r
+flag is inserted
+it will be between the words
+.q mail
+and
+.q \-d.
+The second mailer is called
+.q ether,
+it should be connected to via an IPC connection,
+it can handle multiple users at once,
+connections should be deferred,
+and any domain from the sender address
+should be appended to any receiver name
+without a domain;
+sender addresses should be processed by ruleset eleven
+and recipient addresses by ruleset twenty-one.
+There is a 100,000 byte limit on messages passed through this mailer.
+.sh 2 "The User Database"
+.pp
+If you have a version of
+.i sendmail
+with the user database package
+compiled in,
+the handling of sender and recipient addresses
+is modified.
+.pp
+The location of this database is controlled with the
+.b U
+option.
+.sh 3 "Structure of the user database"
+.pp
+The database is a sorted (BTree-based) structure.
+User records are stored with the key:
+.(b
+\fIuser-name\fP\fB:\fP\fIfield-name\fP
+.)b
+The sorted database format ensures that user records are clustered together.
+Meta-information is always stored with a leading colon.
+.pp
+Field names define both the syntax and semantics of the value.
+Defined fields include:
+.nr ii 1i
+.ip maildrop
+The delivery address for this user.
+There may be multiple values of this record.
+In particular,
+mailing lists will have one
+.i maildrop
+record for each user on the list.
+.ip "mailname"
+The outgoing mailname for this user.
+For each outgoing name,
+there should be an appropriate
+.i maildrop
+record for that name to allow return mail.
+See also
+.i :default:mailname .
+.ip mailsender
+Changes any mail sent to this address to have the indicated envelope sender.
+This is intended for mailing lists,
+and will normally be the name of an appropriate -request address.
+It is very similar to the owner-\c
+.i list
+syntax in the alias file.
+.ip fullname
+The full name of the user.
+.ip office-address
+The office address for this user.
+.ip office-phone
+The office phone number for this user.
+.ip office-fax
+The office FAX number for this user.
+.ip home-address
+The home address for this user.
+.ip home-phone
+The home phone number for this user.
+.ip home-fax
+The home FAX number for this user.
+.ip project
+A (short) description of the project this person is affiliated with.
+In the University this is often just the name of their graduate advisor.
+.ip plan
+A pointer to a file from which plan information can be gathered.
+.pp
+As of this writing,
+only a few of these fields are actually being used by
+.i sendmail :
+.i maildrop
+and
+.i mailname .
+A
+.i finger
+program that uses the other fields is planned.
+.sh 3 "User database semantics"
+.pp
+When the rewriting rules submit an address to the local mailer,
+the user name is passed through the alias file.
+If no alias is found (or if the alias points back to the same address),
+the name (with
+.q :maildrop
+appended)
+is then used as a key in the user database.
+If no match occurs (or if the maildrop points at the same address),
+forwarding is tried.
+.pp
+If the first token of the user name returned by ruleset 0
+is an
+.q @
+sign, the user database lookup is skipped.
+The intent is that the user database will act as a set of defaults
+for a cluster (in our case, the Computer Science Division);
+mail sent to a specific machine should ignore these defaults.
+.pp
+When mail is sent,
+the name of the sending user is looked up in the database.
+If that user has a
+.q mailname
+record,
+the value of that record is used as their outgoing name.
+For example, I might have a record:
+.(b
+eric:mailname	Eric.Allman@CS.Berkeley.EDU
+.)b
+This would cause my outgoing mail to be sent as Eric.Allman.
+.pp
+If a
+.q maildrop
+is found for the user,
+but no corresponding
+.q mailname
+record exists,
+the record
+.q :default:mailname
+is consulted.
+If present, this is the name of a host to override the local host.
+For example, in our case we would set it to
+.q CS.Berkeley.EDU .
+The effect is that anyone known in the database
+gets their outgoing mail stamped as
+.q user@CS.Berkeley.EDU ,
+but people not listed in the database use the local hostname.
+.sh 3 "Creating the database\**"
+.(f
+\**These instructions are known to be incomplete.
+A future version of the user database is planned
+including things such as finger service \*- and good documentation.
+.)f
+.pp
+The user database is built from a text file
+using the
+.i makemap
+utility
+(in the distribution in the makemap subdirectory).
+The text file is a series of lines corresponding to userdb records;
+each line has a key and a value separated by white space.
+The key is always in the format described above \*-
+for example:
+.(b
+eric:maildrop
+.)b
+This file is normally installed in a system directory;
+for example, it might be called
+.i /etc/userdb .
+To make the database version of the map, run the program:
+.(b
+makemap btree /etc/userdb.db < /etc/userdb
+.)b
+Then create a config file that uses this.
+For example, using the V8 M4 configuration, include the
+following line in your .mc file:
+.(b
+define(\`confUSERDB_SPEC\', /etc/userdb.db)
+.)b
+.sh 1 "OTHER CONFIGURATION"
+.pp
+There are some configuration changes that can be made by
+recompiling
+.i sendmail .
+This section describes what changes can be made
+and what has to be modified to make them.
+.sh 2 "Parameters in src/Makefile"
+.pp
+These parameters are intended to describe the compilation environment,
+not site policy,
+and should normally be defined in src/Makefile.
+.ip NDBM
+If set,
+the new version of the DBM library
+that allows multiple databases will be used.
+If neither NDBM nor NEWDB are set,
+a much less efficient method of alias lookup is used.
+.ip NEWDB
+If set, use the new database package from Berkeley (from 4.4BSD).
+This package is substantially faster than DBM or NDBM.
+If NEWDB and NDBM are both set,
+.i sendmail
+will read DBM files,
+but will create and use NEWDB files.
+.ip NIS
+Include support for NIS.
+If set together with
+.i both
+NEWDB and NDBM,
+.i sendmail
+will create both DBM and NEWDB files if and only if
+the file /var/yp/Makefile
+exists and is readable.
+This is intended for compatibility with Sun Microsystems'
+.i mkalias
+program used on YP masters.
+.ip SYSTEM5
+Set all of the compilation parameters appropriate for System V.
+.ip LOCKF
+Use System V
+.b lockf
+instead of Berkeley
+.b flock .
+Due to the highly unusual semantics of locks
+across forks in
+.b lockf ,
+this should never be used unless absolutely necessary.
+Set by default if
+SYSTEM5 is set.
+.ip SYS5TZ
+Use System V
+time zone semantics.
+.ip HASINITGROUPS
+Set this if your system has the
+.i initgroups()
+call
+(if you have multiple group support).
+This is the default if SYSTEM5 is
+.i not
+defined or if you are on HPUX.
+.ip HASUNAME
+Set this if you have the
+.i uname (2)
+system call (or corresponding library routine).
+Set by default if
+SYSTEM5
+is set.
+.ip HASSTATFS
+Set this if you have the
+.i statfs (2)
+system call.
+This will allow you to give a temporary failure
+message to incoming SMTP email
+when you are low on disk space.
+It is set by default on 4.4BSD and OSF/1 systems.
+.ip HASUSTAT
+Set if you have the
+.i ustat (2)
+system call.
+This is an alternative implementation of disk space control.
+You should only set one of HASSTATFS or HASUSTAT;
+the first is preferred.
+.ip _PATH_SENDMAILCF
+The pathname of the sendmail.cf file.
+.ip _PATH_SENDMAILPID
+The pathname of the sendmail.pid file.
+.ip LA_TYPE
+The load average type.
+Details are described below.
+.lp
+The are several built-in ways of computing the load average.
+.i Sendmail
+tries to auto-configure them based on imperfect guesses;
+you can select one using the
+.i cc
+option
+.b \-DLA_TYPE= \c
+.i type ,
+where
+.i type
+is:
+.ip LA_INT
+The kernel stores the load average in the kernel as an array of long integers.
+The actual values are scaled by a factor FSCALE
+(default 256).
+.ip LA_SHORT
+The kernel stores the load average in the kernel as an array of short integers.
+The actual values are scaled by a factor FSCALE
+(default 256).
+.ip LA_FLOAT
+The kernel stores the load average in the kernel as an array of
+double precision floats.
+.ip LA_MACH
+Use MACH-style load averages.
+.ip LA_SUBR
+Call the
+.i getloadavg
+routine to get the load average as an array of doubles.
+.ip LA_ZERO
+Always return zero as the load average.
+This is the fallback case.
+.lp
+If type
+.sm LA_INT ,
+.sm LA_SHORT ,
+or
+.sm LA_FLOAT
+is specified,
+you may also need to specify
+.sm _PATH_UNIX
+(the path to your system binary)
+and
+.sm LA_AVENRUN
+(the name of the variable containing the load average in the kernel;
+usually
+.q _avenrun
+or
+.q avenrun ).
+.pp
+There are also several compilation flags to indicate the environment
+such as
+.q _AIX3
+and
+.q _SCO_unix_ .
+See the READ_ME
+file for the latest scoop on these flags.
+.sh 2 "Parameters in src/conf.h"
+.pp
+Parameters and compilation options
+are defined in conf.h.
+Most of these need not normally be tweaked;
+common parameters are all in sendmail.cf.
+However, the sizes of certain primitive vectors, etc.,
+are included in this file.
+The numbers following the parameters
+are their default value.
+.nr ii 1.2i
+.ip "MAXLINE [1024]"
+The maximum line length of any input line.
+If message lines exceed this length
+they will still be processed correctly;
+however, header lines,
+configuration file lines,
+alias lines,
+etc.,
+must fit within this limit.
+.ip "MAXNAME [256]"
+The maximum length of any name,
+such as a host or a user name.
+.ip "MAXPV [40]"
+The maximum number of parameters to any mailer.
+This limits the number of recipients that may be passed in one transaction.
+It can be set to any arbitrary number above about 10,
+since
+.i sendmail
+will break up a delivery into smaller batches as needed.
+A higher number may reduce load on your system, however.
+.ip "MAXATOM [100]"
+The maximum number of atoms
+(tokens)
+in a single address.
+For example,
+the address
+.q "eric@CS.Berkeley.EDU"
+is seven atoms.
+.ip "MAXMAILERS [25]"
+The maximum number of mailers that may be defined
+in the configuration file.
+.ip "MAXRWSETS [100]"
+The maximum number of rewriting sets
+that may be defined.
+.ip "MAXPRIORITIES [25]"
+The maximum number of values for the
+.q Precedence:
+field that may be defined
+(using the
+.b P
+line in sendmail.cf).
+.ip "MAXUSERENVIRON [40]"
+The maximum number of items in the user environment
+that will be passed to subordinate mailers.
+.ip "QUEUESIZE [1000]"
+The maximum number of entries that will be processed
+in a single queue run.
+.ip "MAXMXHOSTS [20]"
+The maximum number of MX records we will accept for any single host.
+.lp
+A number of other compilation options exist.
+These specify whether or not specific code should be compiled in.
+.nr ii 1.2i
+.ip DEBUG
+If set, debugging information is compiled in.
+To actually get the debugging output,
+the
+.b \-d
+flag must be used.
+.b "WE STRONGLY RECOMMEND THAT THIS BE LEFT ON."
+Some people, believing that it was a security hole
+(it was, once)
+have turned it off and thus crippled debuggers.
+.ip NETINET
+If set,
+support for Internet protocol networking is compiled in.
+Previous versions of
+.i sendmail
+referred to this as
+.sm DAEMON ;
+this old usage is now incorrect.
+.ip NETISO
+If set,
+support for ISO protocol networking is compiled in
+(it may be appropriate to #define this in the Makefile instead of conf.h).
+.ip LOG
+If set,
+the
+.i syslog
+routine in use at some sites is used.
+This makes an informational log record
+for each message processed,
+and makes a higher priority log record
+for internal system errors.
+.ip MATCHGECOS
+Compile in the code to do ``fuzzy matching'' on the GECOS field
+in /etc/passwd.
+This also requires that option G be turned on.
+.ip NAMED_BIND
+Compile in code to use the
+Berkeley Internet Name Domain (BIND) server
+to resolve TCP/IP host names.
+.ip NOTUNIX
+If you are using a non-UNIX mail format,
+you can set this flag to turn off special processing
+of UNIX-style
+.q "From "
+lines.
+.ip QUEUE
+This flag should be set to compile in the queueing code.
+If this is not set,
+mailers must accept the mail immediately
+or it will be returned to the sender.
+.ip SETPROCTITLE
+If defined,
+.i sendmail
+will change its
+.i argv
+array to indicate its current status.
+This can be used in conjunction with the
+.i ps
+command to find out just what it's up to.
+.ip SMTP
+If set,
+the code to handle user and server SMTP will be compiled in.
+This is only necessary if your machine has some mailer
+that speaks SMTP
+(this means most machines everywhere).
+.ip UGLYUUCP
+If you have a UUCP host adjacent to you which is not running
+a reasonable version of
+.i rmail ,
+you will have to set this flag to include the
+.q "remote from sysname"
+info on the from line.
+Otherwise, UUCP gets confused about where the mail came from.
+.ip USERDB
+Include the
+.b experimental
+Berkeley user information database package.
+This adds a new level of local name expansion
+between aliasing and forwarding.
+It also uses the NEWDB package.
+This may change in future releases.
+.ip IDENTPROTO
+Compile in the IDENT protocol as defined in RFC 1413.
+This defaults on for all systems except Ultrix,
+which apparently has the interesting
+.q feature
+that when it receives a
+.q "host unreachable"
+message it closes all open connections to that host.
+Since some firewall gateways send this error code
+when you access an unauthorized port (such as 113, used by IDENT),
+Ultrix cannot receive email from such hosts.
+.sh 2 "Configuration in src/conf.c"
+.pp
+The following changes can be made in conf.c.
+.sh 3 "Built-in Header Semantics"
+.pp
+Not all header semantics are defined in the configuration file.
+Header lines that should only be included by certain mailers
+(as well as other more obscure semantics)
+must be specified in the
+.i HdrInfo
+table in
+.i conf.c .
+This table contains the header name
+(which should be in all lower case)
+and a set of header control flags (described below),
+The flags are:
+.ip H_ACHECK
+Normally when the check is made to see if a header line is compatible
+with a mailer,
+.i sendmail
+will not delete an existing line.
+If this flag is set,
+.i sendmail
+will delete
+even existing header lines.
+That is,
+if this bit is set and the mailer does not have flag bits set
+that intersect with the required mailer flags
+in the header definition in
+sendmail.cf,
+the header line is
+.i always
+deleted.
+.ip H_EOH
+If this header field is set,
+treat it like a blank line,
+i.e.,
+it will signal the end of the header
+and the beginning of the message text.
+.ip H_FORCE
+Add this header entry
+even if one existed in the message before.
+If a header entry does not have this bit set,
+.i sendmail
+will not add another header line if a header line
+of this name already existed.
+This would normally be used to stamp the message
+by everyone who handled it.
+.ip H_TRACE
+If set,
+this is a timestamp
+(trace)
+field.
+If the number of trace fields in a message
+exceeds a preset amount
+the message is returned
+on the assumption that it has an aliasing loop.
+.ip H_RCPT
+If set,
+this field contains recipient addresses.
+This is used by the
+.b \-t
+flag to determine who to send to
+when it is collecting recipients from the message.
+.ip H_FROM
+This flag indicates that this field
+specifies a sender.
+The order of these fields in the
+.i HdrInfo
+table specifies
+.i sendmail 's
+preference
+for which field to return error messages to.
+.nr ii 5n
+.lp
+Let's look at a sample
+.i HdrInfo
+specification:
+.(b
+.ta 4n +\w'"return-receipt-to",  'u
+struct hdrinfo	HdrInfo[] =
+\&{
+	     /* originator fields, most to least significant  */
+	"resent-sender",	H_FROM,
+	"resent-from",	H_FROM,
+	"sender",	H_FROM,
+	"from",	H_FROM,
+	"full-name",	H_ACHECK,
+	     /* destination fields */
+	"to",	H_RCPT,
+	"resent-to",	H_RCPT,
+	"cc",	H_RCPT,
+	     /* message identification and control */
+	"message",	H_EOH,
+	"text",	H_EOH,
+	     /* trace fields */
+	"received",	H_TRACE|H_FORCE,
+
+	NULL,	0,
+};
+.)b
+This structure indicates that the
+.q To: ,
+.q Resent-To: ,
+and
+.q Cc:
+fields
+all specify recipient addresses.
+Any
+.q Full-Name:
+field will be deleted unless the required mailer flag
+(indicated in the configuration file)
+is specified.
+The
+.q Message:
+and
+.q Text:
+fields will terminate the header;
+these are used by random dissenters around the network world.
+The
+.q Received:
+field will always be added,
+and can be used to trace messages.
+.pp
+There are a number of important points here.
+First,
+header fields are not added automatically just because they are in the
+.i HdrInfo
+structure;
+they must be specified in the configuration file
+in order to be added to the message.
+Any header fields mentioned in the configuration file but not
+mentioned in the
+.i HdrInfo
+structure have default processing performed;
+that is,
+they are added unless they were in the message already.
+Second,
+the
+.i HdrInfo
+structure only specifies cliched processing;
+certain headers are processed specially by ad hoc code
+regardless of the status specified in
+.i HdrInfo .
+For example,
+the
+.q Sender:
+and
+.q From:
+fields are always scanned on ARPANET mail
+to determine the sender\**;
+.(f
+\**Actually, this is no longer true in SMTP;
+this information is contained in the envelope.
+The older ARPANET protocols did not completely distinguish
+envelope from header.
+.)f
+this is used to perform the
+.q "return to sender"
+function.
+The
+.q "From:"
+and
+.q "Full-Name:"
+fields are used to determine the full name of the sender
+if possible;
+this is stored in the macro
+.b $x
+and used in a number of ways.
+.sh 3 "Restricting Use of Email"
+.pp
+If it is necessary to restrict mail through a relay,
+the
+.i checkcompat
+routine can be modified.
+This routine is called for every recipient address.
+It returns an exit status
+indicating the status of the message.
+The status
+.sm EX_OK
+accepts the address,
+.sm EX_TEMPFAIL
+queues the message for a later try,
+and other values
+(commonly
+.sm EX_UNAVAILABLE )
+reject the message.
+It is up to
+.i checkcompat
+to print an error message
+(using
+.i usrerr )
+if the message is rejected.
+For example,
+.i checkcompat
+could read:
+.(b
+.re
+.sz -1
+.ta 4n +4n +4n +4n +4n +4n +4n
+int
+checkcompat(to, e)
+	register ADDRESS *to;
+	register ENVELOPE *e;
+\&{
+	register STAB *s;
+
+	s = stab("private", ST_MAILER, ST_FIND);
+	if (s != NULL && e\->e_from.q_mailer != LocalMailer &&
+	    to->q_mailer == s->s_mailer)
+	{
+		usrerr("No private net mail allowed through this machine");
+		return (EX_UNAVAILABLE);
+	}
+	if (MsgSize > 50000 && to\->q_mailer != LocalMailer)
+	{
+		usrerr("Message too large for non-local delivery");
+		NoReturn = TRUE;
+		return (EX_UNAVAILABLE);
+	}
+	return (EX_OK);
+}
+.sz
+.)b
+This would reject messages greater than 50000 bytes
+unless they were local.
+The
+.i NoReturn
+flag can be sent to suppress the return of the actual body
+of the message in the error return.
+The actual use of this routine is highly dependent on the
+implementation,
+and use should be limited.
+.sh 3 "Load Average Computation"
+.pp
+The routine
+.i getla
+should return an approximation of the current system load average
+as an integer.
+There are four versions included on compilation flags
+as described above.
+.sh 3 "New Database Map Classes"
+.pp
+New key maps can be added by creating a class initialization function
+and a lookup function.
+These are then added to the routine
+.i setupmaps.
+.pp
+The initialization function is called as
+.(b
+\fIxxx\fP_map_init(MAP *map, char *mapname, char *args)
+.)b
+The
+.i map
+is an internal data structure.
+The
+.i mapname
+is the name of the map (used for error messages).
+The
+.i args
+is a pointer to the rest of the configuration file line;
+flags and filenames can be extracted from this line.
+The initialization function must return
+.sm TRUE
+if it successfully opened the map,
+.sm FALSE
+otherwise.
+.pp
+The lookup function is called as
+.(b
+\fIxxx\fP_map_lookup(MAP *map, char buf[], int bufsize, char **av, int *statp)
+.)b
+The
+.i map
+defines the map internally.
+The parameters
+.i buf
+and
+.i bufsize
+have the input key.
+This may be (and often is) used destructively.
+The
+.i av
+is a list of arguments passed in from the rewrite line.
+The lookup function should return a pointer to the new value.
+IF the map lookup fails,
+.i *statp
+should be set to an exit status code;
+in particular, it should be set to
+.sm EX_TEMPFAIL
+if recovery is to be attempted by the higher level code.
+.sh 3 "Queueing Function"
+.pp
+The routine
+.i shouldqueue
+is called to decide if a message should be queued
+or processed immediately.
+Typically this compares the message priority to the current load average.
+The default definition is:
+.(b
+bool
+shouldqueue(pri, ctime)
+	long pri;
+	time_t ctime;
+{
+	if (CurrentLA < QueueLA)
+		return (FALSE);
+	if (CurrentLA >= RefuseLA)
+		return (TRUE);
+	return (pri > (QueueFactor / (CurrentLA \- QueueLA + 1)));
+}
+.)b
+If the current load average
+(global variable
+.i CurrentLA ,
+which is set before this function is called)
+is less than the low threshold load average
+(option
+.b x ,
+variable
+.i QueueLA ),
+.i shouldqueue
+returns
+.sm FALSE
+immediately
+(that is, it should
+.i not
+queue).
+If the current load average exceeds the high threshold load average
+(option
+.b X ,
+variable
+.i RefuseLA ),
+.i shouldqueue
+returns
+.sm TRUE
+immediately.
+Otherwise, it computes the function based on the message priority,
+the queue factor
+(option
+.b q ,
+global variable
+.i QueueFactor ),
+and the current and threshold load averages.
+.pp
+An implementation wishing to take the actual age of the message into account
+can also use the
+.i ctime
+parameter,
+which is the time that the message was first submitted to
+.i sendmail .
+Note that the
+.i pri
+parameter is already weighted
+by the number of times the message has been tried
+(although this tends to lower the priority of the message with time);
+the expectation is that the
+.i ctime
+would be used as an
+.q "escape clause"
+to ensure that messages are eventually processed.
+.sh 3 "Refusing Incoming SMTP Connections"
+.pp
+The function
+.i refuseconnections
+returns
+.sm TRUE
+if incoming SMTP connections should be refused.
+The current implementation is based exclusively on the current load average
+and the refuse load average option
+(option
+.b X ,
+global variable
+.i RefuseLA ):
+.(b
+bool
+refuseconnections()
+{
+	return (CurrentLA >= RefuseLA);
+}
+.)b
+A more clever implementation
+could look at more system resources.
+.sh 3 "Load Average Computation"
+.pp
+The routine
+.i getla
+returns the current load average (as a rounded integer).
+The distribution includes several possible implementations.
+.sh 2 "Configuration in src/daemon.c"
+.pp
+The file
+.i src/daemon.c
+contains a number of routines that are dependent
+on the local networking environment.
+The version supplied assumes you have BSD style sockets.
+.pp
+In previous releases,
+we recommended that you modify the routine
+.i maphostname
+if you wanted to generalize
+.b $[
+\&...\&
+.b $]
+lookups.
+We now recommend that you create a new keyed map instead.
+.sh 1 "CHANGES IN VERSION 8"
+.pp
+The following summarizes changes
+since the last commonly available version of
+.i sendmail
+(5.67):
+.sh 2 "Connection Caching"
+.pp
+Instead of closing SMTP connections immediately,
+those connections are cached for possible future use.
+The advent of MX records made this effective for mailing lists;
+in addition,
+substantial performance improvements can be expected for queue processing.
+.sh 2 "MX Piggybacking"
+.pp
+If two hosts with different names in a single message
+happen to have the same set of MX hosts,
+they can be sent in the same transaction.
+Version 8 notices this and tries to batch the messages.
+.sh 2 "RFC 1123 Compliance"
+.pp
+A number of changes have been made to make
+.i sendmail
+.q "conditionally compliant"
+(that is,
+.i sendmail
+satisfies all of the
+.q MUST
+clauses and most but not all of the
+.q SHOULD
+clauses in RFC 1123).
+.pp
+The major areas of change are (numbers are RFC 1123 section numbers):
+.nr ii \w'5.3.1.1\0\0'u
+.ip 5.2.7
+Response to RCPT command is fast.
+.ip 5.2.8
+Numeric IP addresses are logged in Received: lines.
+.ip 5.2.17
+Self domain literal is properly handled.
+.ip 5.3.2
+Better control over individual timeouts.
+.ip 5.3.3
+Error messages are sent as
+.q From:<> .
+.ip 5.3.3
+Error messages are never sent to
+.q <> .
+.ip 5.3.3
+Route-addrs are pruned.
+.lp
+The areas in which
+.i sendmail
+is not
+.q "unconditionally compliant"
+are:
+.ip 5.2.6
+.i Sendmail
+does do header munging.
+.ip 5.2.10
+.i Sendmail
+doesn't always use the exact SMTP message text
+as listed in RFC 821.
+.ip 5.3.1.1
+.i Sendmail
+doesn't guarantee only one connect for each host in queue runs.
+.ip 5.3.1.1
+.i Sendmail
+doesn't always provide adequate concurrency limits.
+.sh 2 "Extended SMTP Support"
+.pp
+Version 8 includes both sending and receiving support for Extended
+SMTP support as defined by RFC 1425 (basic) and RFC 1427 (SIZE);
+and limited support for RFC 1426 (BODY).
+.sh 2 "Eight-Bit Clean"
+.pp
+Previous versions of
+.i sendmail
+used the 0200 bit for quoting.
+This version avoids that use.
+However, for compatibility with RFC 822,
+you can set option `7' to get seven bit stripping.
+.pp
+Individual mailers can still produce seven bit output using the
+`7' mailer flag.
+.sh 2 "User Database"
+.pp
+The user database is an as-yet experimental attempt
+to provide unified large-site name support.
+We are installing it at Berkeley;
+future versions may show significant modifications.
+.sh 2 "Improved BIND Support"
+.pp
+The BIND support,
+particularly for MX records,
+had a number of annoying
+.q features
+which have been removed in this release.
+In particular,
+these more tightly bind (pun intended) the name server to
+.i sendmail ,
+so that the name server resolution rules are incorporated directly into
+.b sendmail .
+.sh 2 "Keyed Files"
+.pp
+Generalized keyed files is an idea taken directly from
+.sm IDA
+.i sendmail
+(albeit with a completely different implementation).
+They can be useful on large sites.
+.pp
+Version 8 also understands YP.
+.sh 2 "Multi-Word Classes"
+.pp
+Classes can now be multiple words.
+For example,
+.(b
+CShofmann.CS.Berkeley.EDU
+.)b
+allows you to match the entire string
+.q hofmann.CS.Berkeley.EDU
+using the single construct
+.q $=S .
+.sh 2 "Deferred Macro Expansion"
+.pp
+The
+.b $& \c
+.i x
+construct has been adopted from
+.sm IDA .
+.sh 2 "IDENT Protocol Support"
+.pp
+The IDENT protocol as defined in RFC 1413 is supported.
+.sh 2 "Parsing Bug Fixes"
+.pp
+A number of small bugs having to do with things like
+backslash-escaped quotes inside of comments
+have been fixed.
+.sh 2 "Separate Envelope/Header Processing"
+.pp
+Since the From: line is passed in separately from the envelope sender,
+these have both been made visible;
+the
+.b $g
+macro is set to the envelope sender during processing
+of mailer argument vectors
+and the header sender during processing of headers.
+.pp
+It is also possible to specify separate per-mailer
+envelope and header processing.
+The
+.b S enderRWSet
+and
+.b R ecipientRWset
+arguments for mailers
+can be specified as
+.i envelope/header
+to give different rewritings for envelope versus header addresses.
+.sh 2 "Owner-List Propagates to Envelope"
+.pp
+When an alias has an associated owner\-list name,
+that alias is used to change the envelope sender address.
+This will cause downstream errors to be returned to that owner.
+.sh 2 "Dynamic Header Allocation"
+.pp
+The fixed size limit on header lines has been eliminated.
+.sh 2 "New Command Line Flags"
+.pp
+The
+.b \-B
+flag has been added to pass in body type information.
+.pp
+The
+.b \-p
+flag has been added
+to pass in protocol information.
+.pp
+The
+.b \-X
+flag has been added
+to allow logging of all protocol in and out of
+.i sendmail
+for debugging.
+.sh 2 "Enhanced Command Line Flags"
+.pp
+The
+.b \-q
+flag can limit limit a queue run to specific recipients, senders, or queue ids
+using
+.b \-qR\c
+.i substring ,
+.b \-qS\c
+.i substring ,
+or
+.b \-qI\c
+.i substring
+respectively.
+.sh 2 "New and Old Configuration Line Types"
+.pp
+The
+.b T
+(Trusted users) configuration line has been deleted.
+It will still be accepted but will be ignored.
+.pp
+The
+.b K
+line has been added to declare database maps.
+.pp
+The
+.b V
+line has been added to declare the configuration version level.
+.pp
+The
+.b M
+line has a
+.q D=
+field that lets you change into a temporary directory while that mailer
+is running.
+.sh 2 "New Options"
+.pp
+Several new options have been added,
+many to support new features,
+others to allow tuning that was previously available
+only by recompiling.
+They are described in detail in Section 5.1.5.
+Briefly,
+.nr ii 0.5i
+.ip b
+Insist on a minimum number of disk blocks.
+.ip C
+Set checkpoint interval.
+.ip E
+Default error message.
+.ip G
+Enable GECOS matching.
+.ip h
+Maximum hop count.
+.ip j
+Send errors in MIME-encapsulated format.
+.ip J
+Forward file path.
+.ip k
+Connection cache size
+.ip K
+Connection cache lifetime.
+.ip l
+Enable Errors-To: header.
+These headers violate RFC 1123;
+this option is included to provide back compatibility
+with old versions of
+.i sendmail .
+.ip O
+Set incoming SMTP daemon options, such as an alternate SMTP port.
+.ip p
+Privacy options.
+.ip R
+Don't prune route-addrs.
+.ip U
+User database spec.
+.ip V
+Fallback
+.q MX
+host.
+.ip w
+.q "Best MX"
+handling technique.
+.ip 7
+Do not run eight bit clean.
+.sh 2 "Extended Options"
+.pp
+The
+.b r
+(read timeout),
+.b I
+(use BIND),
+and
+.b T
+(queue timeout)
+options have been extended to pass in more information.
+.sh 2 "New Mailer Flags"
+.pp
+Several new mailer flags have been added.
+.ip a
+Try to use ESMTP when creating a connection.
+If this is not set,
+.i sendmail
+will still try if the other end hints that it knows about ESMTP
+in its greeting message;
+this flag says to try even if it doesn't hint.
+If the EHLO (extended hello)
+command fails,
+.i sendmail
+falls back to old SMTP.
+.ip b
+Ensure that there is a blank line at the end of all messages.
+.ip c
+Strip all comments from addresses;
+this should only be used as a last resort
+when dealing with cranky mailers.
+.ip g
+Never use the null sender as the envelope sender,
+even when running SMTP.
+Although this violates RFC 1123,
+it may be necessary when you must deal with some obnoxious old hosts.
+.ip 7
+Strip all output to 7 bits.
+.sh 2 "New Pre-Defined Macros"
+.pp
+The following macros are pre-defined:
+.ip $k
+The UUCP node name,
+nominally from
+.i uname (2)
+call.
+.ip $m
+The domain part of our full hostname.
+.ip $_
+The RFC 1413-provided sender address.
+.sh 2 "New LHS Token"
+.pp
+Version 8 allows
+.b $@
+on the Left Hand Side of an
+.q R
+line to match zero tokens.
+This is intended to be used to match the null input.
+.sh 2 "Bigger Defaults"
+.pp
+Version 8 allows up to 100 rulesets instead of 30.
+It is recommended that rulesets 0\-9 be reserved for
+.i sendmail 's
+dedicated use in future releases.
+.pp
+The total number of MX records that can be used has been raised to 20.
+.pp
+The number of queued messages that can be handled at one time
+has been raised from 600 to 1000.
+.sh 2 "Different Default Tuning Parameters"
+.pp
+Version 8 has changed the default parameters
+for tuning queue costs
+to make the number of recipients more important
+than the size of the message (for small messages).
+This is reasonable if you are connected with reasonably fast links.
+.sh 2 "Auto-Quoting in Addresses"
+.pp
+Previously, the
+.q "Full Name <email address>"
+syntax would generate incorrect protocol output
+if
+.q "Full Name"
+had special characters such as dot.
+This version puts quotes around such names.
+.sh 2 "Symbolic Names On Error Mailer"
+.pp
+Several names have been built in to the $@ portion of the $#error
+mailer.
+.sh 2 "SMTP VRFY Doesn't Expand"
+.pp
+Previous versions of
+.i sendmail
+treated VRFY and EXPN the same.
+In this version,
+VRFY doesn't expand aliases or follow .forward files.
+EXPN still does.
+.pp
+As an optimization, if you run with your default delivery mode being
+queue-only or deliver-in-background,
+the RCPT command will also not chase aliases and .forward files.
+It will chase them when it processes the queue.
+.sh 2 "[IPC] Mailers Allow Multiple Hosts"
+.pp
+When an address resolves to a mailer that has
+.q [IPC]
+as its
+.q Path ,
+the $@ part (host name)
+can be a colon-separated list of hosts instead of a single hostname.
+This asks
+.i sendmail
+to search the list for the first entry that is available
+exactly as though it were an MX record.
+The intent is to route internal traffic through internal networks
+without publishing an MX record to the net.
+MX expansion is still done on the individual items.
+.sh 2 "Aliases Extended"
+.pp
+The implementation has been merged with maps.
+Among other things,
+this supports NIS-based aliases.
+.sh 2 "Portability and Security Enhancements"
+.pp
+A number of internal changes have been made to enhance portability.
+.pp
+Several fixes have been made to increase the paranoia factor.
+.sh 2 "Miscellaneous Changes"
+.pp
+.i Sendmail
+writes a
+.i /etc/sendmail.pid
+file with the current process id of the SMTP daemon.
+.pp
+Two people using the same program in their .forward file
+are considered different
+so that duplicate elimination doesn't delete one of them.
+.pp
+The
+.i mailstats
+program prints mailer names
+and gets the location of the
+.i sendmail.st
+file from
+.i /etc/sendmail.cf .
+.pp
+Many minor bugs have been fixed, such as handling of backslashes
+inside of quotes.
+.pp
+A hook (ruleset 5) has been added
+to allow rewriting of local addresses after aliasing.
+.sh 1 "ACKNOWLEDGEMENTS"
+.pp
+I've worked on
+.i sendmail
+for many years,
+and many employers have been remarkably patient
+about letting me work on a large project
+that was not part of my official job.
+This includes time on the INGRES Project at Berkeley,
+at Britton Lee,
+and again on the Mammoth Project at Berkeley.
+.pp
+Much of the second wave of improvements
+should be credited to Bryan Costales of ICSI.
+As he passed me drafts of his book on
+.i sendmail
+I was inspired to start working on things again.
+Bryan was also available to bounce ideas off of.
+.pp
+Many, many people contributed chunks of code and ideas to
+.i sendmail .
+It has proven to be a group network effort.
+Version 8 in particular was a group project.
+The following people made notable contributions:
+.(l
+Keith Bostic, CSRG, University of California, Berkeley
+Michael J. Corrigan, University of California, San Diego
+Bryan Costales, International Computer Science Institute
+Pa\*:r (Pell) Emanuelsson
+Craig Everhart, Transarc Corporation
+Tom Ivar Helbekkmo, Norwegian School of Economics
+Allan E. Johannesen, WPI
+Jonathan Kamens, OpenVision Technologies, Inc.
+Takahiro Kanbe, Fuji Xerox Information Systems Co., Ltd.
+Brian Kantor, University of California, San Diego
+Murray S. Kucherawy, HookUp Communication Corp.
+Bruce Lilly, Sony U.S.
+Karl London
+Nakamura Motonori, Kyoto University
+John Gardiner Myers, Carnegie Mellon University
+Neil Rickert, Northern Illinois University
+Eric Schnoebelen, Convex Computer Corp.
+Eric Wassenaar, National Institute for Nuclear and High Energy Physics, Amsterdam
+Christophe Wolfhugel, Herve Schauer Consultants (Paris)
+.)l
+I apologize for anyone I have omitted, misspelled, misattributed, or
+otherwise missed.
+Many other people have contributed ideas, comments, and encouragement.
+I appreciate their contribution as well.
+.++ A
+.+c "COMMAND LINE FLAGS"
+.ba 0
+.nr ii 1i
+.pp
+Arguments must be presented with flags before addresses.
+The flags are:
+.ip \-b\fIx\fP
+Set operation mode to
+.i x .
+Operation modes are:
+.(b
+.ta 4n
+m	Deliver mail (default)
+s	Speak SMTP on input side
+d	Run as a daemon
+t	Run in test mode
+v	Just verify addresses, don't collect or deliver
+i	Initialize the alias database
+p	Print the mail queue
+.)b
+.ip \-B\fItype\fP
+Indicate body type.
+.ip \-C\fIfile\fP
+Use a different configuration file.
+.i Sendmail
+runs as the invoking user (rather than root)
+when this flag is specified.
+.ip \-d\fIlevel\fP
+Set debugging level.
+.ip "\-f\ \fIaddr\fP"
+The sender's machine address is
+.i addr .
+.ip \-F\fIname\fP
+Sets the full name of this user to
+.i name .
+.ip "\-h\ \fIcnt\fP"
+Sets the
+.q "hop count"
+to
+.i cnt .
+This represents the number of times this message has been processed
+by
+.i sendmail
+(to the extent that it is supported by the underlying networks).
+.i Cnt
+is incremented during processing,
+and if it reaches
+MAXHOP
+(currently 30)
+.i sendmail
+throws away the message with an error.
+.ip \-n
+Don't do aliasing or forwarding.
+.ip "\-r\ \fIaddr\fP"
+An obsolete form of
+.b \-f .
+.ip \-o\fIx\|value\fP
+Set option
+.i x
+to the specified
+.i value .
+These options are described in Appendix B.
+.ip \-p\fIprotocol\fP
+Set the sending protocol.
+Programs are encouraged to set this.
+The protocol field can be in the form
+.i protocol \c
+.b : \c
+.i host
+to set both the sending protocol and sending host.
+For example,
+.q \-pUUCP:uunet
+sets the sending protocol to UUCP
+and the sending host to uunet.
+(Some existing programs use \-oM to set the r and s macros;
+this is equivalent to using \-p.)
+.ip \-q\fItime\fP
+Try to process the queued up mail.
+If the time is given,
+a
+.i sendmail
+will run through the queue at the specified interval
+to deliver queued mail;
+otherwise, it only runs once.
+.ip \-q\fIXstring\fP
+Run the queue once,
+limiting the jobs to those matching
+.i Xstring .
+The key letter
+.i X
+can be
+.b I
+to limit based on queue identifier,
+.b R
+to limit based on recipient,
+or
+.b S
+to limit based on sender.
+A particular queued job is accepted if one of the corresponding addresses
+contains the indicated
+.i string .
+.ip \-t
+Read the header for
+.q To: ,
+.q Cc: ,
+and
+.q Bcc:
+lines, and send to everyone listed in those lists.
+The
+.q Bcc:
+line will be deleted before sending.
+Any addresses in the argument vector will be deleted
+from the send list.
+.ip "\-X \fIlogfile\fP"
+Log all traffic in and out of
+.i sendmail
+in the indicated
+.i logfile
+for debugging mailer problems.
+This produces a lot of data very quickly and should be used sparingly.
+.pp
+There are a number of options that may be specified as
+primitive flags.
+These are the e, i, m, and v options.
+Also,
+the f option
+may be specified as the
+.b \-s
+flag.
+.+c "QUEUE FILE FORMATS"
+.pp
+This appendix describes the format of the queue files.
+These files live in the directory defined by the
+.b Q
+option in the
+.i sendmail.cf
+file, usually
+.i /var/spool/mqueue
+or
+.i /usr/spool/mqueue .
+.pp
+All queue files have the name
+\fIx\fP\|\fBf\fP\fIAAA99999\fP
+where
+.i AAA99999
+is the
+.i id
+for this message
+and the
+.i x
+is a type.
+The first letter of the id encodes the hour of the day
+that the message was received by the system
+(with A being the hour between midnight and 1:00AM).
+All files with the same id collectively define one message.
+.pp
+The types are:
+.nr ii 0.5i
+.ip d
+The data file.
+The message body (excluding the header) is kept in this file.
+.ip l
+The lock file.
+If this file exists,
+the job is currently being processed,
+and a queue run will not process the file.
+For that reason,
+an extraneous
+.b lf
+file can cause a job to apparently disappear
+(it will not even time out!).
+[Actually, this file is obsolete on most systems that support the
+.b flock
+or
+.b lockf
+system calls.]
+.ip n
+This file is created when an id is being created.
+It is a separate file to insure that no mail can ever be destroyed
+due to a race condition.
+It should exist for no more than a few milliseconds
+at any given time.
+[This is only used on old versions of
+.i sendmail ;
+it is not used 
+on newer versions.]
+.ip q
+The queue control file.
+This file contains the information necessary to process the job.
+.ip t
+A temporary file.
+These are an image of the
+.b qf
+file when it is being rebuilt.
+It should be renamed to a
+.b qf
+file very quickly.
+.ip x
+A transcript file,
+existing during the life of a session
+showing everything that happens
+during that session.
+.pp
+The
+.b qf
+file is structured as a series of lines
+each beginning with a code letter.
+The lines are as follows:
+.ip D
+The name of the data file.
+There may only be one of these lines.
+.ip H
+A header definition.
+There may be any number of these lines.
+The order is important:
+they represent the order in the final message.
+These use the same syntax
+as header definitions in the configuration file.
+.ip C
+The controlling address.
+The syntax is
+.q localuser:aliasname .
+Recipient addresses following this line
+will be flagged so that deliveries will be run as the
+.i localuser
+(a user name from the /etc/passwd file);
+.i aliasname
+is the name of the alias that expanded to this address
+(used for printing messages).
+.ip R
+A recipient address.
+This will normally be completely aliased,
+but is actually realiased when the job is processed.
+There will be one line
+for each recipient.
+.ip S
+The sender address.
+There may only be one of these lines.
+.ip E
+An error address.
+If any such lines exist,
+they represent the addresses that should receive error messages.
+.ip T
+The job creation time.
+This is used to compute when to time out the job.
+.ip P
+The current message priority.
+This is used to order the queue.
+Higher numbers mean lower priorities.
+The priority changes
+as the message sits in the queue.
+The initial priority depends on the message class
+and the size of the message.
+.ip M
+A message.
+This line is printed by the
+.i mailq
+command,
+and is generally used to store status information.
+It can contain any text.
+.ip F
+Flag bits, represented as one letter per flag.
+Defined flag bits are
+.b r
+indicating that this is a response message
+and
+.b w
+indicating that a warning message has been sent
+announcing that the mail has been delayed.
+.ip $
+A macro definition.
+The values of certain macros
+(as of this writing, only
+.b $r
+and
+.b $s )
+are passed through to the queue run phase.
+.ip B
+The body type.
+The remainder of the line is a text string defining the body type.
+If this field is missing,
+the body type is assumed to be
+.q "undefined"
+and no special processing is attempted.
+Legal values are
+.q 7BIT
+and
+.q 8BITMIME .
+.pp
+As an example,
+the following is a queue file sent to
+.q eric@mammoth.Berkeley.EDU
+and
+.q bostic@okeeffe.CS.Berkeley.EDU \**:
+.(f
+\**This example is contrived and probably inaccurate for your environment.
+Glance over it to get an idea;
+nothing can replace looking at what your own system generates.
+.)f
+.(b
+P835771
+T404261372
+DdfAAA13557
+Seric
+Eowner-sendmail@vangogh.CS.Berkeley.EDU
+Ceric:sendmail@vangogh.CS.Berkeley.EDU
+Reric@mammoth.Berkeley.EDU
+Rbostic@okeeffe.CS.Berkeley.EDU
+H?P?return-path: <owner-sendmail@vangogh.CS.Berkeley.EDU>
+Hreceived: by vangogh.CS.Berkeley.EDU (5.108/2.7) id AAA06703;
+	Fri, 17 Jul 92 00:28:55 -0700
+Hreceived: from mail.CS.Berkeley.EDU by vangogh.CS.Berkeley.EDU (5.108/2.7)
+	id AAA06698; Fri, 17 Jul 92 00:28:54 -0700
+Hreceived: from [128.32.31.21] by mail.CS.Berkeley.EDU (5.96/2.5)
+	id AA22777; Fri, 17 Jul 92 03:29:14 -0400
+Hreceived: by foo.bar.baz.de (5.57/Ultrix3.0-C)
+	id AA22757; Fri, 17 Jul 92 09:31:25 GMT
+H?F?from: eric@foo.bar.baz.de (Eric Allman)
+H?x?full-name: Eric Allman
+Hmessage-id: <9207170931.AA22757@foo.bar.baz.de>
+HTo: sendmail@vangogh.CS.Berkeley.EDU
+Hsubject: this is an example message
+.)b
+This shows the name of the data file,
+the person who sent the message,
+the submission time
+(in seconds since January 1, 1970),
+the message priority,
+the message class,
+the recipients,
+and the headers for the message.
+.+c "SUMMARY OF SUPPORT FILES"
+.pp
+This is a summary of the support files
+that
+.i sendmail
+creates or generates.
+Many of these can be changed by editing the sendmail.cf file;
+check there to find the actual pathnames.
+.nr ii 1i
+.ip "/usr/\*(SD/sendmail"
+The binary of
+.i sendmail .
+.ip /usr/\*(SB/newaliases
+A link to /usr/\*(SD/sendmail;
+causes the alias database to be rebuilt.
+Running this program is completely equivalent to giving
+.i sendmail
+the
+.b \-bi
+flag.
+.ip /usr/\*(SB/mailq
+Prints a listing of the mail queue.
+This program is equivalent to using the
+.b \-bp
+flag to
+.i sendmail .
+.ip /etc/sendmail.cf
+The configuration file,
+in textual form.
+.ip /usr/lib/sendmail.hf
+The SMTP help file.
+.ip /etc/sendmail.st
+A statistics file; need not be present.
+.ip /etc/sendmail.pid
+Created in daemon mode;
+it contains the process id of the current SMTP daemon.
+If you use this in scripts;
+use ``head \-1'' to get just the first line;
+later versions of
+.i sendmail
+may add information to subsequent lines.
+.ip /etc/aliases
+The textual version of the alias file.
+.ip /etc/aliases.{pag,dir}
+The alias file in
+.i dbm \|(3)
+format.
+.ip /var/spool/mqueue
+The directory in which the mail queue
+and temporary files reside.
+.ip /var/spool/mqueue/qf*
+Control (queue) files for messages.
+.ip /var/spool/mqueue/df*
+Data files.
+.ip /var/spool/mqueue/tf*
+Temporary versions of the qf files,
+used during queue file rebuild.
+.ip /var/spool/mqueue/xf*
+A transcript of the current session.
+.\".ro
+.\".ls 1
+.\".tp
+.\".sp 2i
+.\".in 0
+.\".ce 100
+.\".sz 24
+.\".b SENDMAIL
+.\".sz 14
+.\".sp
+.\"INSTALLATION AND OPERATION GUIDE
+.\".sp
+.\".sz 10
+.\"Eric Allman
+.\"Britton-Lee, Inc.
+.\".sp
+.\"Version 8.36
+.\".ce 0
+.bp 2
+.rs
+.sp |4i
+.ce 2
+This page intentionally left blank;
+replace it with a blank sheet for double-sided output.
+.bp 3
+.ce
+.sz 12
+TABLE OF CONTENTS
+.sz 10
+.sp
+.\" remove some things to avoid "out of temp file space" problem
+.rm sh
+.rm (x
+.rm )x
+.rm ip
+.rm pp
+.rm lp
+.rm he
+.rm fo
+.rm eh
+.rm oh
+.rm ef
+.rm of
+.xp
diff --git a/usr.sbin/sendmail/doc/usenix/Makefile b/usr.sbin/sendmail/doc/usenix/Makefile
new file mode 100644
index 00000000000..ea0665c67be
--- /dev/null
+++ b/usr.sbin/sendmail/doc/usenix/Makefile
@@ -0,0 +1,12 @@
+#	@(#)Makefile	8.2 (Berkeley) 2/28/94
+
+SRCS=	usenix.me
+MACROS=	-me
+
+all: usenix.ps
+
+usenix.ps: ${SRCS}
+	rm -f ${.TARGET}
+	${PIC} ${SRCS} | ${ROFF} > ${.TARGET}
+
+.include <bsd.doc.mk>
diff --git a/usr.sbin/sendmail/doc/usenix/usenix.me b/usr.sbin/sendmail/doc/usenix/usenix.me
new file mode 100644
index 00000000000..0fbb6723c13
--- /dev/null
+++ b/usr.sbin/sendmail/doc/usenix/usenix.me
@@ -0,0 +1,1076 @@
+.nr si 3n
+.he 'Mail Systems and Addressing in 4.2bsd''%'
+.fo 'Version 8.2'USENIX \- Jan 83'Last Mod 11/27/93'
+.if n .ls 2
+.+c
+.(l C
+.sz 14
+Mail Systems and Addressing
+in 4.2bsd
+.sz
+.sp
+Eric Allman*
+.sp 0.5
+.i
+Britton-Lee, Inc.
+1919 Addison Street, Suite 105.
+Berkeley, California 94704.
+.sp 0.5
+.r
+eric@Berkeley.ARPA
+ucbvax!eric
+.)l
+.sp
+.(l F
+.ce
+ABSTRACT
+.sp \n(psu
+Routing mail through a heterogeneous internet presents many new
+problems.
+Among the worst of these is that of address mapping.
+Historically, this has been handled on an ad hoc basis.
+However,
+this approach has become unmanageable as internets grow.
+.sp \n(psu
+Sendmail acts a unified
+.q "post office"
+to which all mail can be
+submitted.
+Address interpretation is controlled by a production
+system,
+which can parse both old and new format addresses.
+The
+new format is
+.q "domain-based,"
+a flexible technique that can
+handle many common situations.
+Sendmail is not intended to perform
+user interface functions.
+.sp \n(psu
+Sendmail will replace delivermail in the Berkeley 4.2 distribution.
+Several major hosts are now or will soon be running sendmail.
+This change will affect any users that route mail through a sendmail
+gateway.
+The changes that will be user visible are emphasized.
+.)l
+.sp 2
+.(f
+*A considerable part of this work
+was done while under the employ
+of the INGRES Project
+at the University of California at Berkeley.
+.)f
+.pp
+The mail system to appear in 4.2bsd
+will contain a number of changes.
+Most of these changes are based on the replacement of
+.i delivermail
+with a new module called
+.i sendmail.
+.i Sendmail
+implements a general internetwork mail routing facility,
+featuring aliasing and forwarding,
+automatic routing to network gateways,
+and flexible configuration.
+Of key interest to the mail system user
+will be the changes in the network addressing structure.
+.pp
+In a simple network,
+each node has an address,
+and resources can be identified
+with a host-resource pair;
+in particular,
+the mail system can refer to users
+using a host-username pair.
+Host names and numbers have to be administered by a central authority,
+but usernames can be assigned locally to each host.
+.pp
+In an internet,
+multiple networks with different characteristics
+and managements
+must communicate.
+In particular,
+the syntax and semantics of resource identification change.
+Certain special cases can be handled trivially
+by
+.i "ad hoc"
+techniques,
+such as
+providing network names that appear local to hosts
+on other networks,
+as with the Ethernet at Xerox PARC.
+However, the general case is extremely complex.
+For example,
+some networks require that the route the message takes
+be explicitly specified by the sender,
+simplifying the database update problem
+since only adjacent hosts must be entered
+into the system tables,
+while others use logical addressing,
+where the sender specifies the location of the recipient
+but not how to get there.
+Some networks use a left-associative syntax
+and others use a right-associative syntax,
+causing ambiguity in mixed addresses.
+.pp
+Internet standards seek to eliminate these problems.
+Initially, these proposed expanding the address pairs
+to address triples,
+consisting of
+{network, host, username}
+triples.
+Network numbers must be universally agreed upon,
+and hosts can be assigned locally
+on each network.
+The user-level presentation was changed
+to address domains,
+comprised of a local resource identification
+and a hierarchical domain specification
+with a common static root.
+The domain technique
+separates the issue of physical versus logical addressing.
+For example,
+an address of the form
+.q "eric@a.cc.berkeley.arpa"
+describes the logical
+organization of the address space
+(user
+.q eric
+on host
+.q a
+in the Computer Center
+at Berkeley)
+but not the physical networks used
+(for example, this could go over different networks
+depending on whether
+.q a
+were on an ethernet
+or a store-and-forward network).
+.pp
+.i Sendmail
+is intended to help bridge the gap
+between the totally
+.i "ad hoc"
+world
+of networks that know nothing of each other
+and the clean, tightly-coupled world
+of unique network numbers.
+It can accept old arbitrary address syntaxes,
+resolving ambiguities using heuristics
+specified by the system administrator,
+as well as domain-based addressing.
+It helps guide the conversion of message formats
+between disparate networks.
+In short,
+.i sendmail
+is designed to assist a graceful transition
+to consistent internetwork addressing schemes.
+.sp
+.pp
+Section 1 defines some of the terms
+frequently left fuzzy
+when working in mail systems.
+Section 2 discusses the design goals for
+.i sendmail .
+In section 3,
+the new address formats
+and basic features of
+.i sendmail
+are described.
+Section 4 discusses some of the special problems
+of the UUCP network.
+The differences between
+.i sendmail
+and
+.i delivermail
+are presented in section 5.
+.sp
+.(l F
+.b DISCLAIMER:
+A number of examples
+in this paper
+use names of actual people
+and organizations.
+This is not intended
+to imply a commitment
+or even an intellectual agreement
+on the part of these people or organizations.
+In particular,
+Bell Telephone Laboratories (BTL),
+Digital Equipment Corporation (DEC),
+Lawrence Berkeley Laboratories (LBL),
+Britton-Lee Incorporated (BLI),
+and the University of California at Berkeley
+are not committed to any of these proposals at this time.
+Much of this paper
+represents no more than
+the personal opinions of the author.
+.)l
+.sh 1 "DEFINITIONS"
+.pp
+There are four basic concepts
+that must be clearly distinguished
+when dealing with mail systems:
+the user (or the user's agent),
+the user's identification,
+the user's address,
+and the route.
+These are distinguished primarily by their position independence.
+.sh 2 "User and Identification"
+.pp
+The user is the being
+(a person or program)
+that is creating or receiving a message.
+An
+.i agent
+is an entity operating on behalf of the user \*-
+such as a secretary who handles my mail.
+or a program that automatically returns a
+message such as
+.q "I am at the UNICOM conference."
+.pp
+The identification is the tag
+that goes along with the particular user.
+This tag is completely independent of location.
+For example,
+my identification is the string
+.q "Eric Allman,"
+and this identification does not change
+whether I am located at U.C. Berkeley,
+at Britton-Lee,
+or at a scientific institute in Austria.
+.pp
+Since the identification is frequently ambiguous
+(e.g., there are two
+.q "Robert Henry" s
+at Berkeley)
+it is common to add other disambiguating information
+that is not strictly part of the identification
+(e.g.,
+Robert
+.q "Code Generator"
+Henry
+versus
+Robert
+.q "System Administrator"
+Henry).
+.sh 2 "Address"
+.pp
+The address specifies a location.
+As I move around,
+my address changes.
+For example,
+my address might change from
+.q eric@Berkeley.ARPA
+to
+.q eric@bli.UUCP
+or
+.q allman@IIASA.Austria
+depending on my current affiliation.
+.pp
+However,
+an address is independent of the location of anyone else.
+That is,
+my address remains the same to everyone who might be sending me mail.
+For example,
+a person at MIT and a person at USC
+could both send to
+.q eric@Berkeley.ARPA
+and have it arrive to the same mailbox.
+.pp
+Ideally a
+.q "white pages"
+service would be provided to map user identifications
+into addresses
+(for example, see
+[Solomon81]).
+Currently this is handled by passing around
+scraps of paper
+or by calling people on the telephone
+to find out their address.
+.sh 2 "Route"
+.pp
+While an address specifies
+.i where
+to find a mailbox,
+a route specifies
+.i how
+to find the mailbox.
+Specifically,
+it specifies a path
+from sender to receiver.
+As such, the route is potentially different
+for every pair of people in the electronic universe.
+.pp
+Normally the route is hidden from the user
+by the software.
+However,
+some networks put the burden of determining the route
+onto the sender.
+Although this simplifies the software,
+it also greatly impairs the usability
+for most users.
+The UUCP network is an example of such a network.
+.sh 1 "DESIGN GOALS"
+.pp
+Design goals for
+.i sendmail \**
+.(f
+\**This section makes no distinction between
+.i delivermail
+and
+.i sendmail.
+.)f
+include:
+.np
+Compatibility with the existing mail programs,
+including Bell version 6 mail,
+Bell version 7 mail,
+Berkeley
+.i Mail
+[Shoens79],
+BerkNet mail
+[Schmidt79],
+and hopefully UUCP mail
+[Nowitz78].
+ARPANET mail
+[Crocker82]
+was also required.
+.np
+Reliability, in the sense of guaranteeing
+that every message is correctly delivered
+or at least brought to the attention of a human
+for correct disposal;
+no message should ever be completely lost.
+This goal was considered essential
+because of the emphasis on mail in our environment.
+It has turned out to be one of the hardest goals to satisfy,
+especially in the face of the many anomalous message formats
+produced by various ARPANET sites.
+For example,
+certain sites generate improperly formated addresses,
+occasionally
+causing error-message loops.
+Some hosts use blanks in names,
+causing problems with
+mail programs that assume that an address
+is one word.
+The semantics of some fields
+are interpreted slightly differently
+by different sites.
+In summary,
+the obscure features of the ARPANET mail protocol
+really
+.i are
+used and
+are difficult to support,
+but must be supported.
+.np
+Existing software to do actual delivery
+should be used whenever possible.
+This goal derives as much from political and practical considerations
+as technical.
+.np
+Easy expansion to
+fairly complex environments,
+including multiple
+connections to a single network type
+(such as with multiple UUCP or Ethernets).
+This goal requires consideration of the contents of an address
+as well as its syntax
+in order to determine which gateway to use.
+.np
+Configuration information should not be compiled into the code.
+A single compiled program should be able to run as is at any site
+(barring such basic changes as the CPU type or the operating system).
+We have found this seemingly unimportant goal
+to be critical in real life.
+Besides the simple problems that occur when any program gets recompiled
+in a different environment,
+many sites like to
+.q fiddle
+with anything that they will be recompiling anyway.
+.np
+.i Sendmail
+must be able to let various groups maintain their own mailing lists,
+and let individuals specify their own forwarding,
+without modifying the system alias file.
+.np
+Each user should be able to specify which mailer to execute
+to process mail being delivered for him.
+This feature allows users who are using specialized mailers
+that use a different format to build their environment
+without changing the system,
+and facilitates specialized functions
+(such as returning an
+.q "I am on vacation"
+message).
+.np
+Network traffic should be minimized
+by batching addresses to a single host where possible,
+without assistance from the user.
+.pp
+These goals motivated the architecture illustrated in figure 1.
+.(z
+.hl
+.ie t \
+.	sp 18
+.el \{\
+.(c
++---------+   +---------+   +---------+
+| sender1 |   | sender2 |   | sender3 |
++---------+   +---------+   +---------+
+     |  	   |             |
+     +----------+  +  +----------+
+		|  |  |
+		v  v  v
+            +-------------+
+            |   sendmail  |
+            +-------------+
+		|  |  |
+     +----------+  +  +----------+
+     |  	   |             |
+     v             v             v
++---------+   +---------+   +---------+
+| mailer1 |   | mailer2 |   | mailer3 |
++---------+   +---------+   +---------+
+.)c
+.\}
+
+.ce
+Figure 1 \*- Sendmail System Structure.
+.hl
+.)z
+The user interacts with a mail generating and sending program.
+When the mail is created,
+the generator calls
+.i sendmail ,
+which routes the message to the correct mailer(s).
+Since some of the senders may be network servers
+and some of the mailers may be network clients,
+.i sendmail
+may be used as an internet mail gateway.
+.sh 1 "USAGE"
+.sh 2 "Address Formats"
+.pp
+Arguments may be flags or addresses.
+Flags set various processing options.
+Following flag arguments,
+address arguments may be given.
+Addresses follow the syntax in RFC822
+[Crocker82]
+for ARPANET
+address formats.
+In brief, the format is:
+.np
+Anything in parentheses is thrown away
+(as a comment).
+.np
+Anything in angle brackets (\c
+.q "<\|>" )
+is preferred
+over anything else.
+This rule implements the ARPANET standard that addresses of the form
+.(b
+user name <machine-address>
+.)b
+will send to the electronic
+.q machine-address
+rather than the human
+.q "user name."
+.np
+Double quotes
+(\ "\ )
+quote phrases;
+backslashes quote characters.
+Backslashes are more powerful
+in that they will cause otherwise equivalent phrases
+to compare differently \*- for example,
+.i user
+and
+.i
+"user"
+.r
+are equivalent,
+but
+.i \euser
+is different from either of them.
+This might be used
+to avoid normal aliasing
+or duplicate suppression algorithms.
+.pp
+Parentheses, angle brackets, and double quotes
+must be properly balanced and nested.
+The rewriting rules control remaining parsing\**.
+.(f
+\**Disclaimer: Some special processing is done
+after rewriting local names; see below.
+.)f
+.pp
+Although old style addresses are still accepted
+in most cases,
+the preferred address format
+is based on ARPANET-style domain-based addresses
+[Su82a].
+These addresses are based on a hierarchical, logical decomposition
+of the address space.
+The addresses are hierarchical in a sense
+similar to the U.S. postal addresses:
+the messages may first be routed to the correct state,
+with no initial consideration of the city
+or other addressing details.
+The addresses are logical
+in that each step in the hierarchy
+corresponds to a set of
+.q "naming authorities"
+rather than a physical network.
+.pp
+For example,
+the address:
+.(l
+eric@HostA.BigSite.ARPA
+.)l
+would first look up the domain
+BigSite
+in the namespace administrated by
+ARPA.
+A query could then be sent to
+BigSite
+for interpretation of
+HostA.
+Eventually the mail would arrive at
+HostA,
+which would then do final delivery
+to user
+.q eric.
+.sh 2 "Mail to Files and Programs"
+.pp
+Files and programs are legitimate message recipients.
+Files provide archival storage of messages,
+useful for project administration and history.
+Programs are useful as recipients in a variety of situations,
+for example,
+to maintain a public repository of systems messages
+(such as the Berkeley
+.i msgs
+program).
+.pp
+Any address passing through the initial parsing algorithm
+as a local address
+(i.e, not appearing to be a valid address for another mailer)
+is scanned for two special cases.
+If prefixed by a vertical bar (\c
+.q \^|\^ )
+the rest of the address is processed as a shell command.
+If the user name begins with a slash mark (\c
+.q /\^ )
+the name is used as a file name,
+instead of a login name.
+.sh 2 "Aliasing, Forwarding, Inclusion"
+.pp
+.i Sendmail
+reroutes mail three ways.
+Aliasing applies system wide.
+Forwarding allows each user to reroute incoming mail
+destined for that account.
+Inclusion directs
+.i sendmail
+to read a file for a list of addresses,
+and is normally used
+in conjunction with aliasing.
+.sh 3 "Aliasing"
+.pp
+Aliasing maps local addresses to address lists using a system-wide file.
+This file is hashed to speed access.
+Only addresses that parse as local
+are allowed as aliases;
+this guarantees a unique key
+(since there are no nicknames for the local host).
+.sh 3 "Forwarding"
+.pp
+After aliasing,
+if an recipient address specifies a local user
+.i sendmail
+searches for a
+.q .forward
+file in the recipient's home directory.
+If it exists,
+the message is
+.i not
+sent to that user,
+but rather to the list of addresses in that file.
+Often
+this list will contain only one address,
+and the feature will be used for network mail forwarding.
+.pp
+Forwarding also permits a user to specify a private incoming mailer.
+For example,
+forwarding to:
+.(b
+"\^|\|/usr/local/newmail myname"
+.)b
+will use a different incoming mailer.
+.sh 3 "Inclusion"
+.pp
+Inclusion is specified in RFC 733 [Crocker77] syntax:
+.(b
+:Include: pathname
+.)b
+An address of this form reads the file specified by
+.i pathname
+and sends to all users listed in that file.
+.pp
+The intent is
+.i not
+to support direct use of this feature,
+but rather to use this as a subset of aliasing.
+For example,
+an alias of the form:
+.(b
+project: :include:/usr/project/userlist
+.)b
+is a method of letting a project maintain a mailing list
+without interaction with the system administration,
+even if the alias file is protected.
+.pp
+It is not necessary to rebuild the index on the alias database
+when a :include: list is changed.
+.sh 2 "Message Collection"
+.pp
+Once all recipient addresses are parsed and verified,
+the message is collected.
+The message comes in two parts:
+a message header and a message body,
+separated by a blank line.
+The body is an uninterpreted
+sequence of text lines.
+.pp
+The header is formated as a series of lines
+of the form
+.(b
+	field-name: field-value
+.)b
+Field-value can be split across lines by starting the following
+lines with a space or a tab.
+Some header fields have special internal meaning,
+and have appropriate special processing.
+Other headers are simply passed through.
+Some header fields may be added automatically,
+such as time stamps.
+.sh 1 "THE UUCP PROBLEM"
+.pp
+Of particular interest
+is the UUCP network.
+The explicit routing
+used in the UUCP environment
+causes a number of serious problems.
+First,
+giving out an address
+is impossible
+without knowing the address of your potential correspondent.
+This is typically handled
+by specifying the address
+relative to some
+.q "well-known"
+host
+(e.g.,
+ucbvax or decvax).
+Second,
+it is often difficult to compute
+the set of addresses
+to reply to
+without some knowledge
+of the topology of the network.
+Although it may be easy for a human being
+to do this
+under many circumstances,
+a program does not have equally sophisticated heuristics
+built in.
+Third,
+certain addresses will become painfully and unnecessarily long,
+as when a message is routed through many hosts in the USENET.
+And finally,
+certain
+.q "mixed domain"
+addresses
+are impossible to parse unambiguously \*-
+e.g.,
+.(l
+decvax!ucbvax!lbl-h!user@LBL-CSAM
+.)l
+might have many possible resolutions,
+depending on whether the message was first routed
+to decvax
+or to LBL-CSAM.
+.pp
+To solve this problem,
+the UUCP syntax
+would have to be changed to use addresses
+rather than routes.
+For example,
+the address
+.q decvax!ucbvax!eric
+might be expressed as
+.q eric@ucbvax.UUCP
+(with the hop through decvax implied).
+This address would itself be a domain-based address;
+for example,
+an address might be of the form:
+.(l
+mark@d.cbosg.btl.UUCP
+.)l
+Hosts outside of Bell Telephone Laboratories
+would then only need to know
+how to get to a designated BTL relay,
+and the BTL topology
+would only be maintained inside Bell.
+.pp
+There are three major problems
+associated with turning UUCP addresses
+into something reasonable:
+defining the namespace,
+creating and propagating the necessary software,
+and building and maintaining the database.
+.sh 2 "Defining the Namespace"
+.pp
+Putting all UUCP hosts into a flat namespace
+(e.g.,
+.q \&...@host.UUCP )
+is not practical for a number of reasons.
+First,
+with over 1600 sites already,
+and (with the increasing availability of inexpensive microcomputers
+and autodialers)
+several thousand more coming within a few years,
+the database update problem
+is simply intractable
+if the namespace is flat.
+Second,
+there are almost certainly name conflicts today.
+Third,
+as the number of sites grow
+the names become ever less mnemonic.
+.pp
+It seems inevitable
+that there be some sort of naming authority
+for the set of top level names
+in the UUCP domain,
+as unpleasant a possibility
+as that may seem.
+It will simply not be possible
+to have one host resolving all names.
+It may however be possible
+to handle this
+in a fashion similar to that of assigning names of newsgroups
+in USENET.
+However,
+it will be essential to encourage everyone
+to become subdomains of an existing domain
+whenever possible \*-
+even though this will certainly bruise some egos.
+For example,
+if a new host named
+.q blid
+were to be added to the UUCP network,
+it would probably actually be addressed as
+.q d.bli.UUCP
+(i.e.,
+as host
+.q d
+in the pseudo-domain
+.q bli
+rather than as host
+.q blid
+in the UUCP domain).
+.sh 2 "Creating and Propagating the Software"
+.pp
+The software required to implement a consistent namespace
+is relatively trivial.
+Two modules are needed,
+one to handle incoming mail
+and one to handle outgoing mail.
+.pp
+The incoming module
+must be prepared to handle either old or new style addresses.
+New-style addresses
+can be passed through unchanged.
+Old style addresses
+must be turned into new style addresses
+where possible.
+.pp
+The outgoing module
+is slightly trickier.
+It must do a database lookup on the recipient addresses
+(passed on the command line)
+to determine what hosts to send the message to.
+If those hosts do not accept new-style addresses,
+it must transform all addresses in the header of the message
+into old style using the database lookup.
+.pp
+Both of these modules
+are straightforward
+except for the issue of modifying the header.
+It seems prudent to choose one format
+for the message headers.
+For a number of reasons,
+Berkeley has elected to use the ARPANET protocols
+for message formats.
+However,
+this protocol is somewhat difficult to parse.
+.pp
+Propagation is somewhat more difficult.
+There are a large number of hosts
+connected to UUCP
+that will want to run completely standard systems
+(for very good reasons).
+The strategy is not to convert the entire network \*-
+only enough of it it alleviate the problem.
+.sh 2 "Building and Maintaining the Database"
+.pp
+This is by far the most difficult problem.
+A prototype for this database
+already exists,
+but it is maintained by hand
+and does not pretend to be complete.
+.pp
+This problem will be reduced considerably
+if people choose to group their hosts
+into subdomains.
+This would require a global update
+only when a new top level domain
+joined the network.
+A message to a host in a subdomain
+could simply be routed to a known domain gateway
+for further processing.
+For example,
+the address
+.q eric@a.bli.UUCP
+might be routed to the
+.q bli
+gateway
+for redistribution;
+new hosts could be added
+within BLI
+without notifying the rest of the world.
+Of course,
+other hosts
+.i could
+be notified as an efficiency measure.
+.pp
+There may be more than one domain gateway.
+A domain such as BTL,
+for instance,
+might have a dozen gateways to the outside world;
+a non-BTL site
+could choose the closest gateway.
+The only restriction
+would be that all gateways
+maintain a consistent view of the domain
+they represent.
+.sh 2 "Logical Structure"
+.pp
+Logically,
+domains are organized into a tree.
+There need not be a host actually associated
+with each level in the tree \*-
+for example,
+there will be no host associated with the name
+.q UUCP.
+Similarly,
+an organization might group names together for administrative reasons;
+for example,
+the name
+.(l
+CAD.research.BigCorp.UUCP
+.)l
+might not actually have a host representing
+.q research.
+.pp
+However,
+it may frequently be convenient to have a host
+or hosts
+that
+.q represent
+a domain.
+For example,
+if a single host exists that
+represents
+Berkeley,
+then mail from outside Berkeley
+can forward mail to that host
+for further resolution
+without knowing Berkeley's
+(rather volatile)
+topology.
+This is not unlike the operation
+of the telephone network.
+.pp
+This may also be useful
+inside certain large domains.
+For example,
+at Berkeley it may be presumed
+that most hosts know about other hosts
+inside the Berkeley domain.
+But if they process an address
+that is unknown,
+they can pass it
+.q upstairs
+for further examination.
+Thus as new hosts are added
+only one host
+(the domain master)
+.i must
+be updated immediately;
+other hosts can be updated as convenient.
+.pp
+Ideally this name resolution process
+would be performed by a name server
+(e.g., [Su82b])
+to avoid unnecessary copying
+of the message.
+However,
+in a batch network
+such as UUCP
+this could result in unnecessary delays.
+.sh 1 "COMPARISON WITH DELIVERMAIL"
+.pp
+.i Sendmail
+is an outgrowth of
+.i delivermail .
+The primary differences are:
+.np
+Configuration information is not compiled in.
+This change simplifies many of the problems
+of moving to other machines.
+It also allows easy debugging of new mailers.
+.np
+Address parsing is more flexible.
+For example,
+.i delivermail
+only supported one gateway to any network,
+whereas
+.i sendmail
+can be sensitive to host names
+and reroute to different gateways.
+.np
+Forwarding and
+:include:
+features eliminate the requirement that the system alias file
+be writable by any user
+(or that an update program be written,
+or that the system administration make all changes).
+.np
+.i Sendmail
+supports message batching across networks
+when a message is being sent to multiple recipients.
+.np
+A mail queue is provided in
+.i sendmail.
+Mail that cannot be delivered immediately
+but can potentially be delivered later
+is stored in this queue for a later retry.
+The queue also provides a buffer against system crashes;
+after the message has been collected
+it may be reliably redelivered
+even if the system crashes during the initial delivery.
+.np
+.i Sendmail
+uses the networking support provided by 4.2BSD
+to provide a direct interface networks such as the ARPANET
+and/or Ethernet
+using SMTP (the Simple Mail Transfer Protocol)
+over a TCP/IP connection.
+.+c
+.ce
+REFERENCES
+.nr ii 1.5i
+.ip [Crocker77]
+Crocker, D. H.,
+Vittal, J. J.,
+Pogran, K. T.,
+and
+Henderson, D. A. Jr.,
+.ul
+Standard for the Format of ARPA Network Text Messages.
+RFC 733,
+NIC 41952.
+In [Feinler78].
+November 1977.
+.ip [Crocker82]
+Crocker, D. H.,
+.ul
+Standard for the Format of Arpa Internet Text Messages.
+RFC 822.
+Network Information Center,
+SRI International,
+Menlo Park, California.
+August 1982.
+.ip [Feinler78]
+Feinler, E.,
+and
+Postel, J.
+(eds.),
+.ul
+ARPANET Protocol Handbook.
+NIC 7104,
+Network Information Center,
+SRI International,
+Menlo Park, California.
+1978.
+.ip [Nowitz78]
+Nowitz, D. A.,
+and
+Lesk, M. E.,
+.ul
+A Dial-Up Network of UNIX Systems.
+Bell Laboratories.
+In
+UNIX Programmer's Manual, Seventh Edition,
+Volume 2.
+August, 1978.
+.ip [Schmidt79]
+Schmidt, E.,
+.ul
+An Introduction to the Berkeley Network.
+University of California, Berkeley California.
+1979.
+.ip [Shoens79]
+Shoens, K.,
+.ul
+Mail Reference Manual.
+University of California, Berkeley.
+In UNIX Programmer's Manual,
+Seventh Edition,
+Volume 2C.
+December 1979.
+.ip [Solomon81]
+Solomon, M.,
+Landweber, L.,
+and
+Neuhengen, D.,
+.ul
+The Design of the CSNET Name Server.
+CS-DN-2.
+University of Wisconsin,
+Madison.
+October 1981.
+.ip [Su82a]
+Su, Zaw-Sing,
+and
+Postel, Jon,
+.ul
+The Domain Naming Convention for Internet User Applications.
+RFC819.
+Network Information Center,
+SRI International,
+Menlo Park, California.
+August 1982.
+.ip [Su82b]
+Su, Zaw-Sing,
+.ul
+A Distributed System for Internet Name Service.
+RFC830.
+Network Information Center,
+SRI International,
+Menlo Park, California.
+October 1982.
diff --git a/usr.sbin/sendmail/mailstats/Makefile b/usr.sbin/sendmail/mailstats/Makefile
new file mode 100644
index 00000000000..d6a04f0bdc1
--- /dev/null
+++ b/usr.sbin/sendmail/mailstats/Makefile
@@ -0,0 +1,8 @@
+#	@(#)Makefile	8.1 (Berkeley) 6/7/93
+
+PROG=	mailstats
+CFLAGS+=-I${.CURDIR}/../src
+NOMAN=	noman
+
+.include "../../Makefile.inc"
+.include <bsd.prog.mk>
diff --git a/usr.sbin/sendmail/mailstats/mailstats.c b/usr.sbin/sendmail/mailstats/mailstats.c
new file mode 100644
index 00000000000..1e11b014cd0
--- /dev/null
+++ b/usr.sbin/sendmail/mailstats/mailstats.c
@@ -0,0 +1,209 @@
+/*
+ * Copyright (c) 1983 Eric P. Allman
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ */
+
+#ifndef lint
+static char copyright[] =
+"@(#) Copyright (c) 1988, 1993\n\
+	The Regents of the University of California.  All rights reserved.\n";
+#endif /* not lint */
+
+#ifndef lint
+static char sccsid[] = "@(#)mailstats.c	8.3 (Berkeley) 12/27/93";
+#endif /* not lint */
+
+#include <sendmail.h>
+#include <mailstats.h>
+#include <pathnames.h>
+
+#define MNAMELEN	20	/* max length of mailer name */
+
+main(argc, argv)
+	int argc;
+	char **argv;
+{
+	extern char *optarg;
+	extern int optind;
+	struct statistics stat;
+	register int i;
+	int mno;
+	int ch, fd;
+	char *sfile;
+	char *cfile;
+	FILE *cfp;
+	bool mnames;
+	long frmsgs = 0, frbytes = 0, tomsgs = 0, tobytes = 0;
+	char mtable[MAXMAILERS][MNAMELEN+1];
+	char sfilebuf[100];
+	char buf[MAXLINE];
+	extern char *ctime();
+
+	cfile = _PATH_SENDMAILCF;
+	sfile = NULL;
+	mnames = TRUE;
+	while ((ch = getopt(argc, argv, "C:f:o")) != EOF)
+	{
+		switch (ch)
+		{
+		  case 'C':
+			cfile = optarg;
+			break;
+
+		  case 'f':
+			sfile = optarg;
+			break;
+
+		  case 'o':
+			mnames = FALSE;
+			break;
+
+		  case '?':
+		  default:
+  usage:
+			fputs("usage: mailstats [-C cffile] [-f stfile]\n", stderr);
+			exit(EX_USAGE);
+		}
+	}
+	argc -= optind;
+	argv += optind;
+
+	if (argc != 0)
+		goto usage;
+
+	if ((cfp = fopen(cfile, "r")) == NULL)
+	{
+		fprintf(stderr, "mailstats: ");
+		perror(cfile);
+		exit(EX_NOINPUT);
+	}
+
+	mno = 0;
+	(void) strcpy(mtable[mno++], "prog");
+	(void) strcpy(mtable[mno++], "*file*");
+	(void) strcpy(mtable[mno++], "*include*");
+
+	while (fgets(buf, sizeof(buf), cfp) != NULL)
+	{
+		register char *b;
+		char *s;
+		register char *m;
+
+		b = buf;
+		switch (*b++)
+		{
+		  case 'M':		/* mailer definition */
+			break;
+
+		  case 'O':		/* option -- see if .st file */
+			if (*b++ != 'S')
+				continue;
+
+			/* yep -- save this */
+			strcpy(sfilebuf, b);
+			b = strchr(sfilebuf, '\n');
+			if (b != NULL)
+				*b = '\0';
+			if (sfile == NULL)
+				sfile = sfilebuf;
+
+		  default:
+			continue;
+		}
+
+		if (mno >= MAXMAILERS)
+		{
+			fprintf(stderr,
+				"Too many mailers defined, %d max.\n",
+				MAXMAILERS);
+			exit(EX_SOFTWARE);
+		}
+		m = mtable[mno];
+		s = m + MNAMELEN;		/* is [MNAMELEN+1] */
+		while (*b != ',' && !isspace(*b) && *b != '\0' && m < s)
+			*m++ = *b++;
+		*m = '\0';
+		for (i = 0; i < mno; i++)
+		{
+			if (strcmp(mtable[i], mtable[mno]) == 0)
+				break;
+		}
+		if (i == mno)
+			mno++;
+	}
+	(void) fclose(cfp);
+	for (; mno < MAXMAILERS; mno++)
+		mtable[mno][0]='\0';
+
+	if (sfile == NULL)
+	{
+		fprintf(stderr, "mailstats: no statistics file located\n");
+		exit (EX_OSFILE);
+	}
+
+	if ((fd = open(sfile, O_RDONLY)) < 0) {
+		fputs("mailstats: ", stderr);
+		perror(sfile);
+		exit(EX_NOINPUT);
+	}
+	if (read(fd, &stat, sizeof(stat)) != sizeof(stat) ||
+	    stat.stat_size != sizeof(stat))
+	{
+		fputs("mailstats: file size changed.\n", stderr);
+		exit(EX_OSERR);
+	}
+
+	printf("Statistics from %s", ctime(&stat.stat_itime));
+	printf(" M msgsfr bytes_from  msgsto   bytes_to%s\n",
+		mnames ? "  Mailer" : "");
+	for (i = 0; i < MAXMAILERS; i++)
+	{
+		if (stat.stat_nf[i] || stat.stat_nt[i])
+		{
+			printf("%2d %6ld %10ldK %6ld %10ldK", i,
+			    stat.stat_nf[i], stat.stat_bf[i],
+			    stat.stat_nt[i], stat.stat_bt[i]);
+			if (mnames)
+				printf("  %s", mtable[i]);
+			printf("\n");
+			frmsgs += stat.stat_nf[i];
+			frbytes += stat.stat_bf[i];
+			tomsgs += stat.stat_nt[i];
+			tobytes += stat.stat_bt[i];
+		}
+	}
+	printf("========================================\n");
+	printf(" T %6ld %10ldK %6ld %10ldK\n",
+		frmsgs, frbytes, tomsgs, tobytes);
+	exit(EX_OK);
+}
diff --git a/usr.sbin/sendmail/makemap/Makefile b/usr.sbin/sendmail/makemap/Makefile
new file mode 100644
index 00000000000..a8592fec10a
--- /dev/null
+++ b/usr.sbin/sendmail/makemap/Makefile
@@ -0,0 +1,8 @@
+#	@(#)Makefile	8.1 (Berkeley) 6/7/93
+
+PROG=	makemap
+MAN=	makemap.8
+CFLAGS+=-I${.CURDIR}/../src -DNDBM -DNEWDB
+
+.include "../../Makefile.inc"
+.include <bsd.prog.mk>
diff --git a/usr.sbin/sendmail/makemap/makemap.8 b/usr.sbin/sendmail/makemap/makemap.8
new file mode 100644
index 00000000000..2ee45c2dd86
--- /dev/null
+++ b/usr.sbin/sendmail/makemap/makemap.8
@@ -0,0 +1,128 @@
+.\" Copyright (c) 1988, 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 3. All advertising materials mentioning features or use of this software
+.\"    must display the following acknowledgement:
+.\"	This product includes software developed by the University of
+.\"	California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     @(#)makemap.8	8.2 (Berkeley) 9/22/93
+.\"
+.Dd November 16, 1992
+.Dt MAKEMAP 8
+.Os BSD 4.4
+.Sh NAME
+.Nm makemap
+.Nd create database maps for sendmail
+.Sh SYNOPSIS
+.Nm
+.Op Fl N
+.Op Fl f
+.Op Fl o
+.Op Fl r
+.Op Fl v
+.Ar maptype
+.Ar mapname
+.Sh DESCRIPTION
+.Nm
+creates the database maps used by the keyed map lookups in
+.Xr sendmail 8 .
+It reads input from the standard input
+and outputs them to the indicated
+.Ar mapname .
+.Pp
+Depending on how it is compiled,
+.Nm
+handles up to three different database formats,
+selected using the
+.Ar maptype
+parameter.
+They may be
+.Bl -tag -width Fl
+.It Li dbm
+DBM format maps.
+This requires the
+.Xr ndbm 3
+library.
+.It Li btree
+B-Tree format maps.
+This requires the new Berkeley
+.Xr db 3
+library.
+.It Li hash
+Hash format maps.
+This also requires the
+.Xr db 3
+library.
+.El
+.Pp
+In all cases,
+.Nm
+reads lines from the standard input consisting of two
+words separated by white space.
+The first is the database key,
+the second is the value.
+The value may contain
+``%\fIn\fP''
+strings to indicated parameter substitution.
+Literal parentheses should be doubled
+(``%%'').
+Blank lines and lines beginning with ``#'' are ignored.
+.Ss Flags
+.Bl -tag -width Fl
+.It Fl N
+Include the null byte that terminates strings
+in the map.
+This must match the \-N flag in the sendmail.cf
+``K'' line.
+.It Fl f
+Normally all upper case letters in the key
+are folded to lower case.
+This flag disables that behaviour.
+This is intended to mesh with the
+\-f flag in the
+\fBK\fP
+line in sendmail.cf.
+The value is never case folded.
+.It Fl o
+Append to an old file.
+This allows you to augment an existing file.
+.It Fl r
+Allow replacement of existing keys.
+Normally
+.Nm
+complains if you repeat a key,
+and does not do the insert.
+.It Fl v
+Verbosely print what it is doing.
+.El
+.Sh SEE ALSO
+.Xr sendmail 8
+.Sh HISTORY
+The
+.Nm
+command appeared in
+.Bx 4.4 .
diff --git a/usr.sbin/sendmail/makemap/makemap.c b/usr.sbin/sendmail/makemap/makemap.c
new file mode 100644
index 00000000000..a676cd7f43b
--- /dev/null
+++ b/usr.sbin/sendmail/makemap/makemap.c
@@ -0,0 +1,377 @@
+/*
+ * Copyright (c) 1992 Eric P. Allman.
+ * Copyright (c) 1992, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)makemap.c	8.6.1.1 (Berkeley) 3/6/95";
+#endif /* not lint */
+
+#include <stdio.h>
+#include <sysexits.h>
+#include <sys/types.h>
+#include <sys/file.h>
+#include <ctype.h>
+#include <string.h>
+#include "useful.h"
+#include "conf.h"
+
+#ifdef NDBM
+#include <ndbm.h>
+#endif
+
+#ifdef NEWDB
+#include <db.h>
+#endif
+
+enum type { T_DBM, T_BTREE, T_HASH, T_ERR, T_UNKNOWN };
+
+union dbent
+{
+#ifdef NDBM
+	datum	dbm;
+#endif
+#ifdef NEWDB
+	DBT	db;
+#endif
+	struct
+	{
+		char	*data;
+		size_t	size;
+	} xx;
+};
+
+#define BUFSIZE		1024
+
+main(argc, argv)
+	int argc;
+	char **argv;
+{
+	char *progname;
+	bool inclnull = FALSE;
+	bool notrunc = FALSE;
+	bool allowreplace = FALSE;
+	bool verbose = FALSE;
+	bool foldcase = TRUE;
+	int exitstat;
+	int opt;
+	char *typename;
+	char *mapname;
+	char *ext;
+	int lineno;
+	int st;
+	int mode;
+	enum type type;
+	union
+	{
+#ifdef NDBM
+		DBM	*dbm;
+#endif
+#ifdef NEWDB
+		DB	*db;
+#endif
+		void	*dbx;
+	} dbp;
+	union dbent key, val;
+	char ibuf[BUFSIZE];
+	char fbuf[MAXNAME];
+	extern char *optarg;
+	extern int optind;
+
+	progname = argv[0];
+
+	while ((opt = getopt(argc, argv, "Nforv")) != EOF)
+	{
+		switch (opt)
+		{
+		  case 'N':
+			inclnull = TRUE;
+			break;
+
+		  case 'f':
+			foldcase = FALSE;
+			break;
+
+		  case 'o':
+			notrunc = TRUE;
+			break;
+
+		  case 'r':
+			allowreplace = TRUE;
+			break;
+
+		  case 'v':
+			verbose = TRUE;
+			break;
+
+		  default:
+			type = T_ERR;
+			break;
+		}
+	}
+
+	argc -= optind;
+	argv += optind;
+	if (argc != 2)
+		type = T_ERR;
+	else
+	{
+		typename = argv[0];
+		mapname = argv[1];
+		ext = NULL;
+
+		if (strcmp(typename, "dbm") == 0)
+		{
+			type = T_DBM;
+		}
+		else if (strcmp(typename, "btree") == 0)
+		{
+			type = T_BTREE;
+			ext = ".db";
+		}
+		else if (strcmp(typename, "hash") == 0)
+		{
+			type = T_HASH;
+			ext = ".db";
+		}
+		else
+			type = T_UNKNOWN;
+	}
+
+	switch (type)
+	{
+	  case T_ERR:
+		fprintf(stderr, "Usage: %s [-N] [-o] [-v] type mapname\n", progname);
+		exit(EX_USAGE);
+
+	  case T_UNKNOWN:
+		fprintf(stderr, "%s: Unknown database type %s\n",
+			progname, typename);
+		exit(EX_USAGE);
+
+#ifndef NDBM
+	  case T_DBM:
+#endif
+#ifndef NEWDB
+	  case T_BTREE:
+	  case T_HASH:
+#endif
+		fprintf(stderr, "%s: Type %s not supported in this version\n",
+			progname, typename);
+		exit(EX_UNAVAILABLE);
+	}
+
+	/*
+	**  Adjust file names.
+	*/
+
+	if (ext != NULL)
+	{
+		int el, fl;
+
+		el = strlen(ext);
+		fl = strlen(mapname);
+		if (fl < el || strcmp(&mapname[fl - el], ext) != 0)
+		{
+			strcpy(fbuf, mapname);
+			strcat(fbuf, ext);
+			mapname = fbuf;
+		}
+	}
+
+	/*
+	**  Create the database.
+	*/
+
+	mode = O_RDWR;
+	if (!notrunc)
+		mode |= O_CREAT|O_TRUNC;
+	switch (type)
+	{
+#ifdef NDBM
+	  case T_DBM:
+		dbp.dbm = dbm_open(mapname, mode, 0644);
+		break;
+#endif
+
+#ifdef NEWDB
+	  case T_HASH:
+		dbp.db = dbopen(mapname, mode, 0644, DB_HASH, NULL);
+		if (dbp.db != NULL)
+			(void) (*dbp.db->sync)(dbp.db, 0);
+		break;
+
+	  case T_BTREE:
+		dbp.db = dbopen(mapname, mode, 0644, DB_BTREE, NULL);
+		if (dbp.db != NULL)
+			(void) (*dbp.db->sync)(dbp.db, 0);
+		break;
+#endif
+
+	  default:
+		fprintf(stderr, "%s: internal error: type %d\n", progname, type);
+		exit(EX_SOFTWARE);
+	}
+
+	if (dbp.dbx == NULL)
+	{
+		fprintf(stderr, "%s: cannot create type %s map %s\n",
+			progname, typename, mapname);
+		exit(EX_CANTCREAT);
+	}
+
+	/*
+	**  Copy the data
+	*/
+
+	lineno = 0;
+	exitstat = EX_OK;
+	while (fgets(ibuf, sizeof ibuf, stdin) != NULL)
+	{
+		register char *p;
+
+		lineno++;
+
+		/*
+		**  Parse the line.
+		*/
+
+		p = strchr(ibuf, '\n');
+		if (p != NULL)
+			*p = '\0';
+		else if (!feof(stdin))
+		{
+			fprintf(stderr, "%s: %s: line %d: line too long (%d bytes max)\n",
+				progname, mapname, lineno, sizeof ibuf);
+			continue;
+		}
+			
+		if (ibuf[0] == '\0' || ibuf[0] == '#')
+			continue;
+		if (isspace(ibuf[0]))
+		{
+			fprintf(stderr, "%s: %s: line %d: syntax error (leading space)\n",
+				progname, mapname, lineno);
+			continue;
+		}
+		key.xx.data = ibuf;
+		for (p = ibuf; *p != '\0' && !isspace(*p); p++)
+		{
+			if (foldcase && isupper(*p))
+				*p = tolower(*p);
+		}
+		key.xx.size = p - key.xx.data;
+		if (inclnull)
+			key.xx.size++;
+		if (*p != '\0')
+			*p++ = '\0';
+		while (isspace(*p))
+			p++;
+		if (*p == '\0')
+		{
+			fprintf(stderr, "%s: %s: line %d: no RHS for LHS %s\n",
+				progname, mapname, lineno, key.xx.data);
+			continue;
+		}
+		val.xx.data = p;
+		val.xx.size = strlen(p);
+		if (inclnull)
+			val.xx.size++;
+
+		/*
+		**  Do the database insert.
+		*/
+
+		if (verbose)
+		{
+			printf("key=`%s', val=`%s'\n", key.xx.data, val.xx.data);
+		}
+
+		switch (type)
+		{
+#ifdef NDBM
+		  case T_DBM:
+			st = dbm_store(dbp.dbm, key.dbm, val.dbm,
+					allowreplace ? DBM_REPLACE : DBM_INSERT);
+			break;
+#endif
+
+#ifdef NEWDB
+		  case T_BTREE:
+		  case T_HASH:
+			st = (*dbp.db->put)(dbp.db, &key.db, &val.db,
+					allowreplace ? 0 : R_NOOVERWRITE);
+			break;
+#endif
+		}
+
+		if (st < 0)
+		{
+			fprintf(stderr, "%s: %s: line %d: key %s: put error\n",
+				progname, mapname, lineno, key.xx.data);
+			perror(mapname);
+			exitstat = EX_IOERR;
+		}
+		else if (st > 0)
+		{
+			fprintf(stderr, "%s: %s: line %d: key %s: duplicate key\n",
+				progname, mapname, lineno, key.xx.data);
+		}
+	}
+
+	/*
+	**  Now close the database.
+	*/
+
+	switch (type)
+	{
+#ifdef NDBM
+	  case T_DBM:
+		dbm_close(dbp.dbm);
+		break;
+#endif
+
+#ifdef NEWDB
+	  case T_HASH:
+	  case T_BTREE:
+		if ((*dbp.db->close)(dbp.db) < 0)
+		{
+			fprintf(stderr, "%s: %s: error on close\n",
+				progname, mapname);
+			perror(mapname);
+			exitstat = EX_IOERR;
+		}
+#endif
+	}
+
+	exit (exitstat);
+}
diff --git a/usr.sbin/sendmail/praliases/Makefile b/usr.sbin/sendmail/praliases/Makefile
new file mode 100644
index 00000000000..621bea8f66f
--- /dev/null
+++ b/usr.sbin/sendmail/praliases/Makefile
@@ -0,0 +1,8 @@
+#	@(#)Makefile	8.1 (Berkeley) 6/7/93
+
+PROG=	praliases
+CFLAGS+=-I${.CURDIR}/../src
+NOMAN=	noman
+
+.include "../../Makefile.inc"
+.include <bsd.prog.mk>
diff --git a/usr.sbin/sendmail/praliases/praliases.c b/usr.sbin/sendmail/praliases/praliases.c
new file mode 100644
index 00000000000..2c22279205e
--- /dev/null
+++ b/usr.sbin/sendmail/praliases/praliases.c
@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) 1983 Eric P. Allman
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef lint
+static char copyright[] =
+"@(#) Copyright (c) 1988, 1993\n\
+	The Regents of the University of California.  All rights reserved.\n";
+#endif /* not lint */
+
+#ifndef lint
+static char sccsid[] = "@(#)praliases.c	8.3 (Berkeley) 3/6/94";
+#endif /* not lint */
+
+#include <ndbm.h>
+#include <sendmail.h>
+#ifdef NEWDB
+#include <db.h>
+#endif
+
+int
+main(argc, argv)
+	int argc;
+	char **argv;
+{
+	extern char *optarg;
+	extern int optind;
+	DBM *dbp;
+	datum content, key;
+	char *filename;
+	int ch;
+#ifdef NEWDB
+	const DB *db;
+	DBT newdbkey, newdbcontent;
+	char buf[MAXNAME];
+#endif
+
+	filename = "/etc/aliases";
+	while ((ch = getopt(argc, argv, "f:")) != EOF)
+		switch((char)ch) {
+		case 'f':
+			filename = optarg;
+			break;
+		case '?':
+		default:
+			(void)fprintf(stderr, "usage: praliases [-f file]\n");
+			exit(EX_USAGE);
+		}
+	argc -= optind;
+	argv += optind;
+
+#ifdef NEWDB
+	(void) strcpy(buf, filename);
+	(void) strcat(buf, ".db");
+	if (db = dbopen(buf, O_RDONLY, 0444 , DB_HASH, NULL)) {
+		if (!argc) {
+			while(!db->seq(db, &newdbkey, &newdbcontent, R_NEXT))
+				printf("%.*s:%.*s\n",
+					newdbkey.size, newdbkey.data,
+					newdbcontent.size, newdbcontent.data);
+		}
+		else for (; *argv; ++argv) {
+			newdbkey.data = *argv;
+			newdbkey.size = strlen(*argv) + 1;
+			if (!db->get(db, &newdbkey, &newdbcontent, 0))
+				printf("%s:%.*s\n", newdbkey.data,
+					newdbcontent.size, newdbcontent.data);
+			else
+				printf("%s: No such key\n",
+					newdbkey.data);
+		}
+	}
+	else {
+#endif
+		if ((dbp = dbm_open(filename, O_RDONLY, 0)) == NULL) {
+			(void)fprintf(stderr,
+			    "praliases: %s: %s\n", filename, strerror(errno));
+			exit(EX_OSFILE);
+		}
+		if (!argc)
+			for (key = dbm_firstkey(dbp);
+			    key.dptr != NULL; key = dbm_nextkey(dbp)) {
+				content = dbm_fetch(dbp, key);
+				(void)printf("%.*s:%.*s\n",
+					key.dsize, key.dptr,
+					content.dsize, content.dptr);
+			}
+		else for (; *argv; ++argv) {
+			key.dptr = *argv;
+			key.dsize = strlen(*argv) + 1;
+			content = dbm_fetch(dbp, key);
+			if (!content.dptr)
+				(void)printf("%s: No such key\n", key.dptr);
+			else
+				(void)printf("%s:%.*s\n", key.dptr,
+					content.dsize, content.dptr);
+		}
+#ifdef NEWDB
+	}
+#endif
+	exit(EX_OK);
+}
diff --git a/usr.sbin/sendmail/src/Makefile b/usr.sbin/sendmail/src/Makefile
new file mode 100644
index 00000000000..aa843bbe4a8
--- /dev/null
+++ b/usr.sbin/sendmail/src/Makefile
@@ -0,0 +1,42 @@
+#
+#  NetBSD Makefile
+#
+#	@(#)Makefile.NetBSD	8.1 (Berkeley) 2/26/94
+#	@Id: Makefile.NetBSD,v 1.3 1994/02/01 05:33:44 glass Exp $
+#
+
+PROG=	sendmail
+
+# define the database format to use for aliases et al.  Can be -DNEWDB (for
+# the new BSD database package -- this is preferred) or -DNDBM for the NDBM
+# database package.  The old putrescent V7 DBM package is no longer
+# supported.
+# You can define both NEWDB and NDBM during a transition period; old
+# databases are read, but the new format will be used on any rebuilds.  On
+# really gnarly systems, you can set this to null; it will crawl like a high
+# spiral snail, but it will work.
+DBMDEF=	-DNEWDB -DNIS
+
+CFLAGS+=-I${.CURDIR} ${DBMDEF} -DNETISO
+
+SRCS=	alias.c arpadate.c clock.c collect.c conf.c convtime.c daemon.c \
+	deliver.c domain.c envelope.c err.c headers.c macro.c main.c map.c \
+	mci.c parseaddr.c queue.c readcf.c recipient.c savemail.c srvrsmtp.c \
+	stab.c stats.c sysexits.c trace.c udb.c usersmtp.c \
+	util.c version.c
+MAN=	aliases.5 mailq.1 newaliases.1 sendmail.8
+LINKS=	/usr/sbin/sendmail /usr/bin/newaliases \
+	/usr/sbin/sendmail /usr/bin/mailq
+BINDIR=	/usr/sbin
+BINOWN=	root
+BINMODE=4555
+
+beforeinstall:
+#	install -c -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \
+#	    ${DESTDIR}/etc/sendmail.fc
+	install -c -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \
+	    ${DESTDIR}/var/log/sendmail.st
+	install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/sendmail.hf \
+	    ${DESTDIR}/usr/share/misc
+
+.include <bsd.prog.mk>
diff --git a/usr.sbin/sendmail/src/Makefile.BSD44 b/usr.sbin/sendmail/src/Makefile.BSD44
new file mode 100644
index 00000000000..ebeacd01622
--- /dev/null
+++ b/usr.sbin/sendmail/src/Makefile.BSD44
@@ -0,0 +1,46 @@
+#
+#  NetBSD Makefile
+#
+#	@(#)Makefile.NetBSD	8.1 (Berkeley) 2/26/94
+#	@Id: Makefile.NetBSD,v 1.3 1994/02/01 05:33:44 glass Exp $
+#
+
+PROG=	sendmail
+
+# define the database format to use for aliases et al.  Can be -DNEWDB (for
+# the new BSD database package -- this is preferred) or -DNDBM for the NDBM
+# database package.  The old putrescent V7 DBM package is no longer
+# supported.
+# You can define both NEWDB and NDBM during a transition period; old
+# databases are read, but the new format will be used on any rebuilds.  On
+# really gnarly systems, you can set this to null; it will crawl like a high
+# spiral snail, but it will work.
+DBMDEF=	-DNEWDB -DNIS
+
+#nasty warning about gcc 2.4.x caused bugs 
+CFLAGS=-I${.CURDIR} ${DBMDEF} -DNETISO
+#CFLAGS+=-I${.CURDIR} ${DBMDEF} -DNETISO
+
+SRCS=	alias.c arpadate.c clock.c collect.c conf.c convtime.c daemon.c \
+	deliver.c domain.c envelope.c err.c headers.c macro.c main.c map.c \
+	mci.c parseaddr.c queue.c readcf.c recipient.c savemail.c srvrsmtp.c \
+	stab.c stats.c sysexits.c trace.c udb.c usersmtp.c \
+	util.c version.c
+MAN1=	mailq.0 newaliases.0
+MAN5=	aliases.0
+MAN8=	sendmail.0 
+LINKS=	/usr/sbin/sendmail /usr/bin/newaliases \
+	/usr/sbin/sendmail /usr/bin/mailq
+BINDIR=	/usr/sbin
+BINOWN=	root
+BINMODE=4555
+
+beforeinstall:
+#	install -c -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \
+#	    ${DESTDIR}/etc/sendmail.fc
+	install -c -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \
+	    ${DESTDIR}/var/log/sendmail.st
+	install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/sendmail.hf \
+	    ${DESTDIR}/usr/share/misc
+
+.include <bsd.prog.mk>
diff --git a/usr.sbin/sendmail/src/Makefile.NetBSD b/usr.sbin/sendmail/src/Makefile.NetBSD
new file mode 100644
index 00000000000..aa843bbe4a8
--- /dev/null
+++ b/usr.sbin/sendmail/src/Makefile.NetBSD
@@ -0,0 +1,42 @@
+#
+#  NetBSD Makefile
+#
+#	@(#)Makefile.NetBSD	8.1 (Berkeley) 2/26/94
+#	@Id: Makefile.NetBSD,v 1.3 1994/02/01 05:33:44 glass Exp $
+#
+
+PROG=	sendmail
+
+# define the database format to use for aliases et al.  Can be -DNEWDB (for
+# the new BSD database package -- this is preferred) or -DNDBM for the NDBM
+# database package.  The old putrescent V7 DBM package is no longer
+# supported.
+# You can define both NEWDB and NDBM during a transition period; old
+# databases are read, but the new format will be used on any rebuilds.  On
+# really gnarly systems, you can set this to null; it will crawl like a high
+# spiral snail, but it will work.
+DBMDEF=	-DNEWDB -DNIS
+
+CFLAGS+=-I${.CURDIR} ${DBMDEF} -DNETISO
+
+SRCS=	alias.c arpadate.c clock.c collect.c conf.c convtime.c daemon.c \
+	deliver.c domain.c envelope.c err.c headers.c macro.c main.c map.c \
+	mci.c parseaddr.c queue.c readcf.c recipient.c savemail.c srvrsmtp.c \
+	stab.c stats.c sysexits.c trace.c udb.c usersmtp.c \
+	util.c version.c
+MAN=	aliases.5 mailq.1 newaliases.1 sendmail.8
+LINKS=	/usr/sbin/sendmail /usr/bin/newaliases \
+	/usr/sbin/sendmail /usr/bin/mailq
+BINDIR=	/usr/sbin
+BINOWN=	root
+BINMODE=4555
+
+beforeinstall:
+#	install -c -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \
+#	    ${DESTDIR}/etc/sendmail.fc
+	install -c -o ${BINOWN} -g ${BINGRP} -m 644 /dev/null \
+	    ${DESTDIR}/var/log/sendmail.st
+	install -c -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/sendmail.hf \
+	    ${DESTDIR}/usr/share/misc
+
+.include <bsd.prog.mk>
diff --git a/usr.sbin/sendmail/src/READ_ME b/usr.sbin/sendmail/src/READ_ME
new file mode 100644
index 00000000000..ace0d3ab9bb
--- /dev/null
+++ b/usr.sbin/sendmail/src/READ_ME
@@ -0,0 +1,883 @@
+# Copyright (c) 1983 Eric P. Allman
+# Copyright (c) 1988 The Regents of the University of California.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+#	@(#)READ_ME	8.61.1.1 (Berkeley) 3/5/95
+#
+
+This directory contains the source files for sendmail.
+
+For detailed instructions, please read the document ../doc/op.me:
+
+	eqn ../doc/op.me | pic | ditroff -me
+
+The Makefile is for the new (4.4BSD) Berkeley make and uses syntax
+that is not recognized by older makes.  It also has assumptions
+about the 4.4 file system layout built in.  See below for details
+about other Makefiles.
+
+There is also a Makefile.dist which is much less clever, but works on
+the old traditional make.  You can use this using:
+
+	make -f Makefile.dist
+
+**************************************************
+**  Read below for more details of Makefiles.	**
+**************************************************
+
+There is also a shell script (makesendmail) that tries to be clever
+about using object subdirectories.  It's pretty straightforward, and
+may help if you share a source tree among different architectures.
+
+**************************************************************************
+**  IMPORTANT:  DO NOT USE OPTIMIZATION (``-O'') IF YOU ARE RUNNING	**
+**  GCC 2.4.x or 2.5.x.  THERE IS A BUG IN THE GCC OPTIMIZER THAT	**
+**  CAUSES SENDMAIL COMPILES TO FAIL MISERABLY.				**
+**************************************************************************
+
+Jim Wilson of Cygnus believes he has found the problem -- it will
+probably be fixed in GCC 2.5.6 -- but until this is verified, be
+very suspicious of gcc -O.
+
+**************************************************************************
+**  IMPORTANT:  Read the appropriate paragraphs in the section on	**
+**  ``Operating System and Compile Quirks''.				**
+**************************************************************************
+
+
++-----------+
+| MAKEFILES |
++-----------+
+
+The "Makefile"s in these directories are from 4.4 BSD, and hence
+really only work properly if you are on a 4.4 system.  In particular,
+they use new syntax that will not be recognized on old make programs,
+and some of them do things like ``.include ../../Makefile.inc'' to
+pick up some system defines.  If you are getting sendmail separately,
+these files won't be included in the distribution, as they are
+outside of the sendmail tree.
+
+Instead, you should use one of the other Makefiles, such as
+Makefile.SunOS for a SunOS system, and so forth.  These should
+work with the version of make that is appropriate for that
+system.
+
+There are a bunch of other Makefiles for other systems with names
+like Makefile.HPUX for an HP-UX system.  They use the version of
+make that is native for that system.  These are the Makefiles that
+I use, and they have "Berkeley quirks" in them.  I can't guarantee
+that they will work unmodified in your environment.  Many of them
+include -I/usr/sww/include/db and -L/usr/sww/lib -- this is Berkeley's
+location (the ``Software Warehouse'') for the new database libraries,
+described below.  You don't have to remove these definitions if you
+don't have these directories.
+
+Please look for an appropriate Makefile before you start trying to
+compile with Makefile or Makefile.dist.
+
+If you want to port the new Berkeley make, you can get it from
+ftp.uu.net in the directory /systems/unix/bsd-sources/usr.bin/make.
+Diffs and instructions for building this version of make under
+SunOS 4.1.x are available on ftp.css.itd.umich.edu in
+/pub/systems/sun/Net2-make.sun4.diff.Z.  Diffs and instructions
+for building this version of make under IBM AIX 3.2.4 are available
+on ftp.uni-stuttgart.de in /sw/src/patches/bsd-make-rus-patches.
+Paul Southworth <pauls@umich.edu> published a description of porting
+this make in comp.unix.bsd.
+
+The complete text of the Makefile.inc that is in the parent of the
+sendmail directory is:
+
+	#	@(#)Makefile.inc	8.1 (Berkeley) 6/6/93
+
+	BINDIR?=	/usr/sbin
+
+
++----------------------+
+| DATABASE DEFINITIONS |
++----------------------+
+
+There are several database formats that can be used for the alias files
+and for general maps.  When used for alias files they interact in an
+attempt to be back compatible.
+
+The three options are NEWDB (the new Berkeley DB package), NDBM (the
+older DBM implementation -- the very old V7 implementation is no
+longer supported), and NIS (Network Information Services).  Used alone
+these just include the support they indicate.  [If you are using NEWDB,
+get the latest version from FTP.CS.Berkeley.EDU in /ucb/4bsd.  DO NOT
+use the version from the Net2 distribution!  However, if you are on
+BSD/386 or 386BSD-based systems, use the one that already exists
+on your system.  You may need to #define OLD_NEWDB 1 to do this.]
+
+[NOTE WELL: it is CRITICAL that you remove ndbm.o from libdb.a and
+ndbm.h from the appropriate include directories if you want to get
+ndbm support.  These files OVERRIDE calls to ndbm routines -- in
+particular, if you leave ndbm.h in, you can find yourself using
+the new db package even if you don't define NEWDB.]
+
+If NEWDB and NDBM are defined (but not NIS), then sendmail will read
+NDBM format alias files, but the next time a newaliases is run the
+format will be converted to NEWDB; that format will be used forever
+more.  This is intended as a transition feature.  [Note however that
+the NEWDB library also catches and maps NDBM calls; you will have to
+back out this feature to get this to work.  See ``Quirks'' section
+below for details.]
+
+If all three are defined, sendmail operates as described above, and also
+looks for the file /var/yp/Makefile.  If it exists, newaliases will
+build BOTH the NEWDB and NDBM format alias files.  However, it will
+only use the NEWDB file; the NDBM format file is used only by the
+NIS subsystem.
+
+If NDBM and NIS are defined (regardless of the definition of NEWDB
+or the existance of /var/yp/Makefile), sendmail adds the special
+tokens "YP_LAST_MODIFIED" and "YP_MASTER_NAME", both of which are
+required if the NDBM file is to be used as an NIS map.
+
+All of -DNEWDB, -DNDBM, and -DNIS are normally defined in the DBMDEF
+line in the Makefile.
+
+
++---------------+
+| COMPILE FLAGS |
++---------------+
+
+Whereever possible, I try to make sendmail pull in the correct
+compilation options needed to compile on various environments based on
+automatically defined symbols.  Some machines don't seem to have useful
+symbols availble, requiring the following compilation flags in the
+Makefile:
+
+SOLARIS		Define this if you are running Solaris 2.0 or higher.
+SOLARIS_2_3	Define this if you are running Solaris 2.3 or higher.
+SUNOS403	Define this if you are running SunOS 4.0.3.
+NeXT		Define this if you are on a NeXT box.  (This one may
+		be pre-defined for you.)  There are other hacks you
+		have to make -- see below.
+_AIX3		Define this if you are IBM AIX 3.x.
+RISCOS		Define this if you are running RISC/os from MIPS.
+IRIX		Define this if you are running IRIX from SGI.
+_SCO_unix_	Define this if you are on SCO UNIX.
+_SCO_unix_4_2	Define this if you are on SCO Open Server 3.2v4.
+
+If you are a system that sendmail has already been ported to, you
+probably won't have to touch these.  But if you are porting, you may
+have to tweak the following compilation flags in conf.h in order to
+get it to compile and link properly:
+
+SYSTEM5		Adjust for System V (not necessarily Release 4).
+SYS5SIGNALS	Use System V signal semantics -- the signal handler
+		is automatically dropped when the signal is caught.
+		If this is not set, use POSIX/BSD semantics, where the
+		signal handler stays in force until an exec or an
+		explicit delete.  Implied by SYSTEM5.
+SYS5SETPGRP	Use System V setpgrp() semantics.  Implied by SYSTEM5.
+HASFLOCK	Set this if you prefer to use the flock(2) system call
+		rather than using fcntl-based locking.  Fcntl locking
+		has some semantic gotchas, but many vendor systems
+		also interface it to lockd(8) to do NFS-style locking.
+		For this reason, this should not be set unless you
+		don't have an alternative.
+HASUNAME	Set if you have the "uname" system call.  Implied by
+		SYSTEM5.
+HASUNSETENV	Define this if your system library has the "unsetenv"
+		subroutine.
+HASSETSID	Define this if you have the setsid(2) system call.  This
+		is implied if your system appears to be POSIX compliant.
+HASINITGROUPS	Define this if you have the initgroups(3) routine.
+HASSETVBUF	Define this if you have the setvbuf(3) library call.
+		If you don't, setlinebuf will be used instead.  This
+		defaults on if your compiler defines __STDC__.
+HASSETREUID	Define this if you have setreuid(2) ***AND*** root can
+		use setreuid to change to an arbitrary user.  This second
+		condition is not satisfied on AIX 3.x.  You may find that
+		your system has setresuid(2), (for example, on HP-UX) in
+		which case you will also have to #define setreuid(r, e)
+		to be the appropriate call.  Some systems (such as Solaris)
+		have a compatibility routine that doesn't work properly,
+		but may have "saved user ids" properly implemented so you
+		can ``#define setreuid(r, e) seteuid(e)'' and have it work.
+		The important thing is that you have a call that will set
+		the effective uid independently of the real or saved uid
+		and be able to set the effective uid back again when done.
+		There's a test program in ../test/t_setreuid.c that will
+		try things on your system.  Setting this improves the
+		security, since sendmail doesn't have to read .forward
+		and :include: files as root.  There are certain attacks
+		that may be unpreventable without this call.
+HASLSTAT	Define this if you have symbolic links (and thus the
+		lstat(2) system call).  This improves security.  Unlike
+		most other options, this one is on by default, so you
+		need to #undef it in conf.h if you don't have symbolic
+		links (these days everyone does).
+NEEDGETOPT	Define this if you need a reimplementation of getopt(3).
+		On some systems, getopt does very odd things if called
+		to scan the arguments twice.  This flag will ask sendmail
+		to compile in a local version of getopt that works
+		properly.
+NEEDSTRTOL	Define this if your standard C library does not define
+		strtol(3).  This will compile in a local version.
+NEEDVPRINTF	Define this if your standard C library does not define
+		vprintf(3).  Note that the resulting fake implementation
+		is not very elegant and may not even work on some
+		architectures.
+NEEDFSYNC	Define this if your standard C library does not define
+		fsync(2).  This will try to simulate the operation using
+		fcntl(2); if that is not available it does nothing, which
+		isn't great, but at least it compiles and runs.
+HASGETUSERSHELL	Define this to 1 if you have getusershell(3) in your
+		standard C library.  If this is not defined, or is defined
+		to be 0, sendmail will scan the /etc/shells file (no
+		NIS-style support, defaults to /bin/sh and /bin/csh if
+		that file does not exist) to get a list of unrestricted
+		user shells.  This is used to determine whether users
+		are allowed to forward their mail to a program or a file.
+GIDSET_T	The type of entries in a gidset passed as the second
+		argument to getgroups(2).  Historically this has been an
+		int, so this is the default, but some systems (such as
+		IRIX) pass it as a gid_t, which is an unsigned short.
+		This will make a difference, so it is important to get
+		this right!  However, it is only an issue if you have
+		group sets.
+SLEEP_T		The type returned by the system sleep() function.
+		Defaults to "unsigned int".  Don't worry about this
+		if you don't have compilation problems.
+ARBPTR_T	The type of an arbitrary pointer -- defaults to "void *".
+		If you are an very old compiler you may need to define
+		this to be "char *".
+LA_TYPE		The type of load average your kernel supports.  These
+		can be one of:
+		LA_ZERO (1) -- it always returns the load average as
+			"zero" (and does so on all architectures).
+		LA_SUBR (4) if you have the getloadavg(3) routine,
+		LA_MACH (5) to use MACH-style load averages (calls
+			processor_set_info()),
+		LA_PROCSTR (7) to read /proc/loadavg and interpret it
+			as a string representing a floating-point
+			number (Linux-style),
+		LA_FLOAT (3) if you read kmem and interpret the value
+			as a floating point number,
+		LA_INT (2) to interpret as a long integer,
+		LA_SHORT (6) to interpret as a short integer.
+		These last three have several other parameters that they
+		try to divine: the name of your kernel, the name of the
+		variable in the kernel to examine, the number of bits of
+		precision in a fixed point load average, and so forth.
+		In desperation, use LA_ZERO.  The actual code is in
+		conf.c -- it can be tweaked if you are brave.
+SFS_TYPE	Encodes how your kernel can locate the amount of free
+		space on a disk partition.  This can be set to SFS_NONE
+		(0) if you have no way of getting this information,
+		SFS_USTAT (1) if you have the ustat(2) system call,
+		SFS_4ARGS (2) if you have a four-argument statfs(2)
+		system call (and the include file is <sys/statfs.h>),
+		and SFS_VFS (3), SFS_MOUNT (4), SFS_STATFS (5) or
+		SFS_STATVFS (6) if you have the two-argument statfs(2)
+		system call, with includes in <sys/vfs.h>, <sys/mount.h>,
+		<sys/statfs.h>, or <sys/statvfs.h> respectively.  The
+		default if nothing is defined is SFS_NONE.
+ERRLIST_PREDEFINED
+		If set, assumes that some header file defines sys_errlist.
+		This may be needed if you get type conflicts on this
+		variable -- otherwise don't worry about it.
+WAITUNION	The wait(2) routine takes a "union wait" argument instead
+		of an integer argument.  This is for compatibility with
+		old versions of BSD.
+SCANF		You can set this to extend the F command to accept a
+		scanf string -- this gives you a primitive parser for
+		class definitions -- BUT it can make you vulnerable to
+		core dumps if the target file is poorly formed.
+SYSLOG_BUFSIZE	You can define this to be the size of the buffer that
+		syslog accepts.  If it is not defined, it assumes a
+		1024-byte buffer.  If the buffer is very small (under
+		256 bytes) the log message format changes -- each
+		e-mail message will log many more messages, since it
+		will log each piece of information as a separate line
+		in syslog.
+BROKEN_RES_SEARCH
+		On Ultrix (and maybe other systems?) if you use the
+		res_search routine with an unknown host name, it returns
+		-1 but sets h_errno to 0 instead of HOST_NOT_FOUND.  If
+		you set this, sendmail considers 0 to be the same as
+		HOST_NOT_FOUND.
+
+
++-----------------------+
+| COMPILE-TIME FEATURES |
++-----------------------+
+
+There are a bunch of features that you can decide to compile in, such
+as selecting various database packages and special protocol support.
+Several are assumed based on other compilation flags -- if you want to
+"un-assume" something, you probably need to edit conf.h.  Compilation
+flags that add support for special features include:
+
+NDBM		Include support for "new" DBM library for aliases and maps.
+		Normally defined in the Makefile.
+NEWDB		Include support for Berkeley "db" package (hash & btree)
+		for aliases and maps.  Normally defined in the Makefile.
+OLD_NEWDB	If non-zero, the version of NEWDB you have is the old
+		one that does not include the "fd" call.  This call was
+		added in version 1.5 of the Berkeley DB code.  If you
+		use -DOLD_NEWDB=0 it forces you to use the new interface.
+NIS		Define this to get NIS (YP) support for aliases and maps.
+		Normally defined in the Makefile.
+USERDB		Include support for the User Information Database.  Implied
+		by NEWDB in conf.h.
+IDENTPROTO	Define this as 1 to get IDENT (RFC 1413) protocol support.
+		This is assumed unless you are running on Ultrix or
+		HP-UX, both of which have a problem in the UDP
+		implementation.  You can define it to be 0 to explicitly
+		turn off IDENT protocol support.
+MIME		Include support for MIME-encapsulated error messages.
+LOG		Set this to get syslog(3) support.  Defined by default
+		in conf.h.  You want this if at all possible.
+NETINET		Set this to get TCP/IP support.  Defined by default
+		in conf.h.  You probably want this.
+NETISO		Define this to get ISO networking support.
+SMTP		Define this to get the SMTP code.  Implied by NETINET
+		or NETISO.
+NAMED_BIND	Define this to get DNS (name daemon) support, including
+		MX support.  The specs you must use this if you run
+		SMTP.  Defined by default in conf.h.
+QUEUE		Define this to get queueing code.  Implied by NETINET
+		or NETISO; required by SMTP.  This gives you other good
+		stuff -- it should be on.
+DAEMON		Define this to get general network support.  Implied by
+		NETINET or NETISO.  Defined by default in conf.h.  You
+		almost certainly want it on.
+MATCHGECOS	Permit fuzzy matching of user names against the full
+		name (GECOS) field in the /etc/passwd file.  This should
+		probably be on, since you can disable it from the config
+		file if you want to.  Defined by default in conf.h.
+SETPROCTITLE	Try to set the string printed by "ps" to something
+		informative about what sendmail is doing.  Defined by
+		default in conf.h.
+
+
++---------------------+
+| DNS/RESOLVER ISSUES |
++---------------------+
+
+Many systems have old versions of the resolver library.  At a minimum,
+you should be running BIND 4.8.3; older versions may compile, but they
+have known bugs that should give you pause.
+
+Common problems in old versions include "undefined" errors for
+dn_skipname.
+
+Some people have had a problem with BIND 4.9; it uses some routines
+that it expects to be externally defined such as strerror().  It may
+help to link with "-l44bsd" to solve this problem.
+
+!PLEASE! be sure to link with the same version of the resolver as
+the header files you used -- some people have used the 4.9 headers
+and linked with BIND 4.8 or vice versa, and it doesn't work.
+Unfortunately, it doesn't fail in an obvious way -- things just
+subtly don't work.
+
+
++-------------------------------------+
+| OPERATING SYSTEM AND COMPILE QUIRKS |
++-------------------------------------+
+
+GCC 2.5.x problems  *** IMPORTANT ***
+	Date: Mon, 29 Nov 93 19:08:44 PST
+	From: wilson@cygnus.com (Jim Wilson)
+	Message-Id: <9311300308.AA04608@cygnus.com>
+	To: kenner@vlsi1.ultra.nyu.edu
+	Subject: [cattelan@thebarn.com: gcc 2.5.4-2.5.5 -O bug]
+	Cc: cattelan@thebarn.com, rms@gnu.ai.mit.edu, sendmail@cs.berkeley.edu
+
+	This fixes a problem that occurs when gcc 2.5.5 is used to compile
+	sendmail 8.6.4 with optimization on a sparc.
+
+	Mon Nov 29 19:00:14 1993  Jim Wilson  (wilson@sphagnum.cygnus.com)
+
+		* reload.c (find_reloads_toplev): Replace obsolete reference to
+		BYTE_LOADS_*_EXTEND with LOAD_EXTEND_OP.
+
+	*** clean-ss-931128/reload.c    Sun Nov 14 16:20:01 1993
+	--- ss-931128/reload.c  Mon Nov 29 18:52:55 1993
+	*************** find_reloads_toplev (x, opnum, type, ind
+	*** 3888,3894 ****
+		 force a reload in that case.  So we should not do anything here.  */
+	  
+		else if (regno >= FIRST_PSEUDO_REGISTER
+	! #if defined(BYTE_LOADS_ZERO_EXTEND) || defined(BYTE_LOADS_SIGN_EXTEND)
+		       && (GET_MODE_SIZE (GET_MODE (x))
+			   <= GET_MODE_SIZE (GET_MODE (SUBREG_REG (x))))
+	  #endif
+	--- 3888,3894 ----
+		 force a reload in that case.  So we should not do anything here.  */
+	  
+		else if (regno >= FIRST_PSEUDO_REGISTER
+	! #ifdef LOAD_EXTEND_OP
+		       && (GET_MODE_SIZE (GET_MODE (x))
+			   <= GET_MODE_SIZE (GET_MODE (SUBREG_REG (x))))
+	  #endif
+
+
+SunOS 4.x (Solaris 1.x)
+	You may have to use -lresolv on SunOS.  However, beware that
+	this links in a new version of gethostbyname that does not
+	understand NIS, so you must have all of your hosts in DNS.
+
+	Some people have reported problems with the SunOS version of
+	-lresolv and/or in.named, and suggest that you get a newer
+	version.  The symptoms are delays when you connect to the
+	SMTP server on a SunOS machine or having your domain added to
+	addresses inappropriately.  There is a version of BIND
+	version 4.9 on gatekeeper.DEC.COM in pub/BSD/bind/4.9.
+
+	There is substantial disagreement about whether you can make
+	this work with resolv+, which allows you to specify a search-path
+	of services.  Some people report that it works fine, others
+	claim it doesn't work at all (including causing sendmail to
+	drop core when it tries to do multiple resolv+ lookups for a
+	single job).  I haven't tried resolv+, as we use DNS exclusively.
+
+	Should you want to try resolv+, it is on ftp.uu.net in
+	/networking/ip/dns.
+
+Solaris 2.x (SunOS 5.x)
+	To compile for Solaris, be sure you use -DSOLARIS.
+
+	To the best of my knowledge, Solaris does not have the
+	gethostbyname problem described above.  However, it does
+	have another one:
+
+	From a correspondent:
+
+	   For solaris 2.2, I have 
+
+		hosts:      files dns
+
+	   in /etc/nsswitch.conf and /etc/hosts has to have the fully
+	   qualified host name. I think "files" has to be before "dns"
+	   in /etc/nsswitch.conf during bootup.
+
+	From another correspondent:
+
+	   When running sendmail under Solaris, the gethostbyname()
+	   hack in conf.c which should perform proper canonicalization
+	   of host names could fail.  Result: the host name is not
+	   canonicalized despite the hack, and you'll have to define $j
+	   and $m in sendmail.cf somewhere.
+
+	   The reason could be that /etc/nsswitch.conf is improperly
+	   configured (at least from sendmail's point of view).  For
+	   example, the line
+
+		hosts:      files nisplus dns
+
+	   will make gethostbyname() look in /etc/hosts first, then ask
+	   nisplus, then dns.  However, if /etc/hosts does not contain
+	   the full canonicalized hostname, then no amount of
+	   gethostbyname()s will work.
+
+	   Solution (or rather, a workaround): Ask nisplus first, then
+	   dns, then local files:
+
+		hosts:      nisplus dns [NOTFOUND=return] files
+
+	The Solaris "syslog" function is apparently limited to something
+	about 90 characters because of a kernel limitation.  If you have
+	source code, you can probably up this number.  You can get patches
+	that fix this problem: the patch ids are:
+
+		Solaris 2.1	100834
+		Solaris 2.2	100999
+		Solaris 2.3	101318
+
+	Be sure you have the appropriate patch installed or you won't
+	see system logging.
+
+OSF/1
+	If you are compiling on OSF/1 (DEC Alpha), you must use 
+	-L/usr/shlib (otherwise it core dumps on startup).  You may also
+	need -mld to get the nlist() function, although some versions
+	apparently don't need this.
+	
+	Also, the enclosed makefile removed /usr/sbin/smtpd; if you need
+	it, just create the link to the sendmail binary.
+
+IRIX
+	The header files on SGI IRIX are completely prototyped, and as
+	a result you can sometimes get some warning messages during
+	compilation.  These can be ignored.  There are two errors in
+	deliver only if you are using gcc, both of the form ``warning:
+	passing arg N of `execve' from incompatible pointer type''.
+	Also, if you compile with -DNIS, you will get a complaint
+	about a declaration of struct dom_binding in a prototype
+	when compiling map.c; this is not important because the
+	function being prototyped is not used in that file.
+
+NeXT
+	If you are compiling on NeXT, you will have to create an empty
+	file "unistd.h" and create a file "dirent.h" containing:
+
+		#include <sys/dir.h>
+		#define dirent	direct
+
+	(The Makefile.NeXT should try to do both of these for you.)
+
+	Apparently, there is a bug in getservbyname on Nextstep 3.0
+	that causes it to fail under some circumstances with the
+	message "SYSERR: service "smtp" unknown" logged.  You should
+	be able to work around this by including the line:
+
+		OOPort=25
+
+	in your .cf file.
+
+	You may have to use -DNeXT.
+
+BSDI (BSD/386) 1.0, NetBSD 0.9, FreeBSD 1.0
+	The "m4" from BSDI won't handle the config files properly.
+	I haven't had a chance to test this myself.
+
+	The M4 shipped in FreeBSD and NetBSD 0.9 don't handle the config
+	files properly. One must use either GNU m4 1.1 or the PD-M4
+	recently posted in comp.os.386bsd.bugs (and maybe others).
+	NetBSD-current includes the PD-M4 (as stated in the NetBSD file
+	CHANGES).
+	
+	FreeBSD 1.0 RELEASE has uname(2) now. Use -DUSEUNAME in order to
+	use it (look into Makefile.FreeBSD). NetBSD-current may have
+	it too but it has not been verified.
+
+	You cannot port the latest version of the Berkeley db library
+	and use it with sendmail without recompiling the world.  This
+	is because C library routines use the older version which have
+	incompatible header files -- the result is that it can't read
+	other system files, such as /etc/passwd, unless you use the
+	new db format throughout your system.  You should normally just
+	use the version of db supplied in your release.  You may need
+	to use -DOLD_NEWDB=1 to make this work -- this turns off some
+	new interface calls (for file locking) that are not in older
+	versions of db.  You'll get compile errors if you need this
+	flag and don't have it set.
+
+4.3BSD
+	If you are running a "virgin" version of 4.3BSD, you'll have
+	a very old resolver and be missing some header files.  The
+	header files are simple -- create empty versions and everything
+	will work fine.  For the resolver you should really port a new
+	version (4.8.3 or later) of the resolver; 4.9 is available on
+	gatekeeper.DEC.COM in pub/BSD/bind/4.9.  If you are really
+	determined to continue to use your old, buggy version (or as
+	a shortcut to get sendmail working -- I'm sure you have the
+	best intentions to port a modern version of BIND), you can
+	copy ../contrib/oldbind.compat.c into src and add
+	oldbind.compat.o to OBJADD in the Makefile.
+
+A/UX
+	Date: Tue, 12 Oct 1993 18:28:28 -0400 (EDT)
+	From: "Eric C. Hagberg" <hagberg@med.cornell.edu>
+	Subject: Fix for A/UX ndbm
+
+	I guess this isn't really a sendmail bug, however, it is something
+	that A/UX users should be aware of when compiling sendmail 8.6.
+
+	Apparently, the calls that sendmail is using to the ndbm routines
+	in A/UX 3.0.x contain calls to "broken" routines, in that the
+	aliases database will break when it gets "just a little big"
+	(sorry I don't have exact numbers here, but it broke somewhere
+	around 20-25 aliases for me.), making all aliases non-functional
+	after exceeding this point.
+
+	What I did was to get the gnu-dbm-1.6 package, compile it, and
+	then re-compile sendmail with "-lgdbm", "-DNDBM", and using the
+	ndbm.h header file that comes with the gnu-package. This makes
+	things behave properly.
+
+	I suppose porting the New Berkeley db package is another route,
+	however, I made a quick attempt at it, and found it difficult
+	(not easy at least); the gnu-dbm package "configured" and
+	compiled easily.
+
+DG/UX
+	Apparently, /bin/mail doesn't work properly for delivery on
+	DG/UX -- the person who has this working, Douglas Anderson
+	<dlander@afterlife.ncsc.mil>, used procmail instead.
+
+Apollo DomainOS
+	If you are compiling on Apollo, you will have to create an empty
+	file "unistd.h" and create a file "dirent.h" containing:
+
+		#include <sys/dir.h>
+		#define dirent	direct
+
+	(The Makefile.DomainOS will attempt to do both of these for you.)
+
+HP-UX 8.00
+	Date: Mon, 24 Jan 1994 13:25:45 +0200
+	From: Kimmo Suominen <Kimmo.Suominen@lut.fi>
+	Subject: 8.6.5 w/ HP-UX 8.00 on s300
+
+	Just compiled and fought with sendmail 8.6.5 on a HP9000/360 (ie. a
+	series 300 machine) running HP-UX 8.00.
+
+	I was getting segmentation fault when delivering to a local user.
+	With debugging I saw it was faulting when doing _free@libc... *sigh*
+	It seems the new implementation of malloc on s300 is buggy as of 8.0,
+	so I tried out the one in -lmalloc (malloc(3X)).  With that it seems
+	to work just dandy.
+
+	When linking, you will get the following error:
+
+	ld: multiply defined symbol _freespace in file /usr/lib/libmalloc.a
+
+	but you can just ignore it.  You might want to add this info to the
+	README file for the future...
+
+Linux
+	Something broke between versions 0.99.13 and 0.99.14 of Linux:
+	the flock() system call gives errors.  If you are running .14,
+	you must not use flock.  You can do this with -DHASFLOCK=0.
+
+	Around the inclusion of bind-4.9.3 & linux libc-4.6.20, the
+	initialization of the _res structure changed.  If /etc/hosts.conf
+	was configured as "hosts, bind" the resolver code could return
+	"Name server failure" errors.  This is supposedly fixed in
+	later versions of libc (>= 4.6.29?), and later versions of
+	sendmail (> 8.6.10) try to work around the problem.
+
+	Some older versions (< 4.6.20?) of the libc/include files conflict
+	with sendmail's version of cdefs.h.  Deleting sendmail's version
+	on those systems should be non-harmful, and new versions don't care.
+
+AIX
+	This version of sendmail does not support MB, MG, and MR resource
+	records, which are supported by AIX sendmail.
+
+RISC/os
+	RISC/os from MIPS is a merged AT&T/Berkeley system.  When you
+	compile on that platform you will get duplicate definitions
+	on many files.  You can ignore these.
+
+System V Release 4 Based Systems
+	There is a single Makefile that is intended for all SVR4-based
+	systems (called Makefile.SVR4).  It defines __svr4__, which is
+	predefined by some compilers.  If your compiler already defines
+	this compile variable, you can delete the definition from the
+	Makefile.
+
+	It's been tested on Dell Issue 2.2.
+
+DELL SVR4
+	Date:      Mon, 06 Dec 1993 10:42:29 EST
+	From: "Kimmo Suominen" <kim@grendel.lut.fi>
+	Message-ID: <2d0352f9.lento29@lento29.UUCP>
+	To: eric@cs.berkeley.edu
+	Cc: sendmail@cs.berkeley.edu
+	Subject:   Notes for DELL SVR4
+
+	Eric,
+
+	Here are some notes for compiling Sendmail 8.6.4 on DELL SVR4.  I ran
+	across these things when helping out some people who contacted me by
+	e-mail.
+
+	1) Use gcc 2.4.5 (or later?).  Dell distributes gcc 2.1 with their
+	   Issue 2.2 Unix.  It is too old, and gives you problems with
+	   clock.c, because sigset_t won't get defined in <sys/signal.h>.
+	   This is due to a problematic protection rule in there, and is
+	   fixed with gcc 2.4.5.
+
+	2) If you don't use the new Berkeley DB (-DNEWDB), then you need
+	   to add "-lc -lucb" to the libraries to link with.  This is because
+	   the -ldbm distributed by Dell needs the bcopy, bcmp and bzero
+	   functions.  It is important that you specify both libraries in
+	   the given order to be sure you only get the BSTRING functions
+	   from the UCB library (and not the signal routines etc.).
+
+	3) Don't leave out "-lelf" even if compiling with "-lc -lucb".
+	   The UCB library also has another copy of the nlist routines,
+	   but we do want the ones from "-lelf".
+
+	If anyone needs a compiled gcc 2.4.5 and/or a ported DB library, they
+	can use anonymous ftp to fetch them from lut.fi in the /kim directory. 
+	They are copies of what I use on grendel.lut.fi, and offering them
+	does not imply that I would also support them.  I have sent the DB
+	port for SVR4 back to Keith Bostic for inclusion in the official
+	distribution, but I haven't heard anything from him as of today.
+
+	- gcc-2.4.5-svr4.tar.gz	(gcc 2.4.5 and the corresponding libg++)
+	- db-1.72.tar.gz	(with source, objects and a installed copy)
+
+	Cheers
+	+ Kim
+	-- 
+	 *  Kimmo.Suominen@lut.fi  *  SysVr4 enthusiast at GRENDEL.LUT.FI  *
+	*    KIM@FINFILES.BITNET   *  Postmaster and Hostmaster at LUT.FI   *
+	 *    + 358 200 865 718    *  Unix area moderator at NIC.FUNET.FI  *
+
+
+Non-DNS based sites
+	This version of sendmail always tries to connect to the Domain
+	Name System (DNS) to resolve names, regardless of the setting
+	of the `I' option.  On most systems that are not running DNS,
+	this will fail quickly and sendmail will continue, but on some
+	systems it has a long timeout.  If you have this problem, you
+	will have to recompile without NAMED_BIND.  Some people have
+	claimed that they have successfully used "OI+USEVC" to force
+	sendmail to use a virtual circuit -- this will always time out
+	quickly, but also tells sendmail that a failed connection
+	should requeue the message (probably not what you intended).
+	A future release of sendmail will correct this problem.
+
+Both NEWDB and NDBM
+	If you use both -DNDBM and -DNEWDB, you must delete the module
+	ndbm.o from libdb.a and delete the file "ndbm.h" from the files
+	that get installed (that is, use the OLD ndbm.h, not the new
+	ndbm.h).  This compatibility module maps ndbm calls into DB
+	calls, and breaks things rather badly.
+
+GNU getopt
+	I'm told that GNU getopt has a problem in that it gets confused
+	by the double call.  Use the version in conf.c instead.
+
+BIND 4.9.2 and Ultrix
+	If you are running on Ultrix, be sure you read the conf/Info.Ultrix
+	carefully -- there is information in there that you need to know
+	in order to avoid errors of the form:
+
+		/lib/libc.a(gethostent.o): sethostent: multiply defined
+		/lib/libc.a(gethostent.o): endhostent: multiply defined
+		/lib/libc.a(gethostent.o): gethostbyname: multiply defined
+		/lib/libc.a(gethostent.o): gethostbyaddr: multiply defined
+
+	during the link stage.
+
+
++--------------+
+| MANUAL PAGES |
++--------------+
+
+The manual pages have been written against the -mandoc macros
+instead of the -man macros.  The latest version of groff has them
+included.  You can also get a copy from FTP.UU.NET in directory
+/systems/unix/bsd-sources/share/tmac.
+
+
++-----------------+
+| DEBUGGING HOOKS |
++-----------------+
+
+As of 8.6.5, sendmail daemons will catch a SIGUSR1 signal and log
+some debugging output (logged at LOG_DEBUG severity).  The
+information dumped is:
+
+ * The value of the $j macro.
+ * A warning if $j is not in the set $=w.
+ * A list of the open file descriptors.
+ * The contents of the connection cache.
+ * If ruleset 89 is defined, it is evaluated and the results printed.
+
+This allows you to get information regarding the runtime state of the
+daemon on the fly.  This should not be done too frequently, since
+the process of rewriting may lose memory which will not be recovered.
+Also, ruleset 89 may call non-reentrant routines, so there is a small
+non-zero probability that this will cause other problems.  It is
+really only for debugging serious problems.
+
+A typical formulation of ruleset 89 would be:
+
+	R$*		$@ $>0 some test address
+
+
++-----------------------------+
+| DESCRIPTION OF SOURCE FILES |
++-----------------------------+
+
+The following list describes the files in this directory:
+
+Makefile	The makefile used here; this version only works with
+		the new Berkeley make.
+Makefile.dist	A trimmed down version of the makefile that works with
+		the old make.
+READ_ME		This file.
+TRACEFLAGS	My own personal list of the trace flags -- not guaranteed
+		to be particularly up to date.
+alias.c		Does name aliasing in all forms.
+arpadate.c	A subroutine which creates ARPANET standard dates.
+clock.c		Routines to implement real-time oriented functions
+		in sendmail -- e.g., timeouts.
+collect.c	The routine that actually reads the mail into a temp
+		file.  It also does a certain amount of parsing of
+		the header, etc.
+conf.c		The configuration file.  This contains information
+		that is presumed to be quite static and non-
+		controversial, or code compiled in for efficiency
+		reasons.  Most of the configuration is in sendmail.cf.
+conf.h		Configuration that must be known everywhere.
+convtime.c	A routine to sanely process times.
+daemon.c	Routines to implement daemon mode.  This version is
+		specifically for Berkeley 4.1 IPC.
+deliver.c	Routines to deliver mail.
+domain.c	Routines that interface with DNS (the Domain Name
+		System).
+err.c		Routines to print error messages.
+envelope.c	Routines to manipulate the envelope structure.
+headers.c	Routines to process message headers.
+macro.c		The macro expander.  This is used internally to
+		insert information from the configuration file.
+main.c		The main routine to sendmail.  This file also
+		contains some miscellaneous routines.
+map.c		Support for database maps.
+mci.c		Routines that handle mail connection information caching.
+parseaddr.c	The routines which do address parsing.
+queue.c		Routines to implement message queueing.
+readcf.c	The routine that reads the configuration file and
+		translates it to internal form.
+recipient.c	Routines that manipulate the recipient list.
+savemail.c	Routines which save the letter on processing errors.
+sendmail.h	Main header file for sendmail.
+srvrsmtp.c	Routines to implement server SMTP.
+stab.c		Routines to manage the symbol table.
+stats.c		Routines to collect and post the statistics.
+sysexits.c	List of error messages associated with error codes
+		in sysexits.h.
+trace.c		The trace package.  These routines allow setting and
+		testing of trace flags with a high granularity.
+udb.c		The user database interface module.
+usersmtp.c	Routines to implement user SMTP.
+util.c		Some general purpose routines used by sendmail.
+version.c	The version number and information about this
+		version of sendmail.  Theoretically, this gets
+		modified on every change.
+
+Eric Allman
+
+(Version 8.61.1.1, last update 3/5/95 12:52:16)
diff --git a/usr.sbin/sendmail/src/TRACEFLAGS b/usr.sbin/sendmail/src/TRACEFLAGS
new file mode 100644
index 00000000000..f05c219c871
--- /dev/null
+++ b/usr.sbin/sendmail/src/TRACEFLAGS
@@ -0,0 +1,64 @@
+0, 1	main.c		main	skip background fork
+0, 4	main.c		main	canonical name, UUCP node name, a.k.a.s
+0, 15	main.c		main	print configuration
+0, 44	util.c		printav	print address of each string
+1	main.c		main	print from person
+2	main.c		finis
+3	conf.c		getla
+4	conf.c		enoughspace
+5	clock.c		setevent, clrevent, tick
+6	savemail.c	savemail, returntosender
+7	queue.c		queuename
+8	domain.c	getmxrr, getcanonname
+9	daemon.c	getauthinfo	IDENT protocol
+9	daemon.c	maphostname
+10	deliver.c	deliver
+11	deliver.c	openmailer, mailfile
+12	parseaddr.c	remotename
+13	deliver.c	sendall, sendenvelope
+14	headers.c	commaize
+15	daemon.c	getrequests
+16	daemon.c	makeconnection
+17	deliver.c	hostsignature
+17	domain.c	mxrand
+18	usersmtp.c	reply, smtpmessage, smtpinit, smtpmailfrom
+19	srvrsmtp.c	smtp
+20	parseaddr.c	parseaddr
+21	parseaddr.c	rewrite
+22	parseaddr.c	prescan
+24	parseaddr.c	buildaddr, allocaddr
+25	recipient.c	sendtolist
+26	recipient.c	recipient
+27	alias.c		alias
+27	alias.c		readaliases
+27	alias.c		forward
+27	recipient.c	include
+28	udb.c		udbexpand, udbsender
+29	parseaddr.c	maplocaluser
+29	recipient.c	recipient (local users), finduser
+30	collect.c	collect
+30	collect.c	eatfrom
+31	headers.c	chompheader
+32	headers.c	eatheader
+33	headers.c	crackaddr
+34	headers.c	putheader
+35	macro.c		expand, define
+36	stab.c		stab
+37	readcf.c	(many)
+38	map.c		initmaps
+39	map.c		map_rewrite
+40	queue.c		queueup, orderq, dowork
+41	queue.c		orderq
+42	mci.c		mci_get
+45	envelope.c	setsender
+46	envelope.c	openxscript
+49	conf.c		checkcompat
+50	envelope.c	dropenvelope
+51	queue.c		unlockqueue
+52	main.c		disconnect
+53	util.c		xfclose
+54	err.c		putoutmsg
+55	conf.c		lockfile
+59	Extended Load Average implementation from Christophe Wolfhugel
+60	map.c
+91	mci.c		syslogging of MCI cache information
diff --git a/usr.sbin/sendmail/src/alias.c b/usr.sbin/sendmail/src/alias.c
new file mode 100644
index 00000000000..9952db53fd4
--- /dev/null
+++ b/usr.sbin/sendmail/src/alias.c
@@ -0,0 +1,770 @@
+/*
+ * Copyright (c) 1983 Eric P. Allman
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+# include "sendmail.h"
+# include <pwd.h>
+
+#ifndef lint
+static char sccsid[] = "@(#)alias.c	8.25 (Berkeley) 4/14/94";
+#endif /* not lint */
+
+
+MAP	*AliasDB[MAXALIASDB + 1];	/* actual database list */
+int	NAliasDBs;			/* number of alias databases */
+/*
+**  ALIAS -- Compute aliases.
+**
+**	Scans the alias file for an alias for the given address.
+**	If found, it arranges to deliver to the alias list instead.
+**	Uses libdbm database if -DDBM.
+**
+**	Parameters:
+**		a -- address to alias.
+**		sendq -- a pointer to the head of the send queue
+**			to put the aliases in.
+**		e -- the current envelope.
+**
+**	Returns:
+**		none
+**
+**	Side Effects:
+**		Aliases found are expanded.
+**
+**	Deficiencies:
+**		It should complain about names that are aliased to
+**			nothing.
+*/
+
+alias(a, sendq, e)
+	register ADDRESS *a;
+	ADDRESS **sendq;
+	register ENVELOPE *e;
+{
+	register char *p;
+	int naliases;
+	char *owner;
+	char obuf[MAXNAME + 6];
+	extern char *aliaslookup();
+
+	if (tTd(27, 1))
+		printf("alias(%s)\n", a->q_paddr);
+
+	/* don't realias already aliased names */
+	if (bitset(QDONTSEND|QBADADDR|QVERIFIED, a->q_flags))
+		return;
+
+	if (NoAlias)
+		return;
+
+	e->e_to = a->q_paddr;
+
+	/*
+	**  Look up this name
+	*/
+
+	p = aliaslookup(a->q_user, e);
+	if (p == NULL)
+		return;
+
+	/*
+	**  Match on Alias.
+	**	Deliver to the target list.
+	*/
+
+	if (tTd(27, 1))
+		printf("%s (%s, %s) aliased to %s\n",
+		    a->q_paddr, a->q_host, a->q_user, p);
+	if (bitset(EF_VRFYONLY, e->e_flags))
+	{
+		a->q_flags |= QVERIFIED;
+		e->e_nrcpts++;
+		return;
+	}
+	message("aliased to %s", p);
+#ifdef LOG
+	if (LogLevel > 9)
+		syslog(LOG_INFO, "%s: alias %s => %s",
+			e->e_id == NULL ? "NOQUEUE" : e->e_id,
+			a->q_paddr, p);
+#endif
+	a->q_flags &= ~QSELFREF;
+	AliasLevel++;
+	naliases = sendtolist(p, a, sendq, e);
+	AliasLevel--;
+	if (!bitset(QSELFREF, a->q_flags))
+	{
+		if (tTd(27, 5))
+		{
+			printf("alias: QDONTSEND ");
+			printaddr(a, FALSE);
+		}
+		a->q_flags |= QDONTSEND;
+	}
+
+	/*
+	**  Look for owner of alias
+	*/
+
+	(void) strcpy(obuf, "owner-");
+	if (strncmp(a->q_user, "owner-", 6) == 0)
+		(void) strcat(obuf, "owner");
+	else
+		(void) strcat(obuf, a->q_user);
+	if (!bitnset(M_USR_UPPER, a->q_mailer->m_flags))
+		makelower(obuf);
+	owner = aliaslookup(obuf, e);
+	if (owner == NULL)
+		return;
+
+	/* reflect owner into envelope sender */
+	if (strpbrk(owner, ",:/|\"") != NULL)
+		owner = obuf;
+	a->q_owner = newstr(owner);
+
+	/* announce delivery to this alias; NORECEIPT bit set later */
+	if (e->e_xfp != NULL)
+	{
+		fprintf(e->e_xfp, "Message delivered to mailing list %s\n",
+			a->q_paddr);
+		e->e_flags |= EF_SENDRECEIPT;
+	}
+}
+/*
+**  ALIASLOOKUP -- look up a name in the alias file.
+**
+**	Parameters:
+**		name -- the name to look up.
+**
+**	Returns:
+**		the value of name.
+**		NULL if unknown.
+**
+**	Side Effects:
+**		none.
+**
+**	Warnings:
+**		The return value will be trashed across calls.
+*/
+
+char *
+aliaslookup(name, e)
+	char *name;
+	ENVELOPE *e;
+{
+	register int dbno;
+	register MAP *map;
+	register char *p;
+
+	for (dbno = 0; dbno < NAliasDBs; dbno++)
+	{
+		auto int stat;
+
+		map = AliasDB[dbno];
+		if (!bitset(MF_OPEN, map->map_mflags))
+			continue;
+		p = (*map->map_class->map_lookup)(map, name, NULL, &stat);
+		if (p != NULL)
+			return p;
+	}
+	return NULL;
+}
+/*
+**  SETALIAS -- set up an alias map
+**
+**	Called when reading configuration file.
+**
+**	Parameters:
+**		spec -- the alias specification
+**
+**	Returns:
+**		none.
+*/
+
+setalias(spec)
+	char *spec;
+{
+	register char *p;
+	register MAP *map;
+	char *class;
+	STAB *s;
+
+	if (tTd(27, 8))
+		printf("setalias(%s)\n", spec);
+
+	for (p = spec; p != NULL; )
+	{
+		char aname[50];
+
+		while (isspace(*p))
+			p++;
+		if (*p == '\0')
+			break;
+		spec = p;
+
+		if (NAliasDBs >= MAXALIASDB)
+		{
+			syserr("Too many alias databases defined, %d max", MAXALIASDB);
+			return;
+		}
+		(void) sprintf(aname, "Alias%d", NAliasDBs);
+		s = stab(aname, ST_MAP, ST_ENTER);
+		map = &s->s_map;
+		AliasDB[NAliasDBs] = map;
+		bzero(map, sizeof *map);
+
+		p = strpbrk(p, " ,/:");
+		if (p != NULL && *p == ':')
+		{
+			/* map name */
+			*p++ = '\0';
+			class = spec;
+			spec = p;
+		}
+		else
+		{
+			class = "implicit";
+			map->map_mflags = MF_OPTIONAL|MF_INCLNULL;
+		}
+
+		/* find end of spec */
+		if (p != NULL)
+			p = strchr(p, ',');
+		if (p != NULL)
+			*p++ = '\0';
+
+		/* look up class */
+		s = stab(class, ST_MAPCLASS, ST_FIND);
+		if (s == NULL)
+		{
+			if (tTd(27, 1))
+				printf("Unknown alias class %s\n", class);
+		}
+		else if (!bitset(MCF_ALIASOK, s->s_mapclass.map_cflags))
+		{
+			syserr("setalias: map class %s can't handle aliases",
+				class);
+		}
+		else
+		{
+			map->map_class = &s->s_mapclass;
+			if (map->map_class->map_parse(map, spec))
+			{
+				map->map_mflags |= MF_VALID|MF_ALIAS;
+				NAliasDBs++;
+			}
+		}
+	}
+}
+/*
+**  ALIASWAIT -- wait for distinguished @:@ token to appear.
+**
+**	This can decide to reopen or rebuild the alias file
+**
+**	Parameters:
+**		map -- a pointer to the map descriptor for this alias file.
+**		ext -- the filename extension (e.g., ".db") for the
+**			database file.
+**		isopen -- if set, the database is already open, and we
+**			should check for validity; otherwise, we are
+**			just checking to see if it should be created.
+**
+**	Returns:
+**		TRUE -- if the database is open when we return.
+**		FALSE -- if the database is closed when we return.
+*/
+
+bool
+aliaswait(map, ext, isopen)
+	MAP *map;
+	char *ext;
+	int isopen;
+{
+	bool attimeout = FALSE;
+	time_t mtime;
+	struct stat stb;
+	char buf[MAXNAME];
+
+	if (tTd(27, 3))
+		printf("aliaswait(%s:%s)\n",
+			map->map_class->map_cname, map->map_file);
+	if (bitset(MF_ALIASWAIT, map->map_mflags))
+		return isopen;
+	map->map_mflags |= MF_ALIASWAIT;
+
+	if (SafeAlias > 0)
+	{
+		auto int st;
+		time_t toolong = curtime() + SafeAlias;
+		unsigned int sleeptime = 2;
+
+		while (isopen &&
+		       map->map_class->map_lookup(map, "@", NULL, &st) == NULL)
+		{
+			if (curtime() > toolong)
+			{
+				/* we timed out */
+				attimeout = TRUE;
+				break;
+			}
+
+			/*
+			**  Close and re-open the alias database in case
+			**  the one is mv'ed instead of cp'ed in.
+			*/
+
+			if (tTd(27, 2))
+				printf("aliaswait: sleeping for %d seconds\n",
+					sleeptime);
+
+			map->map_class->map_close(map);
+			sleep(sleeptime);
+			sleeptime *= 2;
+			if (sleeptime > 60)
+				sleeptime = 60;
+			isopen = map->map_class->map_open(map, O_RDONLY);
+		}
+	}
+
+	/* see if we need to go into auto-rebuild mode */
+	if (!bitset(MCF_REBUILDABLE, map->map_class->map_cflags))
+	{
+		if (tTd(27, 3))
+			printf("aliaswait: not rebuildable\n");
+		map->map_mflags &= ~MF_ALIASWAIT;
+		return isopen;
+	}
+	if (stat(map->map_file, &stb) < 0)
+	{
+		if (tTd(27, 3))
+			printf("aliaswait: no source file\n");
+		map->map_mflags &= ~MF_ALIASWAIT;
+		return isopen;
+	}
+	mtime = stb.st_mtime;
+	(void) strcpy(buf, map->map_file);
+	if (ext != NULL)
+		(void) strcat(buf, ext);
+	if (stat(buf, &stb) < 0 || stb.st_mtime < mtime || attimeout)
+	{
+		/* database is out of date */
+		if (AutoRebuild && stb.st_ino != 0 && stb.st_uid == geteuid())
+		{
+			message("auto-rebuilding alias database %s", buf);
+			if (isopen)
+				map->map_class->map_close(map);
+			rebuildaliases(map, TRUE);
+			isopen = map->map_class->map_open(map, O_RDONLY);
+		}
+		else
+		{
+#ifdef LOG
+			if (LogLevel > 3)
+				syslog(LOG_INFO, "alias database %s out of date",
+					buf);
+#endif /* LOG */
+			message("Warning: alias database %s out of date", buf);
+		}
+	}
+	map->map_mflags &= ~MF_ALIASWAIT;
+	return isopen;
+}
+/*
+**  REBUILDALIASES -- rebuild the alias database.
+**
+**	Parameters:
+**		map -- the database to rebuild.
+**		automatic -- set if this was automatically generated.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		Reads the text version of the database, builds the
+**		DBM or DB version.
+*/
+
+rebuildaliases(map, automatic)
+	register MAP *map;
+	bool automatic;
+{
+	FILE *af;
+	bool nolock = FALSE;
+	sigfunc_t oldsigint;
+
+	if (!bitset(MCF_REBUILDABLE, map->map_class->map_cflags))
+		return;
+
+	/* try to lock the source file */
+	if ((af = fopen(map->map_file, "r+")) == NULL)
+	{
+		if ((errno != EACCES && errno != EROFS) || automatic ||
+		    (af = fopen(map->map_file, "r")) == NULL)
+		{
+			int saveerr = errno;
+
+			if (tTd(27, 1))
+				printf("Can't open %s: %s\n",
+					map->map_file, errstring(saveerr));
+			if (!automatic)
+				message("newaliases: cannot open %s: %s",
+					map->map_file, errstring(saveerr));
+			errno = 0;
+			return;
+		}
+		nolock = TRUE;
+		message("warning: cannot lock %s: %s",
+			map->map_file, errstring(errno));
+	}
+
+	/* see if someone else is rebuilding the alias file */
+	if (!nolock &&
+	    !lockfile(fileno(af), map->map_file, NULL, LOCK_EX|LOCK_NB))
+	{
+		/* yes, they are -- wait until done */
+		message("Alias file %s is already being rebuilt",
+			map->map_file);
+		if (OpMode != MD_INITALIAS)
+		{
+			/* wait for other rebuild to complete */
+			(void) lockfile(fileno(af), map->map_file, NULL,
+					LOCK_EX);
+		}
+		(void) xfclose(af, "rebuildaliases1", map->map_file);
+		errno = 0;
+		return;
+	}
+
+	oldsigint = setsignal(SIGINT, SIG_IGN);
+
+	if (map->map_class->map_open(map, O_RDWR))
+	{
+#ifdef LOG
+		if (LogLevel > 7)
+		{
+			syslog(LOG_NOTICE, "alias database %s %srebuilt by %s",
+				map->map_file, automatic ? "auto" : "",
+				username());
+		}
+#endif /* LOG */
+		map->map_mflags |= MF_OPEN|MF_WRITABLE;
+		readaliases(map, af, automatic);
+	}
+	else
+	{
+		if (tTd(27, 1))
+			printf("Can't create database for %s: %s\n",
+				map->map_file, errstring(errno));
+		if (!automatic)
+			syserr("Cannot create database for alias file %s",
+				map->map_file);
+	}
+
+	/* close the file, thus releasing locks */
+	xfclose(af, "rebuildaliases2", map->map_file);
+
+	/* add distinguished entries and close the database */
+	if (bitset(MF_OPEN, map->map_mflags))
+		map->map_class->map_close(map);
+
+	/* restore the old signal */
+	(void) setsignal(SIGINT, oldsigint);
+}
+/*
+**  READALIASES -- read and process the alias file.
+**
+**	This routine implements the part of initaliases that occurs
+**	when we are not going to use the DBM stuff.
+**
+**	Parameters:
+**		map -- the alias database descriptor.
+**		af -- file to read the aliases from.
+**		automatic -- set if this was an automatic rebuild.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		Reads aliasfile into the symbol table.
+**		Optionally, builds the .dir & .pag files.
+*/
+
+readaliases(map, af, automatic)
+	register MAP *map;
+	FILE *af;
+	int automatic;
+{
+	register char *p;
+	char *rhs;
+	bool skipping;
+	long naliases, bytes, longest;
+	ADDRESS al, bl;
+	char line[BUFSIZ];
+
+	/*
+	**  Read and interpret lines
+	*/
+
+	FileName = map->map_file;
+	LineNumber = 0;
+	naliases = bytes = longest = 0;
+	skipping = FALSE;
+	while (fgets(line, sizeof (line), af) != NULL)
+	{
+		int lhssize, rhssize;
+
+		LineNumber++;
+		p = strchr(line, '\n');
+		if (p != NULL)
+			*p = '\0';
+		switch (line[0])
+		{
+		  case '#':
+		  case '\0':
+			skipping = FALSE;
+			continue;
+
+		  case ' ':
+		  case '\t':
+			if (!skipping)
+				syserr("554 Non-continuation line starts with space");
+			skipping = TRUE;
+			continue;
+		}
+		skipping = FALSE;
+
+		/*
+		**  Process the LHS
+		**	Find the colon separator, and parse the address.
+		**	It should resolve to a local name -- this will
+		**	be checked later (we want to optionally do
+		**	parsing of the RHS first to maximize error
+		**	detection).
+		*/
+
+		for (p = line; *p != '\0' && *p != ':' && *p != '\n'; p++)
+			continue;
+		if (*p++ != ':')
+		{
+			syserr("554 missing colon");
+			continue;
+		}
+		if (parseaddr(line, &al, RF_COPYALL, ':', NULL, CurEnv) == NULL)
+		{
+			syserr("554 %.40s... illegal alias name", line);
+			continue;
+		}
+
+		/*
+		**  Process the RHS.
+		**	'al' is the internal form of the LHS address.
+		**	'p' points to the text of the RHS.
+		*/
+
+		while (isascii(*p) && isspace(*p))
+			p++;
+		rhs = p;
+		for (;;)
+		{
+			register char c;
+			register char *nlp;
+
+			nlp = &p[strlen(p)];
+			if (nlp[-1] == '\n')
+				*--nlp = '\0';
+
+			if (CheckAliases)
+			{
+				/* do parsing & compression of addresses */
+				while (*p != '\0')
+				{
+					auto char *delimptr;
+
+					while ((isascii(*p) && isspace(*p)) ||
+								*p == ',')
+						p++;
+					if (*p == '\0')
+						break;
+					if (parseaddr(p, &bl, RF_COPYNONE, ',',
+						      &delimptr, CurEnv) == NULL)
+						usrerr("553 %s... bad address", p);
+					p = delimptr;
+				}
+			}
+			else
+			{
+				p = nlp;
+			}
+
+			/* see if there should be a continuation line */
+			c = fgetc(af);
+			if (!feof(af))
+				(void) ungetc(c, af);
+			if (c != ' ' && c != '\t')
+				break;
+
+			/* read continuation line */
+			if (fgets(p, sizeof line - (p - line), af) == NULL)
+				break;
+			LineNumber++;
+
+			/* check for line overflow */
+			if (strchr(p, '\n') == NULL)
+			{
+				usrerr("554 alias too long");
+				break;
+			}
+		}
+		if (al.q_mailer != LocalMailer)
+		{
+			syserr("554 %s... cannot alias non-local names",
+				al.q_paddr);
+			continue;
+		}
+
+		/*
+		**  Insert alias into symbol table or DBM file
+		*/
+
+		if (!bitnset(M_USR_UPPER, al.q_mailer->m_flags))
+			makelower(al.q_user);
+
+		lhssize = strlen(al.q_user);
+		rhssize = strlen(rhs);
+		map->map_class->map_store(map, al.q_user, rhs);
+
+		if (al.q_paddr != NULL)
+			free(al.q_paddr);
+		if (al.q_host != NULL)
+			free(al.q_host);
+		if (al.q_user != NULL)
+			free(al.q_user);
+
+		/* statistics */
+		naliases++;
+		bytes += lhssize + rhssize;
+		if (rhssize > longest)
+			longest = rhssize;
+	}
+
+	CurEnv->e_to = NULL;
+	FileName = NULL;
+	if (Verbose || !automatic)
+		message("%s: %d aliases, longest %d bytes, %d bytes total",
+			map->map_file, naliases, longest, bytes);
+# ifdef LOG
+	if (LogLevel > 7)
+		syslog(LOG_INFO, "%s: %d aliases, longest %d bytes, %d bytes total",
+			map->map_file, naliases, longest, bytes);
+# endif /* LOG */
+}
+/*
+**  FORWARD -- Try to forward mail
+**
+**	This is similar but not identical to aliasing.
+**
+**	Parameters:
+**		user -- the name of the user who's mail we would like
+**			to forward to.  It must have been verified --
+**			i.e., the q_home field must have been filled
+**			in.
+**		sendq -- a pointer to the head of the send queue to
+**			put this user's aliases in.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		New names are added to send queues.
+*/
+
+forward(user, sendq, e)
+	ADDRESS *user;
+	ADDRESS **sendq;
+	register ENVELOPE *e;
+{
+	char *pp;
+	char *ep;
+
+	if (tTd(27, 1))
+		printf("forward(%s)\n", user->q_paddr);
+
+	if (user->q_mailer != LocalMailer || bitset(QBADADDR, user->q_flags))
+		return;
+	if (user->q_home == NULL)
+	{
+		syserr("554 forward: no home");
+		user->q_home = "/nosuchdirectory";
+	}
+
+	/* good address -- look for .forward file in home */
+	define('z', user->q_home, e);
+	define('u', user->q_user, e);
+	define('h', user->q_host, e);
+	if (ForwardPath == NULL)
+		ForwardPath = newstr("\201z/.forward");
+
+	for (pp = ForwardPath; pp != NULL; pp = ep)
+	{
+		int err;
+		char buf[MAXPATHLEN+1];
+
+		ep = strchr(pp, ':');
+		if (ep != NULL)
+			*ep = '\0';
+		expand(pp, buf, &buf[sizeof buf - 1], e);
+		if (ep != NULL)
+			*ep++ = ':';
+		if (tTd(27, 3))
+			printf("forward: trying %s\n", buf);
+
+		err = include(buf, TRUE, user, sendq, e);
+		if (err == 0)
+			break;
+		else if (transienterror(err))
+		{
+			/* we have to suspend this message */
+			if (tTd(27, 2))
+				printf("forward: transient error on %s\n", buf);
+#ifdef LOG
+			if (LogLevel > 2)
+				syslog(LOG_ERR, "%s: forward %s: transient error: %s",
+					e->e_id == NULL ? "NOQUEUE" : e->e_id,
+					buf, errstring(err));
+#endif
+			message("%s: %s: message queued", buf, errstring(err));
+			user->q_flags |= QQUEUEUP;
+			return;
+		}
+	}
+}
diff --git a/usr.sbin/sendmail/src/aliases b/usr.sbin/sendmail/src/aliases
new file mode 100644
index 00000000000..7540eeae3f6
--- /dev/null
+++ b/usr.sbin/sendmail/src/aliases
@@ -0,0 +1,53 @@
+#
+#	@(#)aliases	8.2 (Berkeley) 3/5/94
+#
+#  Aliases in this file will NOT be expanded in the header from
+#  Mail, but WILL be visible over networks or from /bin/mail.
+#
+#	>>>>>>>>>>	The program "newaliases" must be run after
+#	>> NOTE >>	this file is updated for any changes to
+#	>>>>>>>>>>	show through to sendmail.
+#
+
+# Basic system aliases -- these MUST be present.
+MAILER-DAEMON:	postmaster
+postmaster:	root
+
+# General redirections for pseudo accounts.
+bin:		root
+daemon:		root
+games:		root
+ingres:		root
+nobody:		root
+system:		root
+toor:		root
+uucp:		root
+
+# Well-known aliases.
+manager:	root
+dumper:		root
+operator:	root
+
+# trap decode to catch security attacks
+decode:		root
+
+# OFFICIAL CSRG/BUG ADDRESSES
+
+# Ftp maintainer.
+ftp: ftp-bugs
+ftp-bugs: bigbug@cs.berkeley.edu
+
+# Distribution office.
+bsd-dist: bsd-dist@cs.berkeley.edu
+
+# Fortune maintainer.
+fortune: fortune@cs.berkeley.edu
+
+# Termcap maintainer.
+termcap: termcap@cs.berkeley.edu
+
+# General bug address.
+ucb-fixes: bigbug@cs.berkeley.edu
+ucb-fixes-request: bigbug@cs.berkeley.edu
+bugs: bugs@cs.berkeley.edu
+# END OFFICIAL BUG ADDRESSES
diff --git a/usr.sbin/sendmail/src/aliases.5 b/usr.sbin/sendmail/src/aliases.5
new file mode 100644
index 00000000000..f40f64de10b
--- /dev/null
+++ b/usr.sbin/sendmail/src/aliases.5
@@ -0,0 +1,106 @@
+.\" Copyright (c) 1985, 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 3. All advertising materials mentioning features or use of this software
+.\"    must display the following acknowledgement:
+.\"	This product includes software developed by the University of
+.\"	California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     @(#)aliases.5	8.2 (Berkeley) 12/11/93
+.\"
+.Dd December 11, 1993
+.Dt ALIASES 5
+.Os BSD 4
+.Sh NAME
+.Nm aliases
+.Nd aliases file for sendmail
+.Sh SYNOPSIS
+.Nm aliases
+.Sh DESCRIPTION
+This file describes user
+.Tn ID
+aliases used by
+.Pa /usr/sbin/sendmail .
+The file resides in
+.Pa /etc
+and
+is formatted as a series of lines of the form
+.Bd -filled -offset indent
+name: name_1, name2, name_3, . . .
+.Ed
+.Pp
+The
+.Em name
+is the name to alias, and the
+.Em name_n
+are the aliases for that name.
+Lines beginning with white space are continuation lines.
+Lines beginning with
+.Ql #
+are comments.
+.Pp
+Aliasing occurs only on local names.
+Loops can not occur, since no message will be sent to any person more than once.
+.Pp
+After aliasing has been done, local and valid recipients who have a
+.Dq Pa .forward
+file in their home directory have messages forwarded to the
+list of users defined in that file.
+.Pp
+This is only the raw data file; the actual aliasing information is
+placed into a binary format in the file
+.Pa /etc/aliases.db
+using the program
+.Xr newaliases 1 .
+A
+.Xr newaliases
+command should be executed each time the aliases file is changed for the
+change to take effect.
+.Sh SEE  ALSO
+.Xr newaliases 1 ,
+.Xr dbopen 3 ,
+.Xr dbm 3 ,
+.Xr sendmail 8
+.Rs
+.%T "SENDMAIL Installation and Operation Guide"
+.Re
+.Rs
+.%T "SENDMAIL An Internetwork Mail Router"
+.Re
+.Sh BUGS
+If you have compiled
+.Xr sendmail
+with DBM support instead of NEWDB,
+you may have encountered problems in
+.Xr dbm 3
+restricting a single alias to about 1000 bytes of information.
+You can get longer aliases by ``chaining''; that is, make the last name in
+the alias be a dummy name which is a continuation alias.
+.Sh HISTORY
+The
+.Nm
+file format appeared in
+.Bx 4.0 .
diff --git a/usr.sbin/sendmail/src/arpadate.c b/usr.sbin/sendmail/src/arpadate.c
new file mode 100644
index 00000000000..d3f9ac574a6
--- /dev/null
+++ b/usr.sbin/sendmail/src/arpadate.c
@@ -0,0 +1,173 @@
+/*
+ * Copyright (c) 1983 Eric P. Allman
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)arpadate.c	8.1 (Berkeley) 6/7/93";
+#endif /* not lint */
+
+# include "sendmail.h"
+
+/*
+**  ARPADATE -- Create date in ARPANET format
+**
+**	Parameters:
+**		ud -- unix style date string.  if NULL, one is created.
+**
+**	Returns:
+**		pointer to an ARPANET date field
+**
+**	Side Effects:
+**		none
+**
+**	WARNING:
+**		date is stored in a local buffer -- subsequent
+**		calls will overwrite.
+**
+**	Bugs:
+**		Timezone is computed from local time, rather than
+**		from whereever (and whenever) the message was sent.
+**		To do better is very hard.
+**
+**		Some sites are now inserting the timezone into the
+**		local date.  This routine should figure out what
+**		the format is and work appropriately.
+*/
+
+char *
+arpadate(ud)
+	register char *ud;
+{
+	register char *p;
+	register char *q;
+	register int off;
+	register int i;
+	register struct tm *lt;
+	time_t t;
+	struct tm gmt;
+	static char b[40];
+
+	/*
+	**  Get current time.
+	**	This will be used if a null argument is passed and
+	**	to resolve the timezone.
+	*/
+
+	(void) time(&t);
+	if (ud == NULL)
+		ud = ctime(&t);
+
+	/*
+	**  Crack the UNIX date line in a singularly unoriginal way.
+	*/
+
+	q = b;
+
+	p = &ud[0];		/* Mon */
+	*q++ = *p++;
+	*q++ = *p++;
+	*q++ = *p++;
+	*q++ = ',';
+	*q++ = ' ';
+
+	p = &ud[8];		/* 16 */
+	if (*p == ' ')
+		p++;
+	else
+		*q++ = *p++;
+	*q++ = *p++;
+	*q++ = ' ';
+
+	p = &ud[4];		/* Sep */
+	*q++ = *p++;
+	*q++ = *p++;
+	*q++ = *p++;
+	*q++ = ' ';
+
+	p = &ud[20];		/* 1979 */
+	*q++ = *p++;
+	*q++ = *p++;
+	*q++ = *p++;
+	*q++ = *p++;
+	*q++ = ' ';
+
+	p = &ud[11];		/* 01:03:52 */
+	for (i = 8; i > 0; i--)
+		*q++ = *p++;
+
+	/*
+	 * should really get the timezone from the time in "ud" (which
+	 * is only different if a non-null arg was passed which is different
+	 * from the current time), but for all practical purposes, returning
+	 * the current local zone will do (its all that is ever needed).
+	 */
+	gmt = *gmtime(&t);
+	lt = localtime(&t);
+
+	off = (lt->tm_hour - gmt.tm_hour) * 60 + lt->tm_min - gmt.tm_min;
+
+	/* assume that offset isn't more than a day ... */
+	if (lt->tm_year < gmt.tm_year)
+		off -= 24 * 60;
+	else if (lt->tm_year > gmt.tm_year)
+		off += 24 * 60;
+	else if (lt->tm_yday < gmt.tm_yday)
+		off -= 24 * 60;
+	else if (lt->tm_yday > gmt.tm_yday)
+		off += 24 * 60;
+
+	*q++ = ' ';
+	if (off == 0) {
+		*q++ = 'G';
+		*q++ = 'M';
+		*q++ = 'T';
+	} else {
+		if (off < 0) {
+			off = -off;
+			*q++ = '-';
+		} else
+			*q++ = '+';
+
+		if (off >= 24*60)		/* should be impossible */
+			off = 23*60+59;		/* if not, insert silly value */
+
+		*q++ = (off / 600) + '0';
+		*q++ = (off / 60) % 10 + '0';
+		off %= 60;
+		*q++ = (off / 10) + '0';
+		*q++ = (off % 10) + '0';
+	}
+	*q = '\0';
+
+	return (b);
+}
diff --git a/usr.sbin/sendmail/src/cdefs.h b/usr.sbin/sendmail/src/cdefs.h
new file mode 100644
index 00000000000..e586cbfaf7c
--- /dev/null
+++ b/usr.sbin/sendmail/src/cdefs.h
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 1991, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Berkeley Software Design, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)cdefs.h	8.8 (Berkeley) 1/9/95
+ */
+
+#ifndef	_CDEFS_H_
+#define	_CDEFS_H_
+
+#if defined(__cplusplus)
+#define	__BEGIN_DECLS	extern "C" {
+#define	__END_DECLS	};
+#else
+#define	__BEGIN_DECLS
+#define	__END_DECLS
+#endif
+
+/*
+ * The __CONCAT macro is used to concatenate parts of symbol names, e.g.
+ * with "#define OLD(foo) __CONCAT(old,foo)", OLD(foo) produces oldfoo.
+ * The __CONCAT macro is a bit tricky -- make sure you don't put spaces
+ * in between its arguments.  __CONCAT can also concatenate double-quoted
+ * strings produced by the __STRING macro, but this only works with ANSI C.
+ */
+#if defined(__STDC__) || defined(__cplusplus)
+#define	__P(protos)	protos		/* full-blown ANSI C */
+#define	__CONCAT(x,y)	x ## y
+#define	__STRING(x)	#x
+
+#define	__const		const		/* define reserved names to standard */
+#define	__signed	signed
+#define	__volatile	volatile
+#if defined(__cplusplus)
+#define	__inline	inline		/* convert to C++ keyword */
+#else
+#ifndef __GNUC__
+#define	__inline			/* delete GCC keyword */
+#endif /* !__GNUC__ */
+#endif /* !__cplusplus */
+
+#else	/* !(__STDC__ || __cplusplus) */
+#define	__P(protos)	()		/* traditional C preprocessor */
+#define	__CONCAT(x,y)	x/**/y
+#define	__STRING(x)	"x"
+
+#ifndef __GNUC__
+#define	__const				/* delete pseudo-ANSI C keywords */
+#define	__inline
+#define	__signed
+#define	__volatile
+/*
+ * In non-ANSI C environments, new programs will want ANSI-only C keywords
+ * deleted from the program and old programs will want them left alone.
+ * When using a compiler other than gcc, programs using the ANSI C keywords
+ * const, inline etc. as normal identifiers should define -DNO_ANSI_KEYWORDS.
+ * When using "gcc -traditional", we assume that this is the intent; if
+ * __GNUC__ is defined but __STDC__ is not, we leave the new keywords alone.
+ */
+#ifndef	NO_ANSI_KEYWORDS
+#define	const				/* delete ANSI C keywords */
+#define	inline
+#define	signed
+#define	volatile
+#endif
+#endif	/* !__GNUC__ */
+#endif	/* !(__STDC__ || __cplusplus) */
+
+/*
+ * GCC1 and some versions of GCC2 declare dead (non-returning) and
+ * pure (no side effects) functions using "volatile" and "const";
+ * unfortunately, these then cause warnings under "-ansi -pedantic".
+ * GCC2 uses a new, peculiar __attribute__((attrs)) style.  All of
+ * these work for GNU C++ (modulo a slight glitch in the C++ grammar
+ * in the distribution version of 2.5.5).
+ */
+#if !defined(__GNUC__) || __GNUC__ < 2 || \
+	(__GNUC__ == 2 && __GNUC_MINOR__ < 5)
+#define	__attribute__(x)	/* delete __attribute__ if non-gcc or gcc1 */
+#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+#define	__dead		__volatile
+#define	__pure		__const
+#endif
+#endif
+
+/* Delete pseudo-keywords wherever they are not available or needed. */
+#ifndef __dead
+#define	__dead
+#define	__pure
+#endif
+
+#endif /* !_CDEFS_H_ */
diff --git a/usr.sbin/sendmail/src/clock.c b/usr.sbin/sendmail/src/clock.c
new file mode 100644
index 00000000000..45ef1c2782c
--- /dev/null
+++ b/usr.sbin/sendmail/src/clock.c
@@ -0,0 +1,276 @@
+/*
+ * Copyright (c) 1983 Eric P. Allman
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)clock.c	8.8 (Berkeley) 1/12/94";
+#endif /* not lint */
+
+# include "sendmail.h"
+
+# ifndef sigmask
+#  define sigmask(s)	(1 << ((s) - 1))
+# endif
+
+/*
+**  SETEVENT -- set an event to happen at a specific time.
+**
+**	Events are stored in a sorted list for fast processing.
+**	An event only applies to the process that set it.
+**
+**	Parameters:
+**		intvl -- intvl until next event occurs.
+**		func -- function to call on event.
+**		arg -- argument to func on event.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		none.
+*/
+
+static void tick __P((int));
+
+EVENT *
+setevent(intvl, func, arg)
+	time_t intvl;
+	int (*func)();
+	int arg;
+{
+	register EVENT **evp;
+	register EVENT *ev;
+	auto time_t now;
+
+	if (intvl <= 0)
+	{
+		syserr("554 setevent: intvl=%ld\n", intvl);
+		return (NULL);
+	}
+
+	(void) setsignal(SIGALRM, SIG_IGN);
+	(void) time(&now);
+
+	/* search event queue for correct position */
+	for (evp = &EventQueue; (ev = *evp) != NULL; evp = &ev->ev_link)
+	{
+		if (ev->ev_time >= now + intvl)
+			break;
+	}
+
+	/* insert new event */
+	ev = (EVENT *) xalloc(sizeof *ev);
+	ev->ev_time = now + intvl;
+	ev->ev_func = func;
+	ev->ev_arg = arg;
+	ev->ev_pid = getpid();
+	ev->ev_link = *evp;
+	*evp = ev;
+
+	if (tTd(5, 5))
+		printf("setevent: intvl=%ld, for=%ld, func=%x, arg=%d, ev=%x\n",
+			intvl, now + intvl, func, arg, ev);
+
+	tick(0);
+	return (ev);
+}
+/*
+**  CLREVENT -- remove an event from the event queue.
+**
+**	Parameters:
+**		ev -- pointer to event to remove.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		arranges for event ev to not happen.
+*/
+
+clrevent(ev)
+	register EVENT *ev;
+{
+	register EVENT **evp;
+
+	if (tTd(5, 5))
+		printf("clrevent: ev=%x\n", ev);
+	if (ev == NULL)
+		return;
+
+	/* find the parent event */
+	(void) setsignal(SIGALRM, SIG_IGN);
+	for (evp = &EventQueue; *evp != NULL; evp = &(*evp)->ev_link)
+	{
+		if (*evp == ev)
+			break;
+	}
+
+	/* now remove it */
+	if (*evp != NULL)
+	{
+		*evp = ev->ev_link;
+		free((char *) ev);
+	}
+
+	/* restore clocks and pick up anything spare */
+	tick(0);
+}
+/*
+**  TICK -- take a clock tick
+**
+**	Called by the alarm clock.  This routine runs events as needed.
+**
+**	Parameters:
+**		One that is ignored; for compatibility with signal handlers.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		calls the next function in EventQueue.
+*/
+
+static void
+tick(arg)
+	int arg;
+{
+	register time_t now;
+	register EVENT *ev;
+	int mypid = getpid();
+	int olderrno = errno;
+#ifdef SIG_UNBLOCK
+	sigset_t ss;
+#endif
+
+	(void) setsignal(SIGALRM, SIG_IGN);
+	(void) alarm(0);
+	now = curtime();
+
+	if (tTd(5, 4))
+		printf("tick: now=%ld\n", now);
+
+	while ((ev = EventQueue) != NULL &&
+	       (ev->ev_time <= now || ev->ev_pid != mypid))
+	{
+		int (*f)();
+		int arg;
+		int pid;
+
+		/* process the event on the top of the queue */
+		ev = EventQueue;
+		EventQueue = EventQueue->ev_link;
+		if (tTd(5, 6))
+			printf("tick: ev=%x, func=%x, arg=%d, pid=%d\n", ev,
+				ev->ev_func, ev->ev_arg, ev->ev_pid);
+
+		/* we must be careful in here because ev_func may not return */
+		f = ev->ev_func;
+		arg = ev->ev_arg;
+		pid = ev->ev_pid;
+		free((char *) ev);
+		if (pid != getpid())
+			continue;
+		if (EventQueue != NULL)
+		{
+			if (EventQueue->ev_time > now)
+				(void) alarm((unsigned) (EventQueue->ev_time - now));
+			else
+				(void) alarm(3);
+		}
+
+		/* restore signals so that we can take ticks while in ev_func */
+		(void) setsignal(SIGALRM, tick);
+#ifdef SIG_UNBLOCK
+		/* unblock SIGALRM signal */
+		sigemptyset(&ss);
+		sigaddset(&ss, SIGALRM);
+		sigprocmask(SIG_UNBLOCK, &ss, NULL);
+#else
+#ifdef SIGVTALRM
+		/* reset 4.2bsd signal mask to allow future alarms */
+		(void) sigsetmask(sigblock(0) & ~sigmask(SIGALRM));
+#endif /* SIGVTALRM */
+#endif /* SIG_UNBLOCK */
+
+		/* call ev_func */
+		errno = olderrno;
+		(*f)(arg);
+		(void) alarm(0);
+		now = curtime();
+	}
+	(void) setsignal(SIGALRM, tick);
+	if (EventQueue != NULL)
+		(void) alarm((unsigned) (EventQueue->ev_time - now));
+	errno = olderrno;
+}
+/*
+**  SLEEP -- a version of sleep that works with this stuff
+**
+**	Because sleep uses the alarm facility, I must reimplement
+**	it here.
+**
+**	Parameters:
+**		intvl -- time to sleep.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		waits for intvl time.  However, other events can
+**		be run during that interval.
+*/
+
+static bool	SleepDone;
+static int	endsleep();
+
+#ifndef SLEEP_T
+# define SLEEP_T	unsigned int
+#endif
+
+SLEEP_T
+sleep(intvl)
+	unsigned int intvl;
+{
+	if (intvl == 0)
+		return;
+	SleepDone = FALSE;
+	(void) setevent((time_t) intvl, endsleep, 0);
+	while (!SleepDone)
+		pause();
+}
+
+static
+endsleep()
+{
+	SleepDone = TRUE;
+}
diff --git a/usr.sbin/sendmail/src/collect.c b/usr.sbin/sendmail/src/collect.c
new file mode 100644
index 00000000000..b77f6e985e3
--- /dev/null
+++ b/usr.sbin/sendmail/src/collect.c
@@ -0,0 +1,579 @@
+/*
+ * Copyright (c) 1983 Eric P. Allman
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)collect.c	8.14 (Berkeley) 4/18/94";
+#endif /* not lint */
+
+# include <errno.h>
+# include "sendmail.h"
+
+/*
+**  COLLECT -- read & parse message header & make temp file.
+**
+**	Creates a temporary file name and copies the standard
+**	input to that file.  Leading UNIX-style "From" lines are
+**	stripped off (after important information is extracted).
+**
+**	Parameters:
+**		smtpmode -- if set, we are running SMTP: give an RFC821
+**			style message to say we are ready to collect
+**			input, and never ignore a single dot to mean
+**			end of message.
+**		requeueflag -- this message will be requeued later, so
+**			don't do final processing on it.
+**		e -- the current envelope.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		Temp file is created and filled.
+**		The from person may be set.
+*/
+
+char	*CollectErrorMessage;
+bool	CollectErrno;
+
+collect(smtpmode, requeueflag, e)
+	bool smtpmode;
+	bool requeueflag;
+	register ENVELOPE *e;
+{
+	register FILE *tf;
+	bool ignrdot = smtpmode ? FALSE : IgnrDot;
+	char buf[MAXLINE], buf2[MAXLINE];
+	register char *workbuf, *freebuf;
+	bool inputerr = FALSE;
+	extern char *hvalue();
+	extern bool isheader(), flusheol();
+
+	CollectErrorMessage = NULL;
+	CollectErrno = 0;
+
+	/*
+	**  Create the temp file name and create the file.
+	*/
+
+	e->e_df = queuename(e, 'd');
+	e->e_df = newstr(e->e_df);
+	if ((tf = dfopen(e->e_df, O_WRONLY|O_CREAT|O_TRUNC, FileMode)) == NULL)
+	{
+		syserr("Cannot create %s", e->e_df);
+		NoReturn = TRUE;
+		finis();
+	}
+
+	/*
+	**  Tell ARPANET to go ahead.
+	*/
+
+	if (smtpmode)
+		message("354 Enter mail, end with \".\" on a line by itself");
+
+	/* set global timer to monitor progress */
+	sfgetset(TimeOuts.to_datablock);
+
+	/*
+	**  Try to read a UNIX-style From line
+	*/
+
+	if (sfgets(buf, MAXLINE, InChannel, TimeOuts.to_datablock,
+			"initial message read") == NULL)
+		goto readerr;
+	fixcrlf(buf, FALSE);
+# ifndef NOTUNIX
+	if (!SaveFrom && strncmp(buf, "From ", 5) == 0)
+	{
+		if (!flusheol(buf, InChannel))
+			goto readerr;
+		eatfrom(buf, e);
+		if (sfgets(buf, MAXLINE, InChannel, TimeOuts.to_datablock,
+				"message header read") == NULL)
+			goto readerr;
+		fixcrlf(buf, FALSE);
+	}
+# endif /* NOTUNIX */
+
+	/*
+	**  Copy InChannel to temp file & do message editing.
+	**	To keep certain mailers from getting confused,
+	**	and to keep the output clean, lines that look
+	**	like UNIX "From" lines are deleted in the header.
+	*/
+
+	workbuf = buf;		/* `workbuf' contains a header field */
+	freebuf = buf2;		/* `freebuf' can be used for read-ahead */
+	for (;;)
+	{
+		char *curbuf;
+		int curbuffree;
+		register int curbuflen;
+		char *p;
+
+		/* first, see if the header is over */
+		if (!isheader(workbuf))
+		{
+			fixcrlf(workbuf, TRUE);
+			break;
+		}
+
+		/* if the line is too long, throw the rest away */
+		if (!flusheol(workbuf, InChannel))
+			goto readerr;
+
+		/* it's okay to toss '\n' now (flusheol() needed it) */
+		fixcrlf(workbuf, TRUE);
+
+		curbuf = workbuf;
+		curbuflen = strlen(curbuf);
+		curbuffree = MAXLINE - curbuflen;
+		p = curbuf + curbuflen;
+
+		/* get the rest of this field */
+		for (;;)
+		{
+			int clen;
+
+			if (sfgets(freebuf, MAXLINE, InChannel,
+					TimeOuts.to_datablock,
+					"message header read") == NULL)
+			{
+				freebuf[0] = '\0';
+				break;
+			}
+
+			/* is this a continuation line? */
+			if (*freebuf != ' ' && *freebuf != '\t')
+				break;
+
+			if (!flusheol(freebuf, InChannel))
+				goto readerr;
+
+			fixcrlf(freebuf, TRUE);
+			clen = strlen(freebuf) + 1;
+
+			/* if insufficient room, dynamically allocate buffer */
+			if (clen >= curbuffree)
+			{
+				/* reallocate buffer */
+				int nbuflen = ((p - curbuf) + clen) * 2;
+				char *nbuf = xalloc(nbuflen);
+
+				p = nbuf + curbuflen;
+				curbuffree = nbuflen - curbuflen;
+				bcopy(curbuf, nbuf, curbuflen);
+				if (curbuf != buf && curbuf != buf2)
+					free(curbuf);
+				curbuf = nbuf;
+			}
+			*p++ = '\n';
+			bcopy(freebuf, p, clen - 1);
+			p += clen - 1;
+			curbuffree -= clen;
+			curbuflen += clen;
+		}
+		*p++ = '\0';
+
+		e->e_msgsize += curbuflen;
+
+		/*
+		**  The working buffer now becomes the free buffer, since
+		**  the free buffer contains a new header field.
+		**
+		**  This is premature, since we still havent called
+		**  chompheader() to process the field we just created
+		**  (so the call to chompheader() will use `freebuf').
+		**  This convolution is necessary so that if we break out
+		**  of the loop due to H_EOH, `workbuf' will always be
+		**  the next unprocessed buffer.
+		*/
+
+		{
+			register char *tmp = workbuf;
+			workbuf = freebuf;
+			freebuf = tmp;
+		}
+
+		/*
+		**  Snarf header away.
+		*/
+
+		if (bitset(H_EOH, chompheader(curbuf, FALSE, e)))
+			break;
+
+		/*
+		**  If the buffer was dynamically allocated, free it.
+		*/
+
+		if (curbuf != buf && curbuf != buf2)
+			free(curbuf);
+	}
+
+	if (tTd(30, 1))
+		printf("EOH\n");
+
+	if (*workbuf == '\0')
+	{
+		/* throw away a blank line */
+		if (sfgets(buf, MAXLINE, InChannel, TimeOuts.to_datablock,
+				"message separator read") == NULL)
+			goto readerr;
+	}
+	else if (workbuf == buf2)	/* guarantee `buf' contains data */
+		(void) strcpy(buf, buf2);
+
+	/*
+	**  Collect the body of the message.
+	*/
+
+	for (;;)
+	{
+		register char *bp = buf;
+
+		fixcrlf(buf, TRUE);
+
+		/* check for end-of-message */
+		if (!ignrdot && buf[0] == '.' && (buf[1] == '\n' || buf[1] == '\0'))
+			break;
+
+		/* check for transparent dot */
+		if ((OpMode == MD_SMTP || OpMode == MD_DAEMON) &&
+		    bp[0] == '.' && bp[1] == '.')
+			bp++;
+
+		/*
+		**  Figure message length, output the line to the temp
+		**  file, and insert a newline if missing.
+		*/
+
+		e->e_msgsize += strlen(bp) + 1;
+		fputs(bp, tf);
+		fputs("\n", tf);
+		if (ferror(tf))
+			tferror(tf, e);
+		if (sfgets(buf, MAXLINE, InChannel, TimeOuts.to_datablock,
+				"message body read") == NULL)
+			goto readerr;
+	}
+
+	if (feof(InChannel) || ferror(InChannel))
+	{
+readerr:
+		if (tTd(30, 1))
+			printf("collect: read error\n");
+		inputerr = TRUE;
+	}
+
+	/* reset global timer */
+	sfgetset((time_t) 0);
+
+	if (fflush(tf) != 0)
+		tferror(tf, e);
+	if (fsync(fileno(tf)) < 0 || fclose(tf) < 0)
+	{
+		tferror(tf, e);
+		finis();
+	}
+
+	if (CollectErrorMessage != NULL && Errors <= 0)
+	{
+		if (CollectErrno != 0)
+		{
+			errno = CollectErrno;
+			syserr(CollectErrorMessage, e->e_df);
+			finis();
+		}
+		usrerr(CollectErrorMessage);
+	}
+	else if (inputerr && (OpMode == MD_SMTP || OpMode == MD_DAEMON))
+	{
+		/* An EOF when running SMTP is an error */
+		char *host;
+		char *problem;
+
+		host = RealHostName;
+		if (host == NULL)
+			host = "localhost";
+
+		if (feof(InChannel))
+			problem = "unexpected close";
+		else if (ferror(InChannel))
+			problem = "I/O error";
+		else
+			problem = "read timeout";
+# ifdef LOG
+		if (LogLevel > 0 && feof(InChannel))
+			syslog(LOG_NOTICE,
+			    "collect: %s on connection from %s, sender=%s: %s\n",
+			    problem, host, e->e_from.q_paddr, errstring(errno));
+# endif
+		if (feof(InChannel))
+			usrerr("451 collect: %s on connection from %s, from=%s",
+				problem, host, e->e_from.q_paddr);
+		else
+			syserr("451 collect: %s on connection from %s, from=%s",
+				problem, host, e->e_from.q_paddr);
+
+		/* don't return an error indication */
+		e->e_to = NULL;
+		e->e_flags &= ~EF_FATALERRS;
+		e->e_flags |= EF_CLRQUEUE;
+
+		/* and don't try to deliver the partial message either */
+		if (InChild)
+			ExitStat = EX_QUIT;
+		finis();
+	}
+
+	/*
+	**  Find out some information from the headers.
+	**	Examples are who is the from person & the date.
+	*/
+
+	eatheader(e, !requeueflag);
+
+	/* collect statistics */
+	if (OpMode != MD_VERIFY)
+		markstats(e, (ADDRESS *) NULL);
+
+	/*
+	**  Add an Apparently-To: line if we have no recipient lines.
+	*/
+
+	if (hvalue("to", e) == NULL && hvalue("cc", e) == NULL &&
+	    hvalue("bcc", e) == NULL && hvalue("apparently-to", e) == NULL)
+	{
+		register ADDRESS *q;
+
+		/* create an Apparently-To: field */
+		/*    that or reject the message.... */
+		for (q = e->e_sendqueue; q != NULL; q = q->q_next)
+		{
+			if (q->q_alias != NULL)
+				continue;
+			if (tTd(30, 3))
+				printf("Adding Apparently-To: %s\n", q->q_paddr);
+			addheader("Apparently-To", q->q_paddr, e);
+		}
+	}
+
+	/* check for message too large */
+	if (MaxMessageSize > 0 && e->e_msgsize > MaxMessageSize)
+	{
+		usrerr("552 Message exceeds maximum fixed size (%ld)",
+			MaxMessageSize);
+	}
+
+	if ((e->e_dfp = fopen(e->e_df, "r")) == NULL)
+	{
+		/* we haven't acked receipt yet, so just chuck this */
+		syserr("Cannot reopen %s", e->e_df);
+		finis();
+	}
+}
+/*
+**  FLUSHEOL -- if not at EOL, throw away rest of input line.
+**
+**	Parameters:
+**		buf -- last line read in (checked for '\n'),
+**		fp -- file to be read from.
+**
+**	Returns:
+**		FALSE on error from sfgets(), TRUE otherwise.
+**
+**	Side Effects:
+**		none.
+*/
+
+bool
+flusheol(buf, fp)
+	char *buf;
+	FILE *fp;
+{
+	register char *p = buf;
+	char junkbuf[MAXLINE];
+
+	while (strchr(p, '\n') == NULL)
+	{
+		CollectErrorMessage = "553 header line too long";
+		CollectErrno = 0;
+		if (sfgets(junkbuf, MAXLINE, fp, TimeOuts.to_datablock,
+				"long line flush") == NULL)
+			return (FALSE);
+		p = junkbuf;
+	}
+
+	return (TRUE);
+}
+/*
+**  TFERROR -- signal error on writing the temporary file.
+**
+**	Parameters:
+**		tf -- the file pointer for the temporary file.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		Gives an error message.
+**		Arranges for following output to go elsewhere.
+*/
+
+tferror(tf, e)
+	FILE *tf;
+	register ENVELOPE *e;
+{
+	CollectErrno = errno;
+	if (errno == ENOSPC)
+	{
+		struct stat st;
+		long avail;
+		long bsize;
+
+		NoReturn = TRUE;
+		if (fstat(fileno(tf), &st) < 0)
+			st.st_size = 0;
+		(void) freopen(e->e_df, "w", tf);
+		if (st.st_size <= 0)
+			fprintf(tf, "\n*** Mail could not be accepted");
+		else if (sizeof st.st_size > sizeof (long))
+			fprintf(tf, "\n*** Mail of at least %qd bytes could not be accepted\n",
+				st.st_size);
+		else
+			fprintf(tf, "\n*** Mail of at least %ld bytes could not be accepted\n",
+				st.st_size);
+		fprintf(tf, "*** at %s due to lack of disk space for temp file.\n",
+			MyHostName);
+		avail = freespace(QueueDir, &bsize);
+		if (avail > 0)
+		{
+			if (bsize > 1024)
+				avail *= bsize / 1024;
+			else if (bsize < 1024)
+				avail /= 1024 / bsize;
+			fprintf(tf, "*** Currently, %ld kilobytes are available for mail temp files.\n",
+				avail);
+		}
+		CollectErrorMessage = "452 Out of disk space for temp file";
+	}
+	else
+	{
+		CollectErrorMessage = "cannot write message body to disk (%s)";
+	}
+	(void) freopen("/dev/null", "w", tf);
+}
+/*
+**  EATFROM -- chew up a UNIX style from line and process
+**
+**	This does indeed make some assumptions about the format
+**	of UNIX messages.
+**
+**	Parameters:
+**		fm -- the from line.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		extracts what information it can from the header,
+**		such as the date.
+*/
+
+# ifndef NOTUNIX
+
+char	*DowList[] =
+{
+	"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", NULL
+};
+
+char	*MonthList[] =
+{
+	"Jan", "Feb", "Mar", "Apr", "May", "Jun",
+	"Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
+	NULL
+};
+
+eatfrom(fm, e)
+	char *fm;
+	register ENVELOPE *e;
+{
+	register char *p;
+	register char **dt;
+
+	if (tTd(30, 2))
+		printf("eatfrom(%s)\n", fm);
+
+	/* find the date part */
+	p = fm;
+	while (*p != '\0')
+	{
+		/* skip a word */
+		while (*p != '\0' && *p != ' ')
+			p++;
+		while (*p == ' ')
+			p++;
+		if (!(isascii(*p) && isupper(*p)) ||
+		    p[3] != ' ' || p[13] != ':' || p[16] != ':')
+			continue;
+
+		/* we have a possible date */
+		for (dt = DowList; *dt != NULL; dt++)
+			if (strncmp(*dt, p, 3) == 0)
+				break;
+		if (*dt == NULL)
+			continue;
+
+		for (dt = MonthList; *dt != NULL; dt++)
+			if (strncmp(*dt, &p[4], 3) == 0)
+				break;
+		if (*dt != NULL)
+			break;
+	}
+
+	if (*p != '\0')
+	{
+		char *q;
+		extern char *arpadate();
+
+		/* we have found a date */
+		q = xalloc(25);
+		(void) strncpy(q, p, 25);
+		q[24] = '\0';
+		q = arpadate(q);
+		define('a', newstr(q), e);
+	}
+}
+
+# endif /* NOTUNIX */
diff --git a/usr.sbin/sendmail/src/conf.c b/usr.sbin/sendmail/src/conf.c
new file mode 100644
index 00000000000..5559a741d15
--- /dev/null
+++ b/usr.sbin/sendmail/src/conf.c
@@ -0,0 +1,2387 @@
+/*
+ * Copyright (c) 1983 Eric P. Allman
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)conf.c	8.89.1.3 (Berkeley) 3/7/95";
+#endif /* not lint */
+
+# include "sendmail.h"
+# include "pathnames.h"
+# include <sys/ioctl.h>
+# include <sys/param.h>
+# include <netdb.h>
+# include <pwd.h>
+
+/*
+**  CONF.C -- Sendmail Configuration Tables.
+**
+**	Defines the configuration of this installation.
+**
+**	Configuration Variables:
+**		HdrInfo -- a table describing well-known header fields.
+**			Each entry has the field name and some flags,
+**			which are described in sendmail.h.
+**
+**	Notes:
+**		I have tried to put almost all the reasonable
+**		configuration information into the configuration
+**		file read at runtime.  My intent is that anything
+**		here is a function of the version of UNIX you
+**		are running, or is really static -- for example
+**		the headers are a superset of widely used
+**		protocols.  If you find yourself playing with
+**		this file too much, you may be making a mistake!
+*/
+
+
+
+
+/*
+**  Header info table
+**	Final (null) entry contains the flags used for any other field.
+**
+**	Not all of these are actually handled specially by sendmail
+**	at this time.  They are included as placeholders, to let
+**	you know that "someday" I intend to have sendmail do
+**	something with them.
+*/
+
+struct hdrinfo	HdrInfo[] =
+{
+		/* originator fields, most to least significant  */
+	"resent-sender",	H_FROM|H_RESENT,
+	"resent-from",		H_FROM|H_RESENT,
+	"resent-reply-to",	H_FROM|H_RESENT,
+	"sender",		H_FROM,
+	"from",			H_FROM,
+	"reply-to",		H_FROM,
+	"full-name",		H_ACHECK,
+	"return-receipt-to",	H_FROM|H_RECEIPTTO,
+	"errors-to",		H_FROM|H_ERRORSTO,
+
+		/* destination fields */
+	"to",			H_RCPT,
+	"resent-to",		H_RCPT|H_RESENT,
+	"cc",			H_RCPT,
+	"resent-cc",		H_RCPT|H_RESENT,
+	"bcc",			H_RCPT|H_ACHECK,
+	"resent-bcc",		H_RCPT|H_ACHECK|H_RESENT,
+	"apparently-to",	H_RCPT,
+
+		/* message identification and control */
+	"message-id",		0,
+	"resent-message-id",	H_RESENT,
+	"message",		H_EOH,
+	"text",			H_EOH,
+
+		/* date fields */
+	"date",			0,
+	"resent-date",		H_RESENT,
+
+		/* trace fields */
+	"received",		H_TRACE|H_FORCE,
+	"x400-received",	H_TRACE|H_FORCE,
+	"via",			H_TRACE|H_FORCE,
+	"mail-from",		H_TRACE|H_FORCE,
+
+		/* miscellaneous fields */
+	"comments",		H_FORCE,
+	"return-path",		H_FORCE|H_ACHECK,
+
+	NULL,			0,
+};
+
+
+
+/*
+**  Location of system files/databases/etc.
+*/
+
+char	*PidFile =	_PATH_SENDMAILPID;	/* stores daemon proc id */
+
+
+
+/*
+**  Privacy values
+*/
+
+struct prival PrivacyValues[] =
+{
+	"public",		PRIV_PUBLIC,
+	"needmailhelo",		PRIV_NEEDMAILHELO,
+	"needexpnhelo",		PRIV_NEEDEXPNHELO,
+	"needvrfyhelo",		PRIV_NEEDVRFYHELO,
+	"noexpn",		PRIV_NOEXPN,
+	"novrfy",		PRIV_NOVRFY,
+	"restrictmailq",	PRIV_RESTRICTMAILQ,
+	"restrictqrun",		PRIV_RESTRICTQRUN,
+	"authwarnings",		PRIV_AUTHWARNINGS,
+	"noreceipts",		PRIV_NORECEIPTS,
+	"goaway",		PRIV_GOAWAY,
+	NULL,			0,
+};
+
+
+
+/*
+**  Miscellaneous stuff.
+*/
+
+int	DtableSize =	50;		/* max open files; reset in 4.2bsd */
+
+
+/*
+**  Following should be config parameters (and probably will be in
+**  future releases).  In the meantime, setting these is considered
+**  unsupported, and is intentionally undocumented.
+*/
+
+#ifdef BROKENSMTPPEERS
+bool	BrokenSmtpPeers = TRUE;		/* set if you have broken SMTP peers */
+#else
+bool	BrokenSmtpPeers = FALSE;	/* set if you have broken SMTP peers */
+#endif
+#ifdef NOLOOPBACKCHECK
+bool	CheckLoopBack = FALSE;		/* set to check HELO loopback */
+#else
+bool	CheckLoopBack = TRUE;		/* set to check HELO loopback */
+#endif
+
+/*
+**  SETDEFAULTS -- set default values
+**
+**	Because of the way freezing is done, these must be initialized
+**	using direct code.
+**
+**	Parameters:
+**		e -- the default envelope.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		Initializes a bunch of global variables to their
+**		default values.
+*/
+
+#define DAYS		* 24 * 60 * 60
+
+setdefaults(e)
+	register ENVELOPE *e;
+{
+	SpaceSub = ' ';				/* option B */
+	QueueLA = 8;				/* option x */
+	RefuseLA = 12;				/* option X */
+	WkRecipFact = 30000L;			/* option y */
+	WkClassFact = 1800L;			/* option z */
+	WkTimeFact = 90000L;			/* option Z */
+	QueueFactor = WkRecipFact * 20;		/* option q */
+	FileMode = (RealUid != geteuid()) ? 0644 : 0600;
+						/* option F */
+	DefUid = 1;				/* option u */
+	DefGid = 1;				/* option g */
+	CheckpointInterval = 10;		/* option C */
+	MaxHopCount = 25;			/* option h */
+	e->e_sendmode = SM_FORK;		/* option d */
+	e->e_errormode = EM_PRINT;		/* option e */
+	SevenBit = FALSE;			/* option 7 */
+	MaxMciCache = 1;			/* option k */
+	MciCacheTimeout = 300;			/* option K */
+	LogLevel = 9;				/* option L */
+	settimeouts(NULL);			/* option r */
+	TimeOuts.to_q_return = 5 DAYS;		/* option T */
+	TimeOuts.to_q_warning = 0;		/* option T */
+	PrivacyFlags = 0;			/* option p */
+	setdefuser();
+	setupmaps();
+	setupmailers();
+}
+
+
+/*
+**  SETDEFUSER -- set/reset DefUser using DefUid (for initgroups())
+*/
+
+setdefuser()
+{
+	struct passwd *defpwent;
+	static char defuserbuf[40];
+
+	DefUser = defuserbuf;
+	if ((defpwent = getpwuid(DefUid)) != NULL)
+		strcpy(defuserbuf, defpwent->pw_name);
+	else
+		strcpy(defuserbuf, "nobody");
+}
+/*
+**  HOST_MAP_INIT -- initialize host class structures
+*/
+
+bool host_map_init __P((MAP *map, char *args));
+
+bool
+host_map_init(map, args)
+	MAP *map;
+	char *args;
+{
+	register char *p = args;
+
+	for (;;)
+	{
+		while (isascii(*p) && isspace(*p))
+			p++;
+		if (*p != '-')
+			break;
+		switch (*++p)
+		{
+		  case 'a':
+			map->map_app = ++p;
+			break;
+		}
+		while (*p != '\0' && !(isascii(*p) && isspace(*p)))
+			p++;
+		if (*p != '\0')
+			*p++ = '\0';
+	}
+	if (map->map_app != NULL)
+		map->map_app = newstr(map->map_app);
+	return TRUE;
+}
+/*
+**  SETUPMAILERS -- initialize default mailers
+*/
+
+setupmailers()
+{
+	char buf[100];
+
+	strcpy(buf, "prog, P=/bin/sh, F=lsD, A=sh -c $u");
+	makemailer(buf);
+
+	strcpy(buf, "*file*, P=/dev/null, F=lsDFMPEu, A=FILE");
+	makemailer(buf);
+
+	strcpy(buf, "*include*, P=/dev/null, F=su, A=INCLUDE");
+	makemailer(buf);
+}
+/*
+**  SETUPMAPS -- set up map classes
+*/
+
+#define MAPDEF(name, ext, flags, parse, open, close, lookup, store) \
+	{ \
+		extern bool parse __P((MAP *, char *)); \
+		extern bool open __P((MAP *, int)); \
+		extern void close __P((MAP *)); \
+		extern char *lookup __P((MAP *, char *, char **, int *)); \
+		extern void store __P((MAP *, char *, char *)); \
+		s = stab(name, ST_MAPCLASS, ST_ENTER); \
+		s->s_mapclass.map_cname = name; \
+		s->s_mapclass.map_ext = ext; \
+		s->s_mapclass.map_cflags = flags; \
+		s->s_mapclass.map_parse = parse; \
+		s->s_mapclass.map_open = open; \
+		s->s_mapclass.map_close = close; \
+		s->s_mapclass.map_lookup = lookup; \
+		s->s_mapclass.map_store = store; \
+	}
+
+setupmaps()
+{
+	register STAB *s;
+
+#ifdef NEWDB
+	MAPDEF("hash", ".db", MCF_ALIASOK|MCF_REBUILDABLE,
+		map_parseargs, hash_map_open, db_map_close,
+		db_map_lookup, db_map_store);
+	MAPDEF("btree", ".db", MCF_ALIASOK|MCF_REBUILDABLE,
+		map_parseargs, bt_map_open, db_map_close,
+		db_map_lookup, db_map_store);
+#endif
+
+#ifdef NDBM
+	MAPDEF("dbm", ".dir", MCF_ALIASOK|MCF_REBUILDABLE,
+		map_parseargs, ndbm_map_open, ndbm_map_close,
+		ndbm_map_lookup, ndbm_map_store);
+#endif
+
+#ifdef NIS
+	MAPDEF("nis", NULL, MCF_ALIASOK,
+		map_parseargs, nis_map_open, nis_map_close,
+		nis_map_lookup, nis_map_store);
+#endif
+
+	MAPDEF("stab", NULL, MCF_ALIASOK|MCF_ALIASONLY,
+		map_parseargs, stab_map_open, stab_map_close,
+		stab_map_lookup, stab_map_store);
+
+	MAPDEF("implicit", NULL, MCF_ALIASOK|MCF_ALIASONLY|MCF_REBUILDABLE,
+		map_parseargs, impl_map_open, impl_map_close,
+		impl_map_lookup, impl_map_store);
+
+	/* host DNS lookup */
+	MAPDEF("host", NULL, 0,
+		host_map_init, null_map_open, null_map_close,
+		host_map_lookup, null_map_store);
+
+	/* dequote map */
+	MAPDEF("dequote", NULL, 0,
+		dequote_init, null_map_open, null_map_close,
+		dequote_map, null_map_store);
+
+#if 0
+# ifdef USERDB
+	/* user database */
+	MAPDEF("udb", ".db", 0,
+		udb_map_parse, null_map_open, null_map_close,
+		udb_map_lookup, null_map_store);
+# endif
+#endif
+}
+
+#undef MAPDEF
+/*
+**  USERNAME -- return the user id of the logged in user.
+**
+**	Parameters:
+**		none.
+**
+**	Returns:
+**		The login name of the logged in user.
+**
+**	Side Effects:
+**		none.
+**
+**	Notes:
+**		The return value is statically allocated.
+*/
+
+char *
+username()
+{
+	static char *myname = NULL;
+	extern char *getlogin();
+	register struct passwd *pw;
+
+	/* cache the result */
+	if (myname == NULL)
+	{
+		myname = getlogin();
+		if (myname == NULL || myname[0] == '\0')
+		{
+			pw = getpwuid(RealUid);
+			if (pw != NULL)
+				myname = newstr(pw->pw_name);
+		}
+		else
+		{
+			uid_t uid = RealUid;
+
+			myname = newstr(myname);
+			if ((pw = getpwnam(myname)) == NULL ||
+			      (uid != 0 && uid != pw->pw_uid))
+			{
+				pw = getpwuid(uid);
+				if (pw != NULL)
+					myname = newstr(pw->pw_name);
+			}
+		}
+		if (myname == NULL || myname[0] == '\0')
+		{
+			syserr("554 Who are you?");
+			myname = "postmaster";
+		}
+	}
+
+	return (myname);
+}
+/*
+**  TTYPATH -- Get the path of the user's tty
+**
+**	Returns the pathname of the user's tty.  Returns NULL if
+**	the user is not logged in or if s/he has write permission
+**	denied.
+**
+**	Parameters:
+**		none
+**
+**	Returns:
+**		pathname of the user's tty.
+**		NULL if not logged in or write permission denied.
+**
+**	Side Effects:
+**		none.
+**
+**	WARNING:
+**		Return value is in a local buffer.
+**
+**	Called By:
+**		savemail
+*/
+
+char *
+ttypath()
+{
+	struct stat stbuf;
+	register char *pathn;
+	extern char *ttyname();
+	extern char *getlogin();
+
+	/* compute the pathname of the controlling tty */
+	if ((pathn = ttyname(2)) == NULL && (pathn = ttyname(1)) == NULL &&
+	    (pathn = ttyname(0)) == NULL)
+	{
+		errno = 0;
+		return (NULL);
+	}
+
+	/* see if we have write permission */
+	if (stat(pathn, &stbuf) < 0 || !bitset(02, stbuf.st_mode))
+	{
+		errno = 0;
+		return (NULL);
+	}
+
+	/* see if the user is logged in */
+	if (getlogin() == NULL)
+		return (NULL);
+
+	/* looks good */
+	return (pathn);
+}
+/*
+**  CHECKCOMPAT -- check for From and To person compatible.
+**
+**	This routine can be supplied on a per-installation basis
+**	to determine whether a person is allowed to send a message.
+**	This allows restriction of certain types of internet
+**	forwarding or registration of users.
+**
+**	If the hosts are found to be incompatible, an error
+**	message should be given using "usrerr" and 0 should
+**	be returned.
+**
+**	'NoReturn' can be set to suppress the return-to-sender
+**	function; this should be done on huge messages.
+**
+**	Parameters:
+**		to -- the person being sent to.
+**
+**	Returns:
+**		an exit status
+**
+**	Side Effects:
+**		none (unless you include the usrerr stuff)
+*/
+
+checkcompat(to, e)
+	register ADDRESS *to;
+	register ENVELOPE *e;
+{
+# ifdef lint
+	if (to == NULL)
+		to++;
+# endif /* lint */
+
+	if (tTd(49, 1))
+		printf("checkcompat(to=%s, from=%s)\n",
+			to->q_paddr, e->e_from.q_paddr);
+
+# ifdef EXAMPLE_CODE
+	/* this code is intended as an example only */
+	register STAB *s;
+
+	s = stab("arpa", ST_MAILER, ST_FIND);
+	if (s != NULL && e->e_from.q_mailer != LocalMailer &&
+	    to->q_mailer == s->s_mailer)
+	{
+		usrerr("553 No ARPA mail through this machine: see your system administration");
+		/* NoReturn = TRUE; to supress return copy */
+		return (EX_UNAVAILABLE);
+	}
+# endif /* EXAMPLE_CODE */
+	return (EX_OK);
+}
+/*
+**  SETSIGNAL -- set a signal handler
+**
+**	This is essentially old BSD "signal(3)".
+*/
+
+sigfunc_t
+setsignal(sig, handler)
+	int sig;
+	sigfunc_t handler;
+{
+#if defined(SYS5SIGNALS) || defined(BSD4_3) || defined(_AUX_SOURCE)
+	return signal(sig, handler);
+#else
+	struct sigaction n, o;
+
+	bzero(&n, sizeof n);
+	n.sa_handler = handler;
+	if (sigaction(sig, &n, &o) < 0)
+		return SIG_ERR;
+	return o.sa_handler;
+#endif
+}
+/*
+**  HOLDSIGS -- arrange to hold all signals
+**
+**	Parameters:
+**		none.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		Arranges that signals are held.
+*/
+
+holdsigs()
+{
+}
+/*
+**  RLSESIGS -- arrange to release all signals
+**
+**	This undoes the effect of holdsigs.
+**
+**	Parameters:
+**		none.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		Arranges that signals are released.
+*/
+
+rlsesigs()
+{
+}
+/*
+**  INIT_MD -- do machine dependent initializations
+**
+**	Systems that have global modes that should be set should do
+**	them here rather than in main.
+*/
+
+#ifdef _AUX_SOURCE
+# include	<compat.h>
+#endif
+
+init_md(argc, argv)
+	int argc;
+	char **argv;
+{
+#ifdef _AUX_SOURCE
+	setcompat(getcompat() | COMPAT_BSDPROT);
+#endif
+}
+/*
+**  GETLA -- get the current load average
+**
+**	This code stolen from la.c.
+**
+**	Parameters:
+**		none.
+**
+**	Returns:
+**		The current load average as an integer.
+**
+**	Side Effects:
+**		none.
+*/
+
+/* try to guess what style of load average we have */
+#define LA_ZERO		1	/* always return load average as zero */
+#define LA_INT		2	/* read kmem for avenrun; interpret as long */
+#define LA_FLOAT	3	/* read kmem for avenrun; interpret as float */
+#define LA_SUBR		4	/* call getloadavg */
+#define LA_MACH		5	/* MACH load averages (as on NeXT boxes) */
+#define LA_SHORT	6	/* read kmem for avenrun; interpret as short */
+#define LA_PROCSTR	7	/* read string ("1.17") from /proc/loadavg */
+
+/* do guesses based on general OS type */
+#ifndef LA_TYPE
+# define LA_TYPE	LA_ZERO
+#endif
+
+#if (LA_TYPE == LA_INT) || (LA_TYPE == LA_FLOAT) || (LA_TYPE == LA_SHORT)
+
+#include <nlist.h>
+
+#ifndef LA_AVENRUN
+# ifdef SYSTEM5
+#  define LA_AVENRUN	"avenrun"
+# else
+#  define LA_AVENRUN	"_avenrun"
+# endif
+#endif
+
+/* _PATH_UNIX should be defined in <paths.h> */
+#ifndef _PATH_UNIX
+# if defined(SYSTEM5)
+#  define _PATH_UNIX	"/unix"
+# else
+#  define _PATH_UNIX	"/vmunix"
+# endif
+#endif
+
+struct	nlist Nl[] =
+{
+	{ LA_AVENRUN },
+#define	X_AVENRUN	0
+	{ 0 },
+};
+
+#ifndef FSHIFT
+# if defined(unixpc)
+#  define FSHIFT	5
+# endif
+
+# if defined(__alpha) || defined(IRIX)
+#  define FSHIFT	10
+# endif
+#endif
+
+#ifndef FSHIFT
+# define FSHIFT		8
+#endif
+
+#ifndef FSCALE
+# define FSCALE		(1 << FSHIFT)
+#endif
+
+getla()
+{
+	static int kmem = -1;
+#if LA_TYPE == LA_INT
+	long avenrun[3];
+#else
+# if LA_TYPE == LA_SHORT
+	short avenrun[3];
+# else
+	double avenrun[3];
+# endif
+#endif
+	extern off_t lseek();
+	extern int errno;
+
+	if (kmem < 0)
+	{
+		kmem = open("/dev/kmem", 0, 0);
+		if (kmem < 0)
+		{
+			if (tTd(3, 1))
+				printf("getla: open(/dev/kmem): %s\n",
+					errstring(errno));
+			return (-1);
+		}
+		(void) fcntl(kmem, F_SETFD, 1);
+		if (nlist(_PATH_UNIX, Nl) < 0)
+		{
+			if (tTd(3, 1))
+				printf("getla: nlist(%s): %s\n", _PATH_UNIX,
+					errstring(errno));
+			return (-1);
+		}
+		if (Nl[X_AVENRUN].n_value == 0)
+		{
+			if (tTd(3, 1))
+				printf("getla: nlist(%s, %s) ==> 0\n",
+					_PATH_UNIX, LA_AVENRUN);
+			return (-1);
+		}
+#ifdef IRIX
+		Nl[X_AVENRUN].n_value &= 0x7fffffff;
+#endif
+	}
+	if (tTd(3, 20))
+		printf("getla: symbol address = %#x\n", Nl[X_AVENRUN].n_value);
+	if (lseek(kmem, (off_t) Nl[X_AVENRUN].n_value, 0) == -1 ||
+	    read(kmem, (char *) avenrun, sizeof(avenrun)) < sizeof(avenrun))
+	{
+		/* thank you Ian */
+		if (tTd(3, 1))
+			printf("getla: lseek or read: %s\n", errstring(errno));
+		return (-1);
+	}
+#if (LA_TYPE == LA_INT) || (LA_TYPE == LA_SHORT)
+	if (tTd(3, 5))
+	{
+		printf("getla: avenrun = %d", avenrun[0]);
+		if (tTd(3, 15))
+			printf(", %d, %d", avenrun[1], avenrun[2]);
+		printf("\n");
+	}
+	if (tTd(3, 1))
+		printf("getla: %d\n", (int) (avenrun[0] + FSCALE/2) >> FSHIFT);
+	return ((int) (avenrun[0] + FSCALE/2) >> FSHIFT);
+#else
+	if (tTd(3, 5))
+	{
+		printf("getla: avenrun = %g", avenrun[0]);
+		if (tTd(3, 15))
+			printf(", %g, %g", avenrun[1], avenrun[2]);
+		printf("\n");
+	}
+	if (tTd(3, 1))
+		printf("getla: %d\n", (int) (avenrun[0] +0.5));
+	return ((int) (avenrun[0] + 0.5));
+#endif
+}
+
+#else
+#if LA_TYPE == LA_SUBR
+
+#ifdef DGUX
+
+#include <sys/dg_sys_info.h>
+
+int getla()
+{
+	struct dg_sys_info_load_info load_info;
+
+	dg_sys_info((long *)&load_info,
+		DG_SYS_INFO_LOAD_INFO_TYPE, DG_SYS_INFO_LOAD_VERSION_0);
+
+	return((int) (load_info.one_minute + 0.5));
+}
+
+#else
+
+getla()
+{
+	double avenrun[3];
+
+	if (getloadavg(avenrun, sizeof(avenrun) / sizeof(avenrun[0])) < 0)
+	{
+		if (tTd(3, 1))
+			perror("getla: getloadavg failed:");
+		return (-1);
+	}
+	if (tTd(3, 1))
+		printf("getla: %d\n", (int) (avenrun[0] +0.5));
+	return ((int) (avenrun[0] + 0.5));
+}
+
+#endif /* DGUX */
+#else
+#if LA_TYPE == LA_MACH
+
+/*
+**  This has been tested on NEXTSTEP release 2.1/3.X.
+*/
+
+#if defined(NX_CURRENT_COMPILER_RELEASE) && NX_CURRENT_COMPILER_RELEASE > NX_COMPILER_RELEASE_3_0
+# include <mach/mach.h>
+#else
+# include <mach.h>
+#endif
+
+getla()
+{
+	processor_set_t default_set;
+	kern_return_t error;
+	unsigned int info_count;
+	struct processor_set_basic_info info;
+	host_t host;
+
+	error = processor_set_default(host_self(), &default_set);
+	if (error != KERN_SUCCESS)
+		return -1;
+	info_count = PROCESSOR_SET_BASIC_INFO_COUNT;
+	if (processor_set_info(default_set, PROCESSOR_SET_BASIC_INFO,
+			       &host, (processor_set_info_t)&info,
+			       &info_count) != KERN_SUCCESS)
+	{
+		return -1;
+	}
+	return (int) (info.load_average + (LOAD_SCALE / 2)) / LOAD_SCALE;
+}
+
+
+#else
+#if LA_TYPE == LA_PROCSTR
+
+/*
+**  Read /proc/loadavg for the load average.  This is assumed to be
+**  in a format like "0.15 0.12 0.06".
+**
+**	Initially intended for Linux.  This has been in the kernel
+**	since at least 0.99.15.
+*/
+
+# ifndef _PATH_LOADAVG
+#  define _PATH_LOADAVG	"/proc/loadavg"
+# endif
+
+int
+getla()
+{
+	double avenrun;
+	register int result;
+	FILE *fp;
+
+	fp = fopen(_PATH_LOADAVG, "r");
+	if (fp == NULL) 
+	{
+		if (tTd(3, 1))
+			printf("getla: fopen(%s): %s\n",
+				_PATH_LOADAVG, errstring(errno));
+		return -1;
+	}
+	result = fscanf(fp, "%lf", &avenrun);
+	fclose(fp);
+	if (result != 1)
+	{
+		if (tTd(3, 1))
+			printf("getla: fscanf() = %d: %s\n",
+				result, errstring(errno));
+		return -1;
+	}
+
+	if (tTd(3, 1))
+		printf("getla(): %.2f\n", avenrun);
+
+	return ((int) (avenrun + 0.5));
+}
+
+#else
+
+getla()
+{
+	if (tTd(3, 1))
+		printf("getla: ZERO\n");
+	return (0);
+}
+
+#endif
+#endif
+#endif
+#endif
+
+
+/*
+ * Copyright 1989 Massachusetts Institute of Technology
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of M.I.T. not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  M.I.T. makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ *
+ * M.I.T. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL M.I.T.
+ * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Authors:  Many and varied...
+ */
+
+/* Non Apollo stuff removed by Don Lewis 11/15/93 */
+#ifndef lint
+static char  rcsid[] = "@(#)Id: getloadavg.c,v 1.16 1991/06/21 12:51:15 paul Exp ";
+#endif /* !lint */
+
+#ifdef apollo
+# undef volatile
+#    include <apollo/base.h>
+
+/* ARGSUSED */
+int getloadavg( call_data )
+     caddr_t	call_data;	/* pointer to (double) return value */
+{
+     double *avenrun = (double *) call_data;
+     int i;
+     status_$t      st;
+     long loadav[3];
+     proc1_$get_loadav(loadav, &st);
+     *avenrun = loadav[0] / (double) (1 << 16);
+     return(0);
+}
+#   endif /* apollo */
+/*
+**  SHOULDQUEUE -- should this message be queued or sent?
+**
+**	Compares the message cost to the load average to decide.
+**
+**	Parameters:
+**		pri -- the priority of the message in question.
+**		ctime -- the message creation time.
+**
+**	Returns:
+**		TRUE -- if this message should be queued up for the
+**			time being.
+**		FALSE -- if the load is low enough to send this message.
+**
+**	Side Effects:
+**		none.
+*/
+
+bool
+shouldqueue(pri, ctime)
+	long pri;
+	time_t ctime;
+{
+	if (CurrentLA < QueueLA)
+		return (FALSE);
+	if (CurrentLA >= RefuseLA)
+		return (TRUE);
+	return (pri > (QueueFactor / (CurrentLA - QueueLA + 1)));
+}
+/*
+**  REFUSECONNECTIONS -- decide if connections should be refused
+**
+**	Parameters:
+**		none.
+**
+**	Returns:
+**		TRUE if incoming SMTP connections should be refused
+**			(for now).
+**		FALSE if we should accept new work.
+**
+**	Side Effects:
+**		none.
+*/
+
+bool
+refuseconnections()
+{
+#ifdef XLA
+	if (!xla_smtp_ok())
+		return TRUE;
+#endif
+
+	/* this is probably too simplistic */
+	return (CurrentLA >= RefuseLA);
+}
+/*
+**  SETPROCTITLE -- set process title for ps
+**
+**	Parameters:
+**		fmt -- a printf style format string.
+**		a, b, c -- possible parameters to fmt.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		Clobbers argv of our main procedure so ps(1) will
+**		display the title.
+*/
+
+#ifdef SETPROCTITLE
+# ifdef HASSETPROCTITLE
+   *** ERROR ***  Cannot have both SETPROCTITLE and HASSETPROCTITLE defined
+# endif
+# ifdef __hpux
+#  include <sys/pstat.h>
+# endif
+# ifdef BSD4_4
+#  include <machine/vmparam.h>
+#  include <sys/exec.h>
+#  ifdef __bsdi__
+#   undef PS_STRINGS	/* BSDI 1.0 doesn't do PS_STRINGS as we expect */
+#   define PROCTITLEPAD	'\0'
+#  endif
+#  ifdef PS_STRINGS
+#   define SETPROC_STATIC static
+#  endif
+# endif
+# ifndef SETPROC_STATIC
+#  define SETPROC_STATIC
+# endif
+#endif
+
+#ifndef PROCTITLEPAD
+# define PROCTITLEPAD	' '
+#endif
+
+#ifndef HASSETPROCTITLE
+
+/*VARARGS1*/
+#ifdef __STDC__
+setproctitle(char *fmt, ...)
+#else
+setproctitle(fmt, va_alist)
+	char *fmt;
+	va_dcl
+#endif
+{
+# ifdef SETPROCTITLE
+	register char *p;
+	register int i;
+	SETPROC_STATIC char buf[MAXLINE];
+	VA_LOCAL_DECL
+#  ifdef __hpux
+	union pstun pst;
+#  endif
+	extern char **Argv;
+	extern char *LastArgv;
+
+	p = buf;
+
+	/* print sendmail: heading for grep */
+	(void) strcpy(p, "sendmail: ");
+	p += strlen(p);
+
+	/* print the argument string */
+	VA_START(fmt);
+	(void) vsprintf(p, fmt, ap);
+	VA_END;
+
+	i = strlen(buf);
+
+#  ifdef __hpux
+	pst.pst_command = buf;
+	pstat(PSTAT_SETCMD, pst, i, 0, 0);
+#  else
+#   ifdef PS_STRINGS
+	PS_STRINGS->ps_nargvstr = 1;
+	PS_STRINGS->ps_argvstr = buf;
+#   else
+	if (i > LastArgv - Argv[0] - 2)
+	{
+		i = LastArgv - Argv[0] - 2;
+		buf[i] = '\0';
+	}
+	(void) strcpy(Argv[0], buf);
+	p = &Argv[0][i];
+	while (p < LastArgv)
+		*p++ = PROCTITLEPAD;
+#   endif
+#  endif
+# endif /* SETPROCTITLE */
+}
+
+#endif
+/*
+**  REAPCHILD -- pick up the body of my child, lest it become a zombie
+**
+**	Parameters:
+**		none.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		Picks up extant zombies.
+*/
+
+void
+reapchild()
+{
+	int olderrno = errno;
+# ifdef HASWAITPID
+	auto int status;
+	int count;
+	int pid;
+
+	count = 0;
+	while ((pid = waitpid(-1, &status, WNOHANG)) > 0)
+	{
+		if (count++ > 1000)
+		{
+#ifdef LOG
+			syslog(LOG_ALERT, "reapchild: waitpid loop: pid=%d, status=%x",
+				pid, status);
+#endif
+			break;
+		}
+	}
+# else
+# ifdef WNOHANG
+	union wait status;
+
+	while (wait3(&status, WNOHANG, (struct rusage *) NULL) > 0)
+		continue;
+# else /* WNOHANG */
+	auto int status;
+
+	while (wait(&status) > 0)
+		continue;
+# endif /* WNOHANG */
+# endif
+# ifdef SYS5SIGNALS
+	(void) setsignal(SIGCHLD, reapchild);
+# endif
+	errno = olderrno;
+}
+/*
+**  UNSETENV -- remove a variable from the environment
+**
+**	Not needed on newer systems.
+**
+**	Parameters:
+**		name -- the string name of the environment variable to be
+**			deleted from the current environment.
+**
+**	Returns:
+**		none.
+**
+**	Globals:
+**		environ -- a pointer to the current environment.
+**
+**	Side Effects:
+**		Modifies environ.
+*/
+
+#ifndef HASUNSETENV
+
+void
+unsetenv(name)
+	char *name;
+{
+	extern char **environ;
+	register char **pp;
+	int len = strlen(name);
+
+	for (pp = environ; *pp != NULL; pp++)
+	{
+		if (strncmp(name, *pp, len) == 0 &&
+		    ((*pp)[len] == '=' || (*pp)[len] == '\0'))
+			break;
+	}
+
+	for (; *pp != NULL; pp++)
+		*pp = pp[1];
+}
+
+#endif
+/*
+**  GETDTABLESIZE -- return number of file descriptors
+**
+**	Only on non-BSD systems
+**
+**	Parameters:
+**		none
+**
+**	Returns:
+**		size of file descriptor table
+**
+**	Side Effects:
+**		none
+*/
+
+#ifdef SOLARIS
+# include <sys/resource.h>
+#endif
+
+int
+getdtsize()
+{
+#ifdef RLIMIT_NOFILE
+	struct rlimit rl;
+
+	if (getrlimit(RLIMIT_NOFILE, &rl) >= 0)
+		return rl.rlim_cur;
+#endif
+
+# ifdef HASGETDTABLESIZE
+	return getdtablesize();
+# else
+#  ifdef _SC_OPEN_MAX
+	return sysconf(_SC_OPEN_MAX);
+#  else
+	return NOFILE;
+#  endif
+# endif
+}
+/*
+**  UNAME -- get the UUCP name of this system.
+*/
+
+#ifndef HASUNAME
+
+int
+uname(name)
+	struct utsname *name;
+{
+	FILE *file;
+	char *n;
+
+	name->nodename[0] = '\0';
+
+	/* try /etc/whoami -- one line with the node name */
+	if ((file = fopen("/etc/whoami", "r")) != NULL)
+	{
+		(void) fgets(name->nodename, NODE_LENGTH + 1, file);
+		(void) fclose(file);
+		n = strchr(name->nodename, '\n');
+		if (n != NULL)
+			*n = '\0';
+		if (name->nodename[0] != '\0')
+			return (0);
+	}
+
+	/* try /usr/include/whoami.h -- has a #define somewhere */
+	if ((file = fopen("/usr/include/whoami.h", "r")) != NULL)
+	{
+		char buf[MAXLINE];
+
+		while (fgets(buf, MAXLINE, file) != NULL)
+			if (sscanf(buf, "#define sysname \"%*[^\"]\"",
+					NODE_LENGTH, name->nodename) > 0)
+				break;
+		(void) fclose(file);
+		if (name->nodename[0] != '\0')
+			return (0);
+	}
+
+#ifdef TRUST_POPEN
+	/*
+	**  Popen is known to have security holes.
+	*/
+
+	/* try uuname -l to return local name */
+	if ((file = popen("uuname -l", "r")) != NULL)
+	{
+		(void) fgets(name, NODE_LENGTH + 1, file);
+		(void) pclose(file);
+		n = strchr(name, '\n');
+		if (n != NULL)
+			*n = '\0';
+		if (name->nodename[0] != '\0')
+			return (0);
+	}
+#endif
+	
+	return (-1);
+}
+#endif /* HASUNAME */
+/*
+**  INITGROUPS -- initialize groups
+**
+**	Stub implementation for System V style systems
+*/
+
+#ifndef HASINITGROUPS
+
+initgroups(name, basegid)
+	char *name;
+	int basegid;
+{
+	return 0;
+}
+
+#endif
+/*
+**  SETSID -- set session id (for non-POSIX systems)
+*/
+
+#ifndef HASSETSID
+
+pid_t
+setsid __P ((void))
+{
+#ifdef TIOCNOTTY
+	int fd;
+
+	fd = open("/dev/tty", O_RDWR, 0);
+	if (fd >= 0)
+	{
+		(void) ioctl(fd, (int) TIOCNOTTY, (char *) 0);
+		(void) close(fd);
+	}
+#endif /* TIOCNOTTY */
+# ifdef SYS5SETPGRP
+	return setpgrp();
+# else
+	return setpgid(0, getpid());
+# endif
+}
+
+#endif
+/*
+**  FSYNC -- dummy fsync
+*/
+
+#ifdef NEEDFSYNC
+
+fsync(fd)
+	int fd;
+{
+# ifdef O_SYNC
+	return fcntl(fd, F_SETFL, O_SYNC);
+# else
+	/* nothing we can do */
+	return 0;
+# endif
+}
+
+#endif
+/*
+**  DGUX_INET_ADDR -- inet_addr for DG/UX
+**
+**	Data General DG/UX version of inet_addr returns a struct in_addr
+**	instead of a long.  This patches things.
+*/
+
+#ifdef DGUX
+
+#undef inet_addr
+
+long
+dgux_inet_addr(host)
+	char *host;
+{
+	struct in_addr haddr;
+
+	haddr = inet_addr(host);
+	return haddr.s_addr;
+}
+
+#endif
+/*
+**  GETOPT -- for old systems or systems with bogus implementations
+*/
+
+#ifdef NEEDGETOPT
+
+/*
+ * Copyright (c) 1985 Regents of the University of California.
+ * All rights reserved.  The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.
+ */
+
+
+/*
+** this version hacked to add `atend' flag to allow state machine
+** to reset if invoked by the program to scan args for a 2nd time
+*/
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char sccsid[] = "@(#)getopt.c	4.3 (Berkeley) 3/9/86";
+#endif /* LIBC_SCCS and not lint */
+
+#include <stdio.h>
+
+/*
+ * get option letter from argument vector
+ */
+#ifdef _CONVEX_SOURCE
+extern int	optind, opterr;
+#else
+int	opterr = 1;		/* if error message should be printed */
+int	optind = 1;		/* index into parent argv vector */
+#endif
+int	optopt = 0;		/* character checked for validity */
+char	*optarg = NULL;		/* argument associated with option */
+
+#define BADCH	(int)'?'
+#define EMSG	""
+#define tell(s)	if (opterr) {fputs(*nargv,stderr);fputs(s,stderr); \
+		fputc(optopt,stderr);fputc('\n',stderr);return(BADCH);}
+
+getopt(nargc,nargv,ostr)
+	int		nargc;
+	char *const	*nargv;
+	const char	*ostr;
+{
+	static char	*place = EMSG;	/* option letter processing */
+	static char	atend = 0;
+	register char	*oli;		/* option letter list index */
+
+	if (atend) {
+		atend = 0;
+		place = EMSG;
+	}
+	if(!*place) {			/* update scanning pointer */
+		if (optind >= nargc || *(place = nargv[optind]) != '-' || !*++place) {
+			atend++;
+			return(EOF);
+		}
+		if (*place == '-') {	/* found "--" */
+			++optind;
+			atend++;
+			return(EOF);
+		}
+	}				/* option letter okay? */
+	if ((optopt = (int)*place++) == (int)':' || !(oli = strchr(ostr,optopt))) {
+		if (!*place) ++optind;
+		tell(": illegal option -- ");
+	}
+	if (*++oli != ':') {		/* don't need argument */
+		optarg = NULL;
+		if (!*place) ++optind;
+	}
+	else {				/* need an argument */
+		if (*place) optarg = place;	/* no white space */
+		else if (nargc <= ++optind) {	/* no arg */
+			place = EMSG;
+			tell(": option requires an argument -- ");
+		}
+	 	else optarg = nargv[optind];	/* white space */
+		place = EMSG;
+		++optind;
+	}
+	return(optopt);			/* dump back option letter */
+}
+
+#endif
+/*
+**  VFPRINTF, VSPRINTF -- for old 4.3 BSD systems missing a real version
+*/
+
+#ifdef NEEDVPRINTF
+
+#define MAXARG	16
+
+vfprintf(fp, fmt, ap)
+	FILE *	fp;
+	char *	fmt;
+	char **	ap;
+{
+	char *	bp[MAXARG];
+	int	i = 0;
+
+	while (*ap && i < MAXARG)
+		bp[i++] = *ap++;
+	fprintf(fp, fmt, bp[0], bp[1], bp[2], bp[3],
+			 bp[4], bp[5], bp[6], bp[7],
+			 bp[8], bp[9], bp[10], bp[11],
+			 bp[12], bp[13], bp[14], bp[15]);
+}
+
+vsprintf(s, fmt, ap)
+	char *	s;
+	char *	fmt;
+	char **	ap;
+{
+	char *	bp[MAXARG];
+	int	i = 0;
+
+	while (*ap && i < MAXARG)
+		bp[i++] = *ap++;
+	sprintf(s, fmt, bp[0], bp[1], bp[2], bp[3],
+			bp[4], bp[5], bp[6], bp[7],
+			bp[8], bp[9], bp[10], bp[11],
+			bp[12], bp[13], bp[14], bp[15]);
+}
+
+#endif
+/*
+**  USERSHELLOK -- tell if a user's shell is ok for unrestricted use
+**
+**	Parameters:
+**		shell -- the user's shell from /etc/passwd
+**
+**	Returns:
+**		TRUE -- if it is ok to use this for unrestricted access.
+**		FALSE -- if the shell is restricted.
+*/
+
+#if !HASGETUSERSHELL
+
+# ifndef _PATH_SHELLS
+#  define _PATH_SHELLS	"/etc/shells"
+# endif
+
+char	*DefaultUserShells[] =
+{
+	"/bin/sh",
+	"/usr/bin/sh",
+	"/bin/csh",
+	"/usr/bin/csh",
+#ifdef __hpux
+	"/bin/rsh",
+	"/bin/ksh",
+	"/bin/rksh",
+	"/bin/pam",
+	"/usr/bin/keysh",
+	"/bin/posix/sh",
+#endif
+	NULL
+};
+
+#endif
+
+#define WILDCARD_SHELL	"/SENDMAIL/ANY/SHELL/"
+
+bool
+usershellok(shell)
+	char *shell;
+{
+#if HASGETUSERSHELL
+	register char *p;
+	extern char *getusershell();
+
+	if (shell == NULL || shell[0] == '\0')
+		return TRUE;
+
+	setusershell();
+	while ((p = getusershell()) != NULL)
+		if (strcmp(p, shell) == 0 || strcmp(p, WILDCARD_SHELL) == 0)
+			break;
+	endusershell();
+	return p != NULL;
+#else
+	register FILE *shellf;
+	char buf[MAXLINE];
+
+	if (shell == NULL || shell[0] == '\0')
+		return TRUE;
+
+	shellf = fopen(_PATH_SHELLS, "r");
+	if (shellf == NULL)
+	{
+		/* no /etc/shells; see if it is one of the std shells */
+		char **d;
+
+		for (d = DefaultUserShells; *d != NULL; d++)
+		{
+			if (strcmp(shell, *d) == 0)
+				return TRUE;
+		}
+		return FALSE;
+	}
+
+	while (fgets(buf, sizeof buf, shellf) != NULL)
+	{
+		register char *p, *q;
+
+		p = buf;
+		while (*p != '\0' && *p != '#' && *p != '/')
+			p++;
+		if (*p == '#' || *p == '\0')
+			continue;
+		q = p;
+		while (*p != '\0' && *p != '#' && !isspace(*p))
+			p++;
+		*p = '\0';
+		if (strcmp(shell, q) == 0 || strcmp(WILDCARD_SHELL, q) == 0)
+		{
+			fclose(shellf);
+			return TRUE;
+		}
+	}
+	fclose(shellf);
+	return FALSE;
+#endif
+}
+/*
+**  FREESPACE -- see how much free space is on the queue filesystem
+**
+**	Only implemented if you have statfs.
+**
+**	Parameters:
+**		dir -- the directory in question.
+**		bsize -- a variable into which the filesystem
+**			block size is stored.
+**
+**	Returns:
+**		The number of bytes free on the queue filesystem.
+**		-1 if the statfs call fails.
+**
+**	Side effects:
+**		Puts the filesystem block size into bsize.
+*/
+
+/* statfs types */
+#define SFS_NONE	0	/* no statfs implementation */
+#define SFS_USTAT	1	/* use ustat */
+#define SFS_4ARGS	2	/* use four-argument statfs call */
+#define SFS_VFS		3	/* use <sys/vfs.h> implementation */
+#define SFS_MOUNT	4	/* use <sys/mount.h> implementation */
+#define SFS_STATFS	5	/* use <sys/statfs.h> implementation */
+#define SFS_STATVFS	6	/* use <sys/statvfs.h> implementation */
+
+#ifndef SFS_TYPE
+# define SFS_TYPE	SFS_NONE
+#endif
+
+#if SFS_TYPE == SFS_USTAT
+# include <ustat.h>
+#endif
+#if SFS_TYPE == SFS_4ARGS || SFS_TYPE == SFS_STATFS
+# include <sys/statfs.h>
+#endif
+#if SFS_TYPE == SFS_VFS
+# include <sys/vfs.h>
+#endif
+#if SFS_TYPE == SFS_MOUNT
+# include <sys/mount.h>
+#endif
+#if SFS_TYPE == SFS_STATVFS
+# include <sys/statvfs.h>
+#endif
+
+long
+freespace(dir, bsize)
+	char *dir;
+	long *bsize;
+{
+#if SFS_TYPE != SFS_NONE
+# if SFS_TYPE == SFS_USTAT
+	struct ustat fs;
+	struct stat statbuf;
+#  define FSBLOCKSIZE	DEV_BSIZE
+#  define f_bavail	f_tfree
+# else
+#  if defined(ultrix)
+	struct fs_data fs;
+#   define f_bavail	fd_bfreen
+#   define FSBLOCKSIZE	fs.fd_bsize
+#  else
+#   if SFS_TYPE == SFS_STATVFS
+	struct statvfs fs;
+#    define FSBLOCKSIZE	fs.f_bsize
+#   else
+	struct statfs fs;
+#    define FSBLOCKSIZE	fs.f_bsize
+#    if defined(_SCO_unix_) || defined(IRIX) || defined(apollo)
+#     define f_bavail f_bfree
+#    endif
+#   endif
+#  endif
+# endif
+	extern int errno;
+
+# if SFS_TYPE == SFS_USTAT
+	if (stat(dir, &statbuf) == 0 && ustat(statbuf.st_dev, &fs) == 0)
+# else
+#  if SFS_TYPE == SFS_4ARGS
+	if (statfs(dir, &fs, sizeof fs, 0) == 0)
+#  else
+#   if defined(ultrix)
+	if (statfs(dir, &fs) > 0)
+#   else
+	if (statfs(dir, &fs) == 0)
+#   endif
+#  endif
+# endif
+	{
+		if (bsize != NULL)
+			*bsize = FSBLOCKSIZE;
+		return (fs.f_bavail);
+	}
+#endif
+	return (-1);
+}
+/*
+**  ENOUGHSPACE -- check to see if there is enough free space on the queue fs
+**
+**	Only implemented if you have statfs.
+**
+**	Parameters:
+**		msize -- the size to check against.  If zero, we don't yet
+**		know how big the message will be, so just check for
+**		a "reasonable" amount.
+**
+**	Returns:
+**		TRUE if there is enough space.
+**		FALSE otherwise.
+*/
+
+bool
+enoughspace(msize)
+	long msize;
+{
+	long bfree, bsize;
+
+	if (MinBlocksFree <= 0 && msize <= 0)
+	{
+		if (tTd(4, 80))
+			printf("enoughspace: no threshold\n");
+		return TRUE;
+	}
+
+	if ((bfree = freespace(QueueDir, &bsize)) >= 0)
+	{
+		if (tTd(4, 80))
+			printf("enoughspace: bavail=%ld, need=%ld\n",
+				bfree, msize);
+
+		/* convert msize to block count */
+		msize = msize / bsize + 1;
+		if (MinBlocksFree >= 0)
+			msize += MinBlocksFree;
+
+		if (bfree < msize)
+		{
+#ifdef LOG
+			if (LogLevel > 0)
+				syslog(LOG_ALERT,
+					"%s: low on space (have %ld, %s needs %ld in %s)",
+					CurEnv->e_id, bfree,
+					CurHostName, msize, QueueDir);
+#endif
+			return FALSE;
+		}
+	}
+	else if (tTd(4, 80))
+		printf("enoughspace failure: min=%ld, need=%ld: %s\n",
+			MinBlocksFree, msize, errstring(errno));
+	return TRUE;
+}
+/*
+**  TRANSIENTERROR -- tell if an error code indicates a transient failure
+**
+**	This looks at an errno value and tells if this is likely to
+**	go away if retried later.
+**
+**	Parameters:
+**		err -- the errno code to classify.
+**
+**	Returns:
+**		TRUE if this is probably transient.
+**		FALSE otherwise.
+*/
+
+bool
+transienterror(err)
+	int err;
+{
+	switch (err)
+	{
+	  case EIO:			/* I/O error */
+	  case ENXIO:			/* Device not configured */
+	  case EAGAIN:			/* Resource temporarily unavailable */
+	  case ENOMEM:			/* Cannot allocate memory */
+	  case ENODEV:			/* Operation not supported by device */
+	  case ENFILE:			/* Too many open files in system */
+	  case EMFILE:			/* Too many open files */
+	  case ENOSPC:			/* No space left on device */
+#ifdef ETIMEDOUT
+	  case ETIMEDOUT:		/* Connection timed out */
+#endif
+#ifdef ESTALE
+	  case ESTALE:			/* Stale NFS file handle */
+#endif
+#ifdef ENETDOWN
+	  case ENETDOWN:		/* Network is down */
+#endif
+#ifdef ENETUNREACH
+	  case ENETUNREACH:		/* Network is unreachable */
+#endif
+#ifdef ENETRESET
+	  case ENETRESET:		/* Network dropped connection on reset */
+#endif
+#ifdef ECONNABORTED
+	  case ECONNABORTED:		/* Software caused connection abort */
+#endif
+#ifdef ECONNRESET
+	  case ECONNRESET:		/* Connection reset by peer */
+#endif
+#ifdef ENOBUFS
+	  case ENOBUFS:			/* No buffer space available */
+#endif
+#ifdef ESHUTDOWN
+	  case ESHUTDOWN:		/* Can't send after socket shutdown */
+#endif
+#ifdef ECONNREFUSED
+	  case ECONNREFUSED:		/* Connection refused */
+#endif
+#ifdef EHOSTDOWN
+	  case EHOSTDOWN:		/* Host is down */
+#endif
+#ifdef EHOSTUNREACH
+	  case EHOSTUNREACH:		/* No route to host */
+#endif
+#ifdef EDQUOT
+	  case EDQUOT:			/* Disc quota exceeded */
+#endif
+#ifdef EPROCLIM
+	  case EPROCLIM:		/* Too many processes */
+#endif
+#ifdef EUSERS
+	  case EUSERS:			/* Too many users */
+#endif
+#ifdef EDEADLK
+	  case EDEADLK:			/* Resource deadlock avoided */
+#endif
+#ifdef EISCONN
+	  case EISCONN:			/* Socket already connected */
+#endif
+#ifdef EINPROGRESS
+	  case EINPROGRESS:		/* Operation now in progress */
+#endif
+#ifdef EALREADY
+	  case EALREADY:		/* Operation already in progress */
+#endif
+#ifdef EADDRINUSE
+	  case EADDRINUSE:		/* Address already in use */
+#endif
+#ifdef EADDRNOTAVAIL
+	  case EADDRNOTAVAIL:		/* Can't assign requested address */
+#endif
+#ifdef ETXTBSY
+	  case ETXTBSY:			/* (Apollo) file locked */
+#endif
+#if defined(ENOSR) && (!defined(ENOBUFS) || (ENOBUFS != ENOSR))
+	  case ENOSR:			/* Out of streams resources */
+#endif
+		return TRUE;
+	}
+
+	/* nope, must be permanent */
+	return FALSE;
+}
+/*
+**  LOCKFILE -- lock a file using flock or (shudder) fcntl locking
+**
+**	Parameters:
+**		fd -- the file descriptor of the file.
+**		filename -- the file name (for error messages).
+**		ext -- the filename extension.
+**		type -- type of the lock.  Bits can be:
+**			LOCK_EX -- exclusive lock.
+**			LOCK_NB -- non-blocking.
+**
+**	Returns:
+**		TRUE if the lock was acquired.
+**		FALSE otherwise.
+*/
+
+bool
+lockfile(fd, filename, ext, type)
+	int fd;
+	char *filename;
+	char *ext;
+	int type;
+{
+# if !HASFLOCK
+	int action;
+	struct flock lfd;
+
+	if (ext == NULL)
+		ext = "";
+		
+	bzero(&lfd, sizeof lfd);
+	if (bitset(LOCK_UN, type))
+		lfd.l_type = F_UNLCK;
+	else if (bitset(LOCK_EX, type))
+		lfd.l_type = F_WRLCK;
+	else
+		lfd.l_type = F_RDLCK;
+
+	if (bitset(LOCK_NB, type))
+		action = F_SETLK;
+	else
+		action = F_SETLKW;
+
+	if (tTd(55, 60))
+		printf("lockfile(%s%s, action=%d, type=%d): ",
+			filename, ext, action, lfd.l_type);
+
+	if (fcntl(fd, action, &lfd) >= 0)
+	{
+		if (tTd(55, 60))
+			printf("SUCCESS\n");
+		return TRUE;
+	}
+
+	if (tTd(55, 60))
+		printf("(%s) ", errstring(errno));
+
+	/*
+	**  On SunOS, if you are testing using -oQ/tmp/mqueue or
+	**  -oA/tmp/aliases or anything like that, and /tmp is mounted
+	**  as type "tmp" (that is, served from swap space), the
+	**  previous fcntl will fail with "Invalid argument" errors.
+	**  Since this is fairly common during testing, we will assume
+	**  that this indicates that the lock is successfully grabbed.
+	*/
+
+	if (errno == EINVAL)
+	{
+		if (tTd(55, 60))
+			printf("SUCCESS\n");
+		return TRUE;
+	}
+
+	if (!bitset(LOCK_NB, type) || (errno != EACCES && errno != EAGAIN))
+	{
+		int omode = -1;
+#  ifdef F_GETFL
+		int oerrno = errno;
+
+		(void) fcntl(fd, F_GETFL, &omode);
+		errno = oerrno;
+#  endif
+		syserr("cannot lockf(%s%s, fd=%d, type=%o, omode=%o, euid=%d)",
+			filename, ext, fd, type, omode, geteuid());
+	}
+# else
+	if (ext == NULL)
+		ext = "";
+
+	if (tTd(55, 60))
+		printf("lockfile(%s%s, type=%o): ", filename, ext, type);
+
+	if (flock(fd, type) >= 0)
+	{
+		if (tTd(55, 60))
+			printf("SUCCESS\n");
+		return TRUE;
+	}
+
+	if (tTd(55, 60))
+		printf("(%s) ", errstring(errno));
+
+	if (!bitset(LOCK_NB, type) || errno != EWOULDBLOCK)
+	{
+		int omode = -1;
+#  ifdef F_GETFL
+		int oerrno = errno;
+
+		(void) fcntl(fd, F_GETFL, &omode);
+		errno = oerrno;
+#  endif
+		syserr("cannot flock(%s%s, fd=%d, type=%o, omode=%o, euid=%d)",
+			filename, ext, fd, type, omode, geteuid());
+	}
+# endif
+	if (tTd(55, 60))
+		printf("FAIL\n");
+	return FALSE;
+}
+/*
+**  CHOWNSAFE -- tell if chown is "safe" (executable only by root)
+**
+**	Parameters:
+**		fd -- the file descriptor to check.
+**
+**	Returns:
+**		TRUE -- if only root can chown the file to an arbitrary
+**			user.
+**		FALSE -- if an arbitrary user can give away a file.
+*/
+
+bool
+chownsafe(fd)
+	int fd;
+{
+#ifdef __hpux
+	char *s;
+	int tfd;
+	uid_t o_uid, o_euid;
+	gid_t o_gid, o_egid;
+	bool rval;
+	struct stat stbuf;
+
+	o_uid = getuid();
+	o_euid = geteuid();
+	o_gid = getgid();
+	o_egid = getegid();
+	fstat(fd, &stbuf);
+	setresuid(stbuf.st_uid, stbuf.st_uid, -1);
+	setresgid(stbuf.st_gid, stbuf.st_gid, -1);
+	s = tmpnam(NULL);
+	tfd = open(s, O_RDONLY|O_CREAT, 0600);
+	rval = fchown(tfd, DefUid, DefGid) != 0;
+	close(tfd);
+	unlink(s);
+	setreuid(o_uid, o_euid);
+	setresgid(o_gid, o_egid, -1);
+	return rval;
+#else
+# ifdef _POSIX_CHOWN_RESTRICTED
+#  if _POSIX_CHOWN_RESTRICTED == -1
+	return FALSE;
+#  else
+	return TRUE;
+#  endif
+# else
+#  ifdef _PC_CHOWN_RESTRICTED
+	return fpathconf(fd, _PC_CHOWN_RESTRICTED) > 0;
+#  else
+#   ifdef BSD
+	return TRUE;
+#   else
+	return FALSE;
+#   endif
+#  endif
+# endif
+#endif
+}
+/*
+**  GETCFNAME -- return the name of the .cf file.
+**
+**	Some systems (e.g., NeXT) determine this dynamically.
+*/
+
+char *
+getcfname()
+{
+	if (ConfFile != NULL)
+		return ConfFile;
+#ifdef NETINFO
+	{
+		extern char *ni_propval();
+		char *cflocation;
+
+		cflocation = ni_propval("/locations/sendmail", "sendmail.cf");
+		if (cflocation != NULL)
+			return cflocation;
+	}
+#endif
+	return _PATH_SENDMAILCF;
+}
+/*
+**  SETVENDOR -- process vendor code from V configuration line
+**
+**	Parameters:
+**		vendor -- string representation of vendor.
+**
+**	Returns:
+**		TRUE -- if ok.
+**		FALSE -- if vendor code could not be processed.
+**
+**	Side Effects:
+**		It is reasonable to set mode flags here to tweak
+**		processing in other parts of the code if necessary.
+**		For example, if you are a vendor that uses $%y to
+**		indicate YP lookups, you could enable that here.
+*/
+
+bool
+setvendor(vendor)
+	char *vendor;
+{
+	if (strcasecmp(vendor, "Berkeley") == 0)
+		return TRUE;
+
+	/* add vendor extensions here */
+
+	return FALSE;
+}
+/*
+**  STRTOL -- convert string to long integer
+**
+**	For systems that don't have it in the C library.
+**
+**	This is taken verbatim from the 4.4-Lite C library.
+*/
+
+#ifdef NEEDSTRTOL
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char sccsid[] = "@(#)strtol.c	8.1 (Berkeley) 6/4/93";
+#endif /* LIBC_SCCS and not lint */
+
+#include <limits.h>
+
+/*
+ * Convert a string to a long integer.
+ *
+ * Ignores `locale' stuff.  Assumes that the upper and lower case
+ * alphabets and digits are each contiguous.
+ */
+
+long
+strtol(nptr, endptr, base)
+	const char *nptr;
+	char **endptr;
+	register int base;
+{
+	register const char *s = nptr;
+	register unsigned long acc;
+	register int c;
+	register unsigned long cutoff;
+	register int neg = 0, any, cutlim;
+
+	/*
+	 * Skip white space and pick up leading +/- sign if any.
+	 * If base is 0, allow 0x for hex and 0 for octal, else
+	 * assume decimal; if base is already 16, allow 0x.
+	 */
+	do {
+		c = *s++;
+	} while (isspace(c));
+	if (c == '-') {
+		neg = 1;
+		c = *s++;
+	} else if (c == '+')
+		c = *s++;
+	if ((base == 0 || base == 16) &&
+	    c == '0' && (*s == 'x' || *s == 'X')) {
+		c = s[1];
+		s += 2;
+		base = 16;
+	}
+	if (base == 0)
+		base = c == '0' ? 8 : 10;
+
+	/*
+	 * Compute the cutoff value between legal numbers and illegal
+	 * numbers.  That is the largest legal value, divided by the
+	 * base.  An input number that is greater than this value, if
+	 * followed by a legal input character, is too big.  One that
+	 * is equal to this value may be valid or not; the limit
+	 * between valid and invalid numbers is then based on the last
+	 * digit.  For instance, if the range for longs is
+	 * [-2147483648..2147483647] and the input base is 10,
+	 * cutoff will be set to 214748364 and cutlim to either
+	 * 7 (neg==0) or 8 (neg==1), meaning that if we have accumulated
+	 * a value > 214748364, or equal but the next digit is > 7 (or 8),
+	 * the number is too big, and we will return a range error.
+	 *
+	 * Set any if any `digits' consumed; make it negative to indicate
+	 * overflow.
+	 */
+	cutoff = neg ? -(unsigned long)LONG_MIN : LONG_MAX;
+	cutlim = cutoff % (unsigned long)base;
+	cutoff /= (unsigned long)base;
+	for (acc = 0, any = 0;; c = *s++) {
+		if (isdigit(c))
+			c -= '0';
+		else if (isalpha(c))
+			c -= isupper(c) ? 'A' - 10 : 'a' - 10;
+		else
+			break;
+		if (c >= base)
+			break;
+		if (any < 0 || acc > cutoff || acc == cutoff && c > cutlim)
+			any = -1;
+		else {
+			any = 1;
+			acc *= base;
+			acc += c;
+		}
+	}
+	if (any < 0) {
+		acc = neg ? LONG_MIN : LONG_MAX;
+		errno = ERANGE;
+	} else if (neg)
+		acc = -acc;
+	if (endptr != 0)
+		*endptr = (char *)(any ? s - 1 : nptr);
+	return (acc);
+}
+
+#endif
+/*
+**  SOLARIS_GETHOSTBY{NAME,ADDR} -- compatibility routines for gethostbyXXX
+**
+**	Solaris versions prior through 2.3 don't properly deliver a
+**	canonical h_name field.  This tries to work around it.
+*/
+
+#ifdef SOLARIS
+
+extern int	h_errno;
+
+struct hostent *
+solaris_gethostbyname(name)
+	const char *name;
+{
+# ifdef SOLARIS_2_3
+	static struct hostent hp;
+	static char buf[1000];
+	extern struct hostent *_switch_gethostbyname_r();
+
+	return _switch_gethostbyname_r(name, &hp, buf, sizeof(buf), &h_errno);
+# else
+	extern struct hostent *__switch_gethostbyname();
+
+	return __switch_gethostbyname(name);
+# endif
+}
+
+struct hostent *
+solaris_gethostbyaddr(addr, len, type)
+	const char *addr;
+	int len;
+	int type;
+{
+# ifdef SOLARIS_2_3
+	static struct hostent hp;
+	static char buf[1000];
+	extern struct hostent *_switch_gethostbyaddr_r();
+
+	return _switch_gethostbyaddr_r(addr, len, type, &hp, buf, sizeof(buf), &h_errno);
+# else
+	extern struct hostent *__switch_gethostbyaddr();
+
+	return __switch_gethostbyaddr(addr, len, type);
+# endif
+}
+
+#endif
+/*
+**  NI_PROPVAL -- netinfo property value lookup routine
+**
+**	Parameters:
+**		directory -- the Netinfo directory name.
+**		propname -- the Netinfo property name.
+**
+**	Returns:
+**		NULL -- if:
+**			1. the directory is not found
+**			2. the property name is not found
+**			3. the property contains multiple values
+**			4. some error occured
+**		else -- the location of the config file.
+**
+**	Notes:
+**      	Caller should free the return value of ni_proval
+*/
+
+#ifdef NETINFO
+
+# include <netinfo/ni.h>
+
+# define LOCAL_NETINFO_DOMAIN    "."
+# define PARENT_NETINFO_DOMAIN   ".."
+# define MAX_NI_LEVELS           256
+
+char *
+ni_propval(directory, propname)
+	char *directory;
+	char *propname;
+{
+	char *propval = NULL;
+	int i;
+	void *ni = NULL;
+	void *lastni = NULL;
+	ni_status nis;
+	ni_id nid;
+	ni_namelist ninl;
+
+	/*
+	**  If the passed directory and property name are found
+	**  in one of netinfo domains we need to search (starting
+	**  from the local domain moving all the way back to the
+	**  root domain) set propval to the property's value
+	**  and return it.
+	*/
+
+	for (i = 0; i < MAX_NI_LEVELS; ++i)
+	{
+		if (i == 0)
+		{
+			nis = ni_open(NULL, LOCAL_NETINFO_DOMAIN, &ni);
+		}
+		else
+		{
+			if (lastni != NULL)
+				ni_free(lastni);
+			lastni = ni;
+			nis = ni_open(lastni, PARENT_NETINFO_DOMAIN, &ni);
+		}
+
+		/*
+		**  Don't bother if we didn't get a handle on a
+		**  proper domain.  This is not necessarily an error.
+		**  We would get a positive ni_status if, for instance
+		**  we never found the directory or property and tried
+		**  to open the parent of the root domain!
+		*/
+
+		if (nis != 0)
+			break;
+
+		/*
+		**  Find the path to the server information.
+		*/
+
+		if (ni_pathsearch(ni, &nid, directory) != 0)
+			continue;
+
+		/*
+		**  Find "host" information.
+		*/
+
+		if (ni_lookupprop(ni, &nid, propname, &ninl) != 0)
+			continue;
+
+		/*
+		**  If there's only one name in
+		**  the list, assume we've got
+		**  what we want.
+		*/
+
+		if (ninl.ni_namelist_len == 1)
+		{
+			propval = ni_name_dup(ninl.ni_namelist_val[0]);
+			break;
+		}
+	}
+
+	/*
+	**  Clean up.
+	*/
+
+	if (ni != NULL)
+		ni_free(ni);
+	if (lastni != NULL && ni != lastni)
+		ni_free(lastni);
+
+	return propval;
+}
+
+#endif /* NETINFO */
+/*
+**  HARD_SYSLOG -- call syslog repeatedly until it works
+**
+**	Needed on HP-UX, which apparently doesn't guarantee that
+**	syslog succeeds during interrupt handlers.
+*/
+
+#ifdef __hpux
+
+# define MAXSYSLOGTRIES	100
+# undef syslog
+
+# ifdef __STDC__
+hard_syslog(int pri, char *msg, ...)
+# else
+hard_syslog(pri, msg, va_alist)
+	int pri;
+	char *msg;
+	va_dcl
+# endif
+{
+	int i;
+	char buf[SYSLOG_BUFSIZE * 2];
+	VA_LOCAL_DECL;
+
+	VA_START(msg);
+	vsprintf(buf, msg, ap);
+	VA_END;
+
+	for (i = MAXSYSLOGTRIES; --i >= 0 && syslog(pri, "%s", buf) < 0; )
+		continue;
+}
+
+#endif
diff --git a/usr.sbin/sendmail/src/conf.h b/usr.sbin/sendmail/src/conf.h
new file mode 100644
index 00000000000..62344c39e15
--- /dev/null
+++ b/usr.sbin/sendmail/src/conf.h
@@ -0,0 +1,1197 @@
+/*
+ * Copyright (c) 1983 Eric P. Allman
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)conf.h	8.104 (Berkeley) 4/17/94
+ */
+
+/*
+**  CONF.H -- All user-configurable parameters for sendmail
+*/
+
+# include <sys/param.h>
+# include <sys/types.h>
+# include <sys/stat.h>
+# include <sys/file.h>
+# include <sys/wait.h>
+# include <fcntl.h>
+# include <signal.h>
+
+/**********************************************************************
+**  Table sizes, etc....
+**	There shouldn't be much need to change these....
+**********************************************************************/
+
+# define MAXLINE	2048		/* max line length */
+# define MAXNAME	256		/* max length of a name */
+# define MAXPV		40		/* max # of parms to mailers */
+# define MAXATOM	200		/* max atoms per address */
+# define MAXMAILERS	25		/* maximum mailers known to system */
+# define MAXRWSETS	100		/* max # of sets of rewriting rules */
+# define MAXPRIORITIES	25		/* max values for Precedence: field */
+# define MAXMXHOSTS	20		/* max # of MX records */
+# define SMTPLINELIM	990		/* maximum SMTP line length */
+# define MAXKEY		128		/* maximum size of a database key */
+# define MEMCHUNKSIZE	1024		/* chunk size for memory allocation */
+# define MAXUSERENVIRON	100		/* max envars saved, must be >= 3 */
+# define MAXALIASDB	12		/* max # of alias databases */
+
+# ifndef QUEUESIZE
+# define QUEUESIZE	1000		/* max # of jobs per queue run */
+# endif
+
+/**********************************************************************
+**  Compilation options.
+**
+**	#define these if they are available; comment them out otherwise.
+**********************************************************************/
+
+# define LOG		1	/* enable logging */
+# define UGLYUUCP	1	/* output ugly UUCP From lines */
+# define NETUNIX	1	/* include unix domain support */
+# define NETINET	1	/* include internet support */
+# define SETPROCTITLE	1	/* munge argv to display current status */
+# define MATCHGECOS	1	/* match user names from gecos field */
+# define XDEBUG		1	/* enable extended debugging */
+# ifdef NEWDB
+# define USERDB		1	/* look in user database (requires NEWDB) */
+# endif
+
+/**********************************************************************
+**  0/1 Compilation options.
+**	#define these to 1 if they are available;
+**	#define them to 0 otherwise.
+**********************************************************************/
+
+# ifndef NAMED_BIND
+#  define NAMED_BIND	1	/* use Berkeley Internet Domain Server */
+# endif
+
+/*
+**  Most systems have symbolic links today, so default them on.  You
+**  can turn them off by #undef'ing this below.
+*/
+
+# define HASLSTAT	1	/* has lstat(2) call */
+
+/*
+**  General "standard C" defines.
+**
+**	These may be undone later, to cope with systems that claim to
+**	be Standard C but aren't.  Gcc is the biggest offender -- it
+**	doesn't realize that the library is part of the language.
+**
+**	Life would be much easier if we could get rid of this sort
+**	of bozo problems.
+*/
+
+#ifdef __STDC__
+# define HASSETVBUF	1	/* we have setvbuf(3) in libc */
+#endif
+
+/**********************************************************************
+**  Operating system configuration.
+**
+**	Unless you are porting to a new OS, you shouldn't have to
+**	change these.
+**********************************************************************/
+
+/*
+**  Per-Operating System defines
+*/
+
+
+/*
+**  HP-UX -- tested for 8.07, 9.00, and 9.01.
+*/
+
+# ifdef __hpux
+/* avoid m_flags conflict between db.h & sys/sysmacros.h on HP 300 */
+# undef m_flags
+# define SYSTEM5	1	/* include all the System V defines */
+# define HASINITGROUPS	1	/* has initgroups(3) call */
+# define HASSETREUID	1	/* has setreuid(2) call */
+# define setreuid(r, e)		setresuid(r, e, -1)
+# define LA_TYPE	LA_FLOAT
+# define SFS_TYPE	SFS_VFS	/* use <sys/vfs.h> statfs() implementation */
+# define GIDSET_T	gid_t
+# define _PATH_UNIX	"/hp-ux"
+# ifndef _PATH_SENDMAILCF
+#  define _PATH_SENDMAILCF	"/usr/lib/sendmail.cf"
+# endif
+# ifndef IDENTPROTO
+#  define IDENTPROTO	0	/* TCP/IP implementation is broken */
+# endif
+# ifndef HASGETUSERSHELL
+#  define HASGETUSERSHELL 0	/* getusershell(3) causes core dumps */
+# endif
+# define syslog		hard_syslog
+# ifdef __STDC__
+extern int	syslog(int, char *, ...);
+# endif
+# endif
+
+
+/*
+**  IBM AIX 3.x -- actually tested for 3.2.3
+*/
+
+# ifdef _AIX3
+# define HASINITGROUPS	1	/* has initgroups(3) call */
+# define HASUNAME	1	/* use System V uname(2) system call */
+# define HASGETUSERSHELL 0	/* does not have getusershell(3) call */
+# define FORK		fork	/* no vfork primitive available */
+# undef  SETPROCTITLE		/* setproctitle confuses AIX */
+# define SFS_TYPE	SFS_STATFS	/* use <sys/statfs.h> statfs() impl */
+# endif
+
+
+/*
+**  Silicon Graphics IRIX
+**
+**	Compiles on 4.0.1.
+*/
+
+# ifdef IRIX
+# define SYSTEM5	1	/* this is a System-V derived system */
+# define HASSETREUID	1	/* has setreuid(2) call */
+# define HASINITGROUPS	1	/* has initgroups(3) call */
+# define HASGETUSERSHELL 0	/* does not have getusershell(3) call */
+# define FORK		fork	/* no vfork primitive available */
+# define WAITUNION	1	/* use "union wait" as wait argument type */
+# define setpgid	BSDsetpgrp
+# define GIDSET_T	gid_t
+# define SFS_TYPE	SFS_4ARGS	/* four argument statfs() call */
+# define LA_TYPE	LA_INT
+# endif
+
+
+/*
+**  SunOS and Solaris
+**
+**	Tested on SunOS 4.1.x (a.k.a. Solaris 1.1.x) and
+**	Solaris 2.2 (a.k.a. SunOS 5.2).
+*/
+
+#if defined(sun) && !defined(BSD)
+
+# define HASINITGROUPS	1	/* has initgroups(3) call */
+# define HASUNAME	1	/* use System V uname(2) system call */
+# define HASGETUSERSHELL 1	/* DOES have getusershell(3) call in libc */
+# define LA_TYPE	LA_INT
+
+# ifdef SOLARIS_2_3
+#  define SOLARIS
+# endif
+
+# ifdef SOLARIS
+			/* Solaris 2.x (a.k.a. SunOS 5.x) */
+#  ifndef __svr4__
+#   define __svr4__		/* use all System V Releae 4 defines below */
+#  endif
+#  include <sys/time.h>
+#  define gethostbyname	solaris_gethostbyname	/* get working version */
+#  define gethostbyaddr	solaris_gethostbyaddr	/* get working version */
+#  define GIDSET_T	gid_t
+#  ifndef _PATH_UNIX
+#   define _PATH_UNIX	"/kernel/unix"
+#  endif
+#  ifndef _PATH_SENDMAILCF
+#   define _PATH_SENDMAILCF	"/etc/mail/sendmail.cf"
+#  endif
+#  ifndef _PATH_SENDMAILPID
+#   define _PATH_SENDMAILPID	"/etc/mail/sendmail.pid"
+#  endif
+#  ifndef SYSLOG_BUFSIZE
+#   define SYSLOG_BUFSIZE	1024	/* allow full size syslog buffer */
+#  endif
+
+# else
+			/* SunOS 4.0.3 or 4.1.x */
+#  define HASSETREUID	1	/* has setreuid(2) call */
+#  ifndef HASFLOCK
+#   define HASFLOCK	1	/* has flock(2) call */
+#  endif
+#  define SFS_TYPE	SFS_VFS	/* use <sys/vfs.h> statfs() implementation */
+#  include <vfork.h>
+
+#  ifdef SUNOS403
+			/* special tweaking for SunOS 4.0.3 */
+#   include <malloc.h>
+#   define SYS5SIGNALS	1	/* SysV signal semantics -- reset on each sig */
+#   define WAITUNION	1	/* use "union wait" as wait argument type */
+#   undef WIFEXITED
+#   undef WEXITSTATUS
+#   undef HASUNAME
+#   define setpgid	setpgrp
+typedef int		pid_t;
+extern char		*getenv();
+
+#  else
+			/* 4.1.x specifics */
+#   define HASSETSID	1	/* has Posix setsid(2) call */
+#   define HASSETVBUF	1	/* we have setvbuf(3) in libc */
+
+#  endif
+# endif
+#endif
+
+/*
+**  DG/UX
+**
+**	Tested on 5.4.2
+*/
+
+#ifdef	DGUX
+# define SYSTEM5	1
+# define LA_TYPE	LA_SUBR
+# define HASSETREUID	1	/* has setreuid(2) call */
+# define HASUNAME	1	/* use System V uname(2) system call */
+# define HASSETSID	1	/* has Posix setsid(2) call */
+# define HASINITGROUPS	1	/* has initgroups(3) call */
+# define HASGETUSERSHELL 0	/* does not have getusershell(3) */
+# ifndef IDENTPROTO
+#  define IDENTPROTO	0	/* TCP/IP implementation is broken */
+# endif
+# undef SETPROCTITLE
+# define SFS_TYPE	SFS_4ARGS	/* four argument statfs() call */
+
+/* these include files must be included early on DG/UX */
+# include <netinet/in.h>
+# include <arpa/inet.h>
+
+# define inet_addr	dgux_inet_addr
+extern long	dgux_inet_addr();
+#endif
+
+
+/*
+**  Digital Ultrix 4.2A or 4.3
+**
+**	Apparently, fcntl locking is broken on 4.2A, in that locks are
+**	not dropped when the process exits.  This causes major problems,
+**	so flock is the only alternative.
+*/
+
+#ifdef ultrix
+# define HASSETREUID	1	/* has setreuid(2) call */
+# define HASUNSETENV	1	/* has unsetenv(3) call */
+# define HASINITGROUPS	1	/* has initgroups(3) call */
+# define HASUNAME	1	/* use System V uname(2) system call */
+# ifndef HASFLOCK
+#  define HASFLOCK	1	/* has flock(2) call */
+# endif
+# define HASGETUSERSHELL 0	/* does not have getusershell(3) call */
+# define BROKEN_RES_SEARCH 1	/* res_search(unknown) returns h_errno=0 */
+# ifdef vax
+#  define LA_TYPE	LA_FLOAT
+# else
+#  define LA_TYPE	LA_INT
+#  define LA_AVENRUN	"avenrun"
+# endif
+# define SFS_TYPE	SFS_MOUNT	/* use <sys/mount.h> statfs() impl */
+# ifndef IDENTPROTO
+#  define IDENTPROTO	0	/* TCP/IP implementation is broken */
+# endif
+#endif
+
+
+/*
+**  OSF/1 (tested on Alpha)
+*/
+
+#ifdef __osf__
+# define HASUNSETENV	1	/* has unsetenv(3) call */
+# define HASSETREUID	1	/* has setreuid(2) call */
+# define HASINITGROUPS	1	/* has initgroups(3) call */
+# ifndef HASFLOCK
+#  define HASFLOCK	1	/* has flock(2) call */
+# endif
+# define LA_TYPE	LA_INT
+# define SFS_TYPE	SFS_MOUNT	/* use <sys/mount.h> statfs() impl */
+# ifndef _PATH_SENDMAILPID
+#  define _PATH_SENDMAILPID	"/var/run/sendmail.pid"
+# endif
+#endif
+
+
+/*
+**  NeXTstep
+*/
+
+#ifdef NeXT
+# define HASINITGROUPS	1	/* has initgroups(3) call */
+# ifndef HASFLOCK
+#  define HASFLOCK	1	/* has flock(2) call */
+# endif
+# define NEEDGETOPT	1	/* need a replacement for getopt(3) */
+# define WAITUNION	1	/* use "union wait" as wait argument type */
+# define sleep		sleepX
+# define setpgid	setpgrp
+# ifndef LA_TYPE
+#  define LA_TYPE	LA_MACH
+# endif
+# define SFS_TYPE	SFS_VFS	/* use <sys/vfs.h> statfs() implementation */
+# ifndef _POSIX_SOURCE
+typedef int		pid_t;
+#  undef WEXITSTATUS
+#  undef WIFEXITED
+# endif
+# ifndef _PATH_SENDMAILCF
+#  define _PATH_SENDMAILCF	"/etc/sendmail/sendmail.cf"
+# endif
+# ifndef _PATH_SENDMAILPID
+#  define _PATH_SENDMAILPID	"/etc/sendmail/sendmail.pid"
+# endif
+#endif
+
+
+/*
+**  4.4 BSD
+**
+**	See also BSD defines.
+*/
+
+#ifdef BSD4_4
+# define HASUNSETENV	1	/* has unsetenv(3) call */
+# include <sys/cdefs.h>
+# define ERRLIST_PREDEFINED	/* don't declare sys_errlist */
+# ifndef LA_TYPE
+#  define LA_TYPE	LA_SUBR
+# endif
+# define SFS_TYPE	SFS_MOUNT	/* use <sys/mount.h> statfs() impl */
+#endif
+
+
+/*
+**  BSD/386 (all versions)
+**	From Tony Sanders, BSDI
+*/
+
+#ifdef __bsdi__
+# define HASUNSETENV	1	/* has the unsetenv(3) call */
+# define HASSETSID	1	/* has the setsid(2) POSIX syscall */
+# include <sys/cdefs.h>
+# define ERRLIST_PREDEFINED	/* don't declare sys_errlist */
+# define SFS_TYPE	SFS_MOUNT	/* use <sys/mount.h> statfs() impl */
+# ifndef LA_TYPE
+#  define LA_TYPE	LA_SUBR
+# endif
+# if defined(_BSDI_VERSION) && _BSDI_VERSION >= 199312
+			/* version 1.1 or later */
+#  define HASSETPROCTITLE 1	/* setproctitle is in libc */
+#  undef SETPROCTITLE		/* so don't redefine it in conf.c */
+# else
+			/* version 1.0 or earlier */
+#  ifndef OLD_NEWDB
+#   define OLD_NEWDB	1	/* old version of newdb library */
+#  endif
+# endif
+#endif
+
+
+
+/*
+**  386BSD / FreeBSD 1.0E / NetBSD (all architectures, all versions)
+**
+**  4.3BSD clone, closer to 4.4BSD
+**
+**	See also BSD defines.
+*/
+
+#if defined(__386BSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
+# define HASUNSETENV	1	/* has unsetenv(3) call */
+# define HASSETSID	1	/* has the setsid(2) POSIX syscall */
+#if defined(__FreeBSD__) || defined(__NetBSD__)
+# define HASUNAME       1 
+#endif
+#if defined(__NetBSD__) && ((NetBSD > 199307) || (NetBSD0_9 > 1))
+# undef SETPROCTITLE
+# define HASSETPROCTITLE
+# define setreuid(r,e)	__setreuid(r,e)
+# define GIDSET_T       gid_t
+#endif
+# include <sys/cdefs.h>
+# define ERRLIST_PREDEFINED	/* don't declare sys_errlist */
+# ifndef LA_TYPE
+#  define LA_TYPE	LA_SUBR
+# endif
+# define SFS_TYPE	SFS_MOUNT	/* use <sys/mount.h> statfs() impl */
+#endif
+
+
+/*
+**  Mach386
+**
+**	For mt Xinu's Mach386 system.
+*/
+
+#if defined(MACH) && defined(i386)
+# define MACH386	1
+# define HASUNSETENV	1	/* has unsetenv(3) call */
+# define HASINITGROUPS	1	/* has initgroups(3) call */
+# ifndef HASFLOCK
+#  define HASFLOCK	1	/* has flock(2) call */
+# endif
+# define NEEDGETOPT	1	/* need a replacement for getopt(3) */
+# define NEEDSTRTOL	1	/* need the strtol() function */
+# define setpgid	setpgrp
+# ifndef LA_TYPE
+#  define LA_TYPE	LA_FLOAT
+# endif
+# define SFS_TYPE	SFS_VFS	/* use <sys/vfs.h> statfs() implementation */
+# undef HASSETVBUF		/* don't actually have setvbuf(3) */
+# undef WEXITSTATUS
+# undef WIFEXITED
+# ifndef _PATH_SENDMAILCF
+#  define _PATH_SENDMAILCF	"/usr/lib/sendmail.cf"
+# endif
+# ifndef _PATH_SENDMAILPID
+#  define _PATH_SENDMAILPID	"/etc/sendmail.pid"
+# endif
+#endif
+
+
+/*
+**  4.3 BSD -- this is for very old systems
+**
+**	Should work for mt Xinu MORE/BSD and Mips UMIPS-BSD 2.1.
+**
+**	You'll also have to install a new resolver library.
+**	I don't guarantee that support for this environment is complete.
+*/
+
+#if defined(oldBSD43) || defined(MORE_BSD) || defined(umipsbsd)
+# define NEEDVPRINTF	1	/* need a replacement for vprintf(3) */
+# define NEEDGETOPT	1	/* need a replacement for getopt(3) */
+# define ARBPTR_T	char *
+# define setpgid	setpgrp
+# ifndef LA_TYPE
+#  define LA_TYPE	LA_FLOAT
+# endif
+# ifndef _PATH_SENDMAILCF
+#  define _PATH_SENDMAILCF	"/usr/lib/sendmail.cf"
+# endif
+# ifndef IDENTPROTO
+#  define IDENTPROTO	0	/* TCP/IP implementation is broken */
+# endif
+# undef WEXITSTATUS
+# undef WIFEXITED
+typedef short		pid_t;
+extern int		errno;
+#endif
+
+
+/*
+**  SCO Unix
+**
+**	This includes two parts -- the first is for SCO Open Server 3.2v4
+**	(contributed by Philippe Brand <phb@colombo.telesys-innov.fr>).
+**	The second is, I believe, for an older version.
+*/
+
+#ifdef _SCO_unix_4_2
+# define _SCO_unix_
+# define HASSETREUID	1	/* has setreuid(2) call */
+# define NEEDFSYNC	1	/* needs the fsync(2) call stub */
+# define _PATH_UNIX	"/unix"
+# ifndef _PATH_SENDMAILCF
+#  define _PATH_SENDMAILCF	"/usr/lib/sendmail.cf"
+# endif
+# ifndef _PATH_SENDMAILPID
+#  define _PATH_SENDMAILPID	"/etc/sendmail.pid"
+# endif
+#endif
+
+#ifdef _SCO_unix_
+# define SYSTEM5	1	/* include all the System V defines */
+# define SYS5SIGNALS	1	/* SysV signal semantics -- reset on each sig */
+# define HASGETUSERSHELL 0	/* does not have getusershell(3) call */
+# define FORK		fork
+# define MAXPATHLEN	PATHSIZE
+# define LA_TYPE	LA_SHORT
+# define SFS_TYPE	SFS_STATFS	/* use <sys/statfs.h> statfs() impl */
+# undef NETUNIX			/* no unix domain socket support */
+#endif
+
+
+/*
+**  ConvexOS 11.0 and later
+**
+**	"Todd C. Miller" <millert@mroe.cs.colorado.edu> claims this
+**	works on 9.1 as well.
+*/
+
+#ifdef _CONVEX_SOURCE
+# define BSD		1	/* include all the BSD defines */
+# define HASUNAME	1	/* use System V uname(2) system call */
+# define HASSETSID	1	/* has POSIX setsid(2) call */
+# define NEEDGETOPT	1	/* need replacement for getopt(3) */
+# define LA_TYPE	LA_FLOAT
+# define SFS_TYPE	SFS_VFS	/* use <sys/vfs.h> statfs() implementation */
+# ifndef _PATH_SENDMAILCF
+#  define _PATH_SENDMAILCF	"/usr/lib/sendmail.cf"
+# endif
+# ifndef S_IREAD
+#  define S_IREAD	_S_IREAD
+#  define S_IWRITE	_S_IWRITE
+#  define S_IEXEC	_S_IEXEC
+#  define S_IFMT	_S_IFMT
+#  define S_IFCHR	_S_IFCHR
+#  define S_IFBLK	_S_IFBLK
+# endif
+# ifndef IDENTPROTO
+#  define IDENTPROTO	0	/* TCP/IP implementation is broken */
+# endif
+#endif
+
+
+/*
+**  RISC/os 4.52
+**
+**	Gives a ton of warning messages, but otherwise compiles.
+*/
+
+#ifdef RISCOS
+
+# define HASUNSETENV	1	/* has unsetenv(3) call */
+# ifndef HASFLOCK
+#  define HASFLOCK	1	/* has flock(2) call */
+# endif
+# define WAITUNION	1	/* use "union wait" as wait argument type */
+# define NEEDGETOPT	1	/* need a replacement for getopt(3) */
+# define LA_TYPE	LA_INT
+# define LA_AVENRUN	"avenrun"
+# define _PATH_UNIX	"/unix"
+# undef WIFEXITED
+
+# define setpgid	setpgrp
+
+extern int		errno;
+typedef int		pid_t;
+#define			SIGFUNC_DEFINED
+typedef int		(*sigfunc_t)();
+extern char		*getenv();
+extern void		*malloc();
+
+#endif
+
+
+/*
+**  Linux 0.99pl10 and above...
+**
+**  Thanks to, in reverse order of contact:
+**
+**	John Kennedy <warlock@csuchico.edu>
+**	Florian La Roche <rzsfl@rz.uni-sb.de>
+**	Karl London <karl@borg.demon.co.uk>
+**
+**  Last compiled against:	[03/02/94 @ 05:34 PM (Wednesday)]
+**	sendmail 8.6.6.b9	named 4.9.2-931205-p1	db-1.73
+**	gcc 2.5.8		libc.so.4.5.19
+**	slackware 1.1.2		linux 0.99.15
+*/
+
+#ifdef __linux__
+# define BSD		1	/* include BSD defines */
+# define NEEDGETOPT	1	/* need a replacement for getopt(3) */
+# define HASUNAME	1	/* use System V uname(2) system call */
+# define HASUNSETENV	1	/* has unsetenv(3) call */
+# define ERRLIST_PREDEFINED	/* don't declare sys_errlist */
+# define GIDSET_T	gid_t	/* from <linux/types.h> */
+# ifndef LA_TYPE
+#  define LA_TYPE	LA_PROCSTR
+# endif
+# define SFS_TYPE	SFS_VFS		/* use <sys/vfs.h> statfs() impl */
+# include <sys/sysmacros.h>
+# undef atol			/* wounded in <stdlib.h> */
+#endif
+
+
+/*
+**  DELL SVR4 Issue 2.2, and others
+**	From Kimmo Suominen <kim@grendel.lut.fi>
+**
+**	It's on #ifdef DELL_SVR4 because Solaris also gets __svr4__
+**	defined, and the definitions conflict.
+**
+**	Peter Wemm <peter@perth.DIALix.oz.au> claims that the setreuid
+**	trick works on DELL 2.2 (SVR4.0/386 version 4.0) and ESIX 4.0.3A
+**	(SVR4.0/386 version 3.0).
+*/
+
+#ifdef DELL_SVR4
+				/* no changes necessary */
+				/* see general __svr4__ defines below */
+#endif
+
+
+/*
+**  Apple A/UX 3.0
+*/
+
+#ifdef _AUX_SOURCE
+# include <sys/sysmacros.h>
+# define BSD			/* has BSD routines */
+# define HASUNAME	1	/* use System V uname(2) system call */
+# define HASSETVBUF	1	/* we have setvbuf(3) in libc */
+# define SIGFUNC_DEFINED	/* sigfunc_t already defined */
+# ifndef IDENTPROTO
+#  define IDENTPROTO	0	/* TCP/IP implementation is broken */
+# endif
+# define FORK		fork
+# ifndef _PATH_SENDMAILCF
+#  define _PATH_SENDMAILCF	"/usr/lib/sendmail.cf"
+# endif
+# ifndef LA_TYPE
+#  define LA_TYPE	LA_ZERO
+# endif
+# define SFS_TYPE	SFS_VFS	/* use <sys/vfs.h> statfs() implementation */
+# undef WIFEXITED
+# undef WEXITSTATUS
+#endif
+
+
+/*
+**  Encore UMAX V
+**
+**	Not extensively tested.
+*/
+
+#ifdef UMAXV
+# include <limits.h>
+# define HASUNAME	1	/* use System V uname(2) system call */
+# define HASSETVBUF	1	/* we have setvbuf(3) in libc */
+# define HASINITGROUPS	1	/* has initgroups(3) call */
+# define HASGETUSERSHELL 0	/* does not have getusershell(3) call */
+# define SYS5SIGNALS	1	/* SysV signal semantics -- reset on each sig */
+# define SYS5SETPGRP	1	/* use System V setpgrp(2) syscall */
+# define FORK		fork	/* no vfork(2) primitive available */
+# define SFS_TYPE	SFS_4ARGS	/* four argument statfs() call */
+# define MAXPATHLEN	PATH_MAX
+extern struct passwd	*getpwent(), *getpwnam(), *getpwuid();
+extern struct group	*getgrent(), *getgrnam(), *getgrgid();
+# undef WIFEXITED
+# undef WEXITSTATUS
+#endif
+
+
+/*
+**  Stardent Titan 3000 running TitanOS 4.2.
+**
+**	Must be compiled in "cc -43" mode.
+**
+**	From Kate Hedstrom <kate@ahab.rutgers.edu>.
+**
+**	Note the tweaking below after the BSD defines are set.
+*/
+
+#ifdef titan
+# define setpgid	setpgrp
+typedef int		pid_t;
+# undef WIFEXITED
+# undef WEXITSTATUS
+#endif
+
+
+/*
+**  Sequent DYNIX 3.2.0
+**
+**	From Jim Davis <jdavis@cs.arizona.edu>.
+*/
+
+#ifdef sequent
+
+# define BSD		1
+# define HASUNSETENV	1
+# define BSD4_3		1	/* to get signal() in conf.c */
+# define WAITUNION	1
+# define LA_TYPE	LA_FLOAT
+# ifdef	_POSIX_VERSION
+#  undef _POSIX_VERSION		/* set in <unistd.h> */
+# endif
+# undef HASSETVBUF		/* don't actually have setvbuf(3) */
+# define setpgid	setpgrp
+
+/* Have to redefine WIFEXITED to take an int, to work with waitfor() */
+# undef	WIFEXITED
+# define WIFEXITED(s)	(((union wait*)&(s))->w_stopval != WSTOPPED && \
+			 ((union wait*)&(s))->w_termsig == 0)
+# define WEXITSTATUS(s)	(((union wait*)&(s))->w_retcode)
+typedef int		pid_t;
+# define isgraph(c)	(isprint(c) && (c != ' '))
+
+# ifndef IDENTPROTO
+#  define IDENTPROTO	0	/* TCP/IP implementation is broken */
+# endif
+
+# ifndef _PATH_UNIX
+#  define _PATH_UNIX	"/dynix"
+# endif
+# ifndef _PATH_SENDMAILCF
+#  define _PATH_SENDMAILCF	"/usr/lib/sendmail.cf"
+# endif
+
+#endif
+
+
+/*
+**  Sequent DYNIX/ptx v2.0 (and higher)
+**
+**	For DYNIX/ptx v1.x, undefine HASSETREUID.
+**
+**	From Tim Wright <timw@sequent.com>.
+*/
+
+#ifdef _SEQUENT_
+# define SYSTEM5	1	/* include all the System V defines */
+# define HASSETSID	1	/* has POSIX setsid(2) call */
+# define HASINITGROUPS	1	/* has initgroups(3) call */
+# define HASSETREUID	1	/* has setreuid(2) call */
+# define HASGETUSERSHELL 0	/* does not have getusershell(3) call */
+# define GIDSET_T	gid_t
+# define LA_TYPE	LA_INT
+# define SFS_TYPE	SFS_STATFS	/* use <sys/statfs.h> statfs() impl */
+# undef SETPROCTITLE
+# ifndef IDENTPROTO
+#  define IDENTPROTO	0	/* TCP/IP implementation is broken */
+# endif
+# ifndef _PATH_SENDMAILCF
+#  define _PATH_SENDMAILCF	"/usr/lib/sendmail.cf"
+# endif
+# ifndef _PATH_SENDMAILPID
+#  define _PATH_SENDMAILPID	"/etc/sendmail.pid"
+# endif
+#endif
+
+
+/*
+**  Cray Unicos
+**
+**	Ported by David L. Kensiski, Sterling Sofware <kensiski@nas.nasa.gov>
+*/
+
+#ifdef UNICOS
+# define SYSTEM5	1	/* include all the System V defines */
+# define SYS5SIGNALS	1	/* SysV signal semantics -- reset on each sig */
+# define MAXPATHLEN	PATHSIZE
+# define LA_TYPE	LA_ZERO
+# define SFS_TYPE	SFS_4ARGS	/* four argument statfs() call */
+#endif
+
+
+/*
+**  Apollo DomainOS
+**
+**  From Todd Martin <tmartint@tus.ssi1.com> & Don Lewis <gdonl@gv.ssi1.com>
+**
+**  15 Jan 1994
+**
+*/
+
+#ifdef apollo
+# define HASSETREUID	1	/* has setreuid(2) call */
+# define HASINITGROUPS	1	/* has initgroups(2) call */
+# undef  SETPROCTITLE
+# define LA_TYPE	LA_SUBR		/* use getloadavg.c */
+# define SFS_TYPE	SFS_4ARGS	/* four argument statfs() call */
+# ifndef _PATH_SENDMAILCF
+#  define _PATH_SENDMAILCF	"/usr/lib/sendmail.cf"
+# endif
+# ifndef _PATH_SENDMAILPID
+#  define _PATH_SENDMAILPID	"/etc/sendmail.pid"
+# endif
+# undef  S_IFSOCK		/* S_IFSOCK and S_IFIFO are the same */
+# undef  S_IFIFO
+# define S_IFIFO	0010000
+# ifndef IDENTPROTO
+#  define IDENTPROTO	0	/* TCP/IP implementation is broken */
+# endif
+#endif
+
+
+/*
+**  UnixWare
+**
+**	From Evan Champion <evanc@spatial.synapse.org>.
+*/
+
+#ifdef UNIXWARE
+# define SYSTEM5		1
+# ifndef HASGETUSERSHELL
+#  define HASGETUSERSHELL 0	/* does not have getusershell(3) call */
+# endif
+# define GIDSET_T		int
+# define SLEEP_T		int
+# define SFS_TYPE		SFS_STATVFS
+# define LA_TYPE		LA_ZERO
+# undef WIFEXITED
+# undef WEXITSTATUS
+# define _PATH_UNIX		"/unix"
+# ifndef _PATH_SENDMAILCF
+#  define _PATH_SENDMAILCF	"/usr/ucblib/sendmail.cf"
+# endif
+# ifndef _PATH_SENDMAILPID
+#  define _PATH_SENDMAILPID	"/usr/ucblib/sendmail.pid"
+# endif
+# define SYSLOG_BUFSIZE	128
+#endif
+
+
+/*
+**  Intergraph CLIX 3.1
+**
+**	From Paul Southworth <pauls@locust.cic.net>
+*/
+
+#ifdef CLIX
+# define SYSTEM5	1	/* looks like System V */
+# ifndef HASGETUSERSHELL
+#  define HASGETUSERSHELL 0	/* does not have getusershell(3) call */
+# endif
+# define DEV_BSIZE	512	/* device block size not defined */
+# define GIDSET_T	gid_t
+# undef LOG			/* syslog not available */
+# define NEEDFSYNC	1	/* no fsync in system library */
+# define GETSHORT	_getshort
+#endif
+
+
+/*
+**  NCR 3000 Series (SysVr4)
+**
+**	From From: Kevin Darcy <kevin@tech.mis.cfc.com>.
+*/
+
+#ifdef NCR3000
+# define __svr4__
+# undef BSD
+# define LA_AVENRUN	"avenrun"
+#endif
+ 
+
+
+
+
+/**********************************************************************
+**  End of Per-Operating System defines
+**********************************************************************/
+
+/**********************************************************************
+**  More general defines
+**********************************************************************/
+
+/* general BSD defines */
+#ifdef BSD
+# define HASGETDTABLESIZE 1	/* has getdtablesize(2) call */
+# define HASSETREUID	1	/* has setreuid(2) call */
+# define HASINITGROUPS	1	/* has initgroups(2) call */
+# ifndef HASFLOCK
+#  define HASFLOCK	1	/* has flock(2) call */
+# endif
+#endif
+
+/* general System V Release 4 defines */
+#ifdef __svr4__
+# define SYSTEM5	1
+# define HASSETREUID	1	/* has seteuid(2) call & working saved uids */
+# ifndef HASGETUSERSHELL
+#  define HASGETUSERSHELL 0	/* does not have getusershell(3) call */
+# endif
+# define setreuid(r, e)	seteuid(e)
+
+# ifndef _PATH_UNIX
+#  define _PATH_UNIX		"/unix"
+# endif
+# ifndef _PATH_SENDMAILCF
+#  define _PATH_SENDMAILCF	"/usr/ucblib/sendmail.cf"
+# endif
+# ifndef _PATH_SENDMAILPID
+#  define _PATH_SENDMAILPID	"/usr/ucblib/sendmail.pid"
+# endif
+# ifndef SYSLOG_BUFSIZE
+#  define SYSLOG_BUFSIZE	128
+# endif
+#endif
+
+/* general System V defines */
+#ifdef SYSTEM5
+# include <sys/sysmacros.h>
+# define HASUNAME	1	/* use System V uname(2) system call */
+# define SYS5SETPGRP	1	/* use System V setpgrp(2) syscall */
+# define HASSETVBUF	1	/* we have setvbuf(3) in libc */
+# ifndef LA_TYPE
+#  define LA_TYPE	LA_INT		/* assume integer load average */
+# endif
+# ifndef SFS_TYPE
+#  define SFS_TYPE	SFS_USTAT	/* use System V ustat(2) syscall */
+# endif
+# define bcopy(s, d, l)		(memmove((d), (s), (l)))
+# define bzero(d, l)		(memset((d), '\0', (l)))
+# define bcmp(s, d, l)		(memcmp((s), (d), (l)))
+#endif
+
+/* general POSIX defines */
+#ifdef _POSIX_VERSION
+# define HASSETSID	1	/* has Posix setsid(2) call */
+# define HASWAITPID	1	/* has Posix waitpid(2) call */
+#endif
+
+/*
+**  If no type for argument two of getgroups call is defined, assume
+**  it's an integer -- unfortunately, there seem to be several choices
+**  here.
+*/
+
+#ifndef GIDSET_T
+# define GIDSET_T	int
+#endif
+
+/*
+**  Tweaking for systems that (for example) claim to be BSD but
+**  don't have all the standard BSD routines (boo hiss).
+*/
+
+#ifdef titan
+# undef HASINITGROUPS		/* doesn't have initgroups(3) call */
+#endif
+
+
+/*
+**  Due to a "feature" in some operating systems such as Ultrix 4.3 and
+**  HPUX 8.0, if you receive a "No route to host" message (ICMP message
+**  ICMP_UNREACH_HOST) on _any_ connection, all connections to that host
+**  are closed.  Some firewalls return this error if you try to connect
+**  to the IDENT port (113), so you can't receive email from these hosts
+**  on these systems.  The firewall really should use a more specific
+**  message such as ICMP_UNREACH_PROTOCOL or _PORT or _NET_PROHIB.  If
+**  not explicitly set to zero above, default it on.
+*/
+
+#ifndef IDENTPROTO
+# define IDENTPROTO	1	/* use IDENT proto (RFC 1413) */
+#endif
+
+#ifndef HASGETUSERSHELL
+# define HASGETUSERSHELL 1	/* libc has getusershell(3) call */
+#endif
+
+#ifndef HASFLOCK
+# define HASFLOCK	0	/* assume no flock(2) support */
+#endif
+
+#ifndef OLD_NEWDB
+# define OLD_NEWDB	0	/* assume newer version of newdb */
+#endif
+
+
+/**********************************************************************
+**  Remaining definitions should never have to be changed.  They are
+**  primarily to provide back compatibility for older systems -- for
+**  example, it includes some POSIX compatibility definitions
+**********************************************************************/
+
+/* System 5 compatibility */
+#ifndef S_ISREG
+# define S_ISREG(foo)	((foo & S_IFMT) == S_IFREG)
+#endif
+#if !defined(S_ISLNK) && defined(S_IFLNK)
+# define S_ISLNK(foo)	((foo & S_IFMT) == S_IFLNK)
+#endif
+#ifndef S_IWGRP
+#define S_IWGRP		020
+#endif
+#ifndef S_IWOTH
+#define S_IWOTH		002
+#endif
+
+/*
+**  Older systems don't have this error code -- it should be in
+**  /usr/include/sysexits.h.
+*/
+
+# ifndef EX_CONFIG
+# define EX_CONFIG	78	/* configuration error */
+# endif
+
+/* pseudo-code used in server SMTP */
+# define EX_QUIT	22	/* drop out of server immediately */
+
+
+/*
+**  These are used in a few cases where we need some special
+**  error codes, but where the system doesn't provide something
+**  reasonable.  They are printed in errstring.
+*/
+
+#ifndef E_PSEUDOBASE
+# define E_PSEUDOBASE	256
+#endif
+
+#define EOPENTIMEOUT	(E_PSEUDOBASE + 0)	/* timeout on open */
+#define E_DNSBASE	(E_PSEUDOBASE + 20)	/* base for DNS h_errno */
+
+/* type of arbitrary pointer */
+#ifndef ARBPTR_T
+# define ARBPTR_T	void *
+#endif
+
+#ifndef __P
+# include "cdefs.h"
+#endif
+
+/*
+**  Do some required dependencies
+*/
+
+#if defined(NETINET) || defined(NETISO)
+# define SMTP		1	/* enable user and server SMTP */
+# define QUEUE		1	/* enable queueing */
+# define DAEMON		1	/* include the daemon (requires IPC & SMTP) */
+#endif
+
+
+/*
+**  Arrange to use either varargs or stdargs
+*/
+
+# ifdef __STDC__
+
+# include <stdarg.h>
+
+# define VA_LOCAL_DECL	va_list ap;
+# define VA_START(f)	va_start(ap, f)
+# define VA_END		va_end(ap)
+
+# else
+
+# include <varargs.h>
+
+# define VA_LOCAL_DECL	va_list ap;
+# define VA_START(f)	va_start(ap)
+# define VA_END		va_end(ap)
+
+# endif
+
+#ifdef HASUNAME
+# include <sys/utsname.h>
+# ifdef newstr
+#  undef newstr
+# endif
+#else /* ! HASUNAME */
+# define NODE_LENGTH 32
+struct utsname
+{
+	char nodename[NODE_LENGTH+1];
+};
+#endif /* HASUNAME */
+
+#if !defined(MAXHOSTNAMELEN) && !defined(_SCO_unix_)
+# define MAXHOSTNAMELEN	256
+#endif
+
+#if !defined(SIGCHLD) && defined(SIGCLD)
+# define SIGCHLD	SIGCLD
+#endif
+
+#ifndef STDIN_FILENO
+#define STDIN_FILENO	0
+#endif
+
+#ifndef STDOUT_FILENO
+#define STDOUT_FILENO	1
+#endif
+
+#ifndef STDERR_FILENO
+#define STDERR_FILENO	2
+#endif
+
+#ifndef LOCK_SH
+# define LOCK_SH	0x01	/* shared lock */
+# define LOCK_EX	0x02	/* exclusive lock */
+# define LOCK_NB	0x04	/* non-blocking lock */
+# define LOCK_UN	0x08	/* unlock */
+#endif
+
+#ifndef SIG_ERR
+# define SIG_ERR	((void (*)()) -1)
+#endif
+
+#ifndef WEXITSTATUS
+# define WEXITSTATUS(st)	(((st) >> 8) & 0377)
+#endif
+#ifndef WIFEXITED
+# define WIFEXITED(st)		(((st) & 0377) == 0)
+#endif
+
+#ifndef SIGFUNC_DEFINED
+typedef void		(*sigfunc_t) __P((int));
+#endif
+
+/* size of syslog buffer */
+#ifndef SYSLOG_BUFSIZE
+# define SYSLOG_BUFSIZE	1024
+#endif
+
+/*
+**  Size of tobuf (deliver.c)
+**	Tweak this to match your syslog implementation.  It will have to
+**	allow for the extra information printed.
+*/
+
+#ifndef TOBUFSIZE
+# if (SYSLOG_BUFSIZE) > 512
+#  define TOBUFSIZE	(SYSLOG_BUFSIZE - 256)
+# else
+#  define TOBUFSIZE	256
+# endif
+#endif
+
+/*
+**  Size of prescan buffer.
+**	Despite comments in the _sendmail_ book, this probably should
+**	not be changed; there are some hard-to-define dependencies.
+*/
+
+# define PSBUFSIZE	(MAXNAME + MAXATOM)	/* size of prescan buffer */
+/* fork routine -- set above using #ifdef _osname_ or in Makefile */
+# ifndef FORK
+# define FORK		vfork		/* function to call to fork mailer */
+# endif
+
+/*
+**  If we are going to link scanf anyway, use it in readcf
+*/
+
+#if !defined(HASUNAME) && !defined(SCANF)
+# define SCANF		1
+#endif
diff --git a/usr.sbin/sendmail/src/convtime.c b/usr.sbin/sendmail/src/convtime.c
new file mode 100644
index 00000000000..109c30f5b96
--- /dev/null
+++ b/usr.sbin/sendmail/src/convtime.c
@@ -0,0 +1,196 @@
+/*
+ * Copyright (c) 1983 Eric P. Allman
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)convtime.c	8.1 (Berkeley) 6/7/93";
+#endif /* not lint */
+
+# include "sendmail.h"
+
+/*
+**  CONVTIME -- convert time
+**
+**	Takes a time as an ascii string with a trailing character
+**	giving units:
+**	  s -- seconds
+**	  m -- minutes
+**	  h -- hours
+**	  d -- days (default)
+**	  w -- weeks
+**	For example, "3d12h" is three and a half days.
+**
+**	Parameters:
+**		p -- pointer to ascii time.
+**		units -- default units if none specified.
+**
+**	Returns:
+**		time in seconds.
+**
+**	Side Effects:
+**		none.
+*/
+
+time_t
+convtime(p, units)
+	char *p;
+	char units;
+{
+	register time_t t, r;
+	register char c;
+
+	r = 0;
+	while (*p != '\0')
+	{
+		t = 0;
+		while ((c = *p++) != '\0' && isascii(c) && isdigit(c))
+			t = t * 10 + (c - '0');
+		if (c == '\0')
+		{
+			c = units;
+			p--;
+		}
+		switch (c)
+		{
+		  case 'w':		/* weeks */
+			t *= 7;
+
+		  case 'd':		/* days */
+		  default:
+			t *= 24;
+
+		  case 'h':		/* hours */
+			t *= 60;
+
+		  case 'm':		/* minutes */
+			t *= 60;
+
+		  case 's':		/* seconds */
+			break;
+		}
+		r += t;
+	}
+
+	return (r);
+}
+/*
+**  PINTVL -- produce printable version of a time interval
+**
+**	Parameters:
+**		intvl -- the interval to be converted
+**		brief -- if TRUE, print this in an extremely compact form
+**			(basically used for logging).
+**
+**	Returns:
+**		A pointer to a string version of intvl suitable for
+**			printing or framing.
+**
+**	Side Effects:
+**		none.
+**
+**	Warning:
+**		The string returned is in a static buffer.
+*/
+
+# define PLURAL(n)	((n) == 1 ? "" : "s")
+
+char *
+pintvl(intvl, brief)
+	time_t intvl;
+	bool brief;
+{
+	static char buf[256];
+	register char *p;
+	int wk, dy, hr, mi, se;
+
+	if (intvl == 0 && !brief)
+		return ("zero seconds");
+
+	/* decode the interval into weeks, days, hours, minutes, seconds */
+	se = intvl % 60;
+	intvl /= 60;
+	mi = intvl % 60;
+	intvl /= 60;
+	hr = intvl % 24;
+	intvl /= 24;
+	if (brief)
+		dy = intvl;
+	else
+	{
+		dy = intvl % 7;
+		intvl /= 7;
+		wk = intvl;
+	}
+
+	/* now turn it into a sexy form */
+	p = buf;
+	if (brief)
+	{
+		if (dy > 0)
+		{
+			(void) sprintf(p, "%d+", dy);
+			p += strlen(p);
+		}
+		(void) sprintf(p, "%02d:%02d:%02d", hr, mi, se);
+		return (buf);
+	}
+
+	/* use the verbose form */
+	if (wk > 0)
+	{
+		(void) sprintf(p, ", %d week%s", wk, PLURAL(wk));
+		p += strlen(p);
+	}
+	if (dy > 0)
+	{
+		(void) sprintf(p, ", %d day%s", dy, PLURAL(dy));
+		p += strlen(p);
+	}
+	if (hr > 0)
+	{
+		(void) sprintf(p, ", %d hour%s", hr, PLURAL(hr));
+		p += strlen(p);
+	}
+	if (mi > 0)
+	{
+		(void) sprintf(p, ", %d minute%s", mi, PLURAL(mi));
+		p += strlen(p);
+	}
+	if (se > 0)
+	{
+		(void) sprintf(p, ", %d second%s", se, PLURAL(se));
+		p += strlen(p);
+	}
+
+	return (buf + 2);
+}
diff --git a/usr.sbin/sendmail/src/daemon.c b/usr.sbin/sendmail/src/daemon.c
new file mode 100644
index 00000000000..9753d4c7b1c
--- /dev/null
+++ b/usr.sbin/sendmail/src/daemon.c
@@ -0,0 +1,1555 @@
+/*
+ * Copyright (c) 1983 Eric P. Allman
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <errno.h>
+#include "sendmail.h"
+
+#ifndef lint
+#ifdef DAEMON
+static char sccsid[] = "@(#)daemon.c	8.48.1.5 (Berkeley) 3/28/95 (with daemon mode)";
+#else
+static char sccsid[] = "@(#)daemon.c	8.48.1.5 (Berkeley) 3/28/95 (without daemon mode)";
+#endif
+#endif /* not lint */
+
+#ifdef DAEMON
+
+# include <netdb.h>
+# include <arpa/inet.h>
+
+#if NAMED_BIND
+# include <arpa/nameser.h>
+# include <resolv.h>
+#endif
+
+/*
+**  DAEMON.C -- routines to use when running as a daemon.
+**
+**	This entire file is highly dependent on the 4.2 BSD
+**	interprocess communication primitives.  No attempt has
+**	been made to make this file portable to Version 7,
+**	Version 6, MPX files, etc.  If you should try such a
+**	thing yourself, I recommend chucking the entire file
+**	and starting from scratch.  Basic semantics are:
+**
+**	getrequests()
+**		Opens a port and initiates a connection.
+**		Returns in a child.  Must set InChannel and
+**		OutChannel appropriately.
+**	clrdaemon()
+**		Close any open files associated with getting
+**		the connection; this is used when running the queue,
+**		etc., to avoid having extra file descriptors during
+**		the queue run and to avoid confusing the network
+**		code (if it cares).
+**	makeconnection(host, port, outfile, infile, usesecureport)
+**		Make a connection to the named host on the given
+**		port.  Set *outfile and *infile to the files
+**		appropriate for communication.  Returns zero on
+**		success, else an exit status describing the
+**		error.
+**	host_map_lookup(map, hbuf, avp, pstat)
+**		Convert the entry in hbuf into a canonical form.
+*/
+/*
+**  GETREQUESTS -- open mail IPC port and get requests.
+**
+**	Parameters:
+**		none.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		Waits until some interesting activity occurs.  When
+**		it does, a child is created to process it, and the
+**		parent waits for completion.  Return from this
+**		routine is always in the child.  The file pointers
+**		"InChannel" and "OutChannel" should be set to point
+**		to the communication channel.
+*/
+
+int		DaemonSocket	= -1;		/* fd describing socket */
+SOCKADDR	DaemonAddr;			/* socket for incoming */
+int		ListenQueueSize = 10;		/* size of listen queue */
+int		TcpRcvBufferSize = 0;		/* size of TCP receive buffer */
+int		TcpSndBufferSize = 0;		/* size of TCP send buffer */
+
+getrequests()
+{
+	int t;
+	bool refusingconnections = TRUE;
+	FILE *pidf;
+	int socksize;
+#ifdef XDEBUG
+	bool j_has_dot;
+#endif
+	extern void reapchild();
+
+	/*
+	**  Set up the address for the mailer.
+	*/
+
+	if (DaemonAddr.sin.sin_family == 0)
+		DaemonAddr.sin.sin_family = AF_INET;
+	if (DaemonAddr.sin.sin_addr.s_addr == 0)
+		DaemonAddr.sin.sin_addr.s_addr = INADDR_ANY;
+	if (DaemonAddr.sin.sin_port == 0)
+	{
+		register struct servent *sp;
+
+		sp = getservbyname("smtp", "tcp");
+		if (sp == NULL)
+		{
+			syserr("554 service \"smtp\" unknown");
+			DaemonAddr.sin.sin_port = htons(25);
+		}
+		else
+			DaemonAddr.sin.sin_port = sp->s_port;
+	}
+
+	/*
+	**  Try to actually open the connection.
+	*/
+
+	if (tTd(15, 1))
+		printf("getrequests: port 0x%x\n", DaemonAddr.sin.sin_port);
+
+	/* get a socket for the SMTP connection */
+	socksize = opendaemonsocket(TRUE);
+
+	(void) setsignal(SIGCHLD, reapchild);
+
+	/* write the pid to the log file for posterity */
+	pidf = fopen(PidFile, "w");
+	if (pidf != NULL)
+	{
+		extern char *CommandLineArgs;
+
+		/* write the process id on line 1 */
+		fprintf(pidf, "%d\n", getpid());
+
+		/* line 2 contains all command line flags */
+		fprintf(pidf, "%s\n", CommandLineArgs);
+
+		/* flush and close */
+		fclose(pidf);
+	}
+
+#ifdef XDEBUG
+	{
+		char jbuf[MAXHOSTNAMELEN];
+
+		expand("\201j", jbuf, &jbuf[sizeof jbuf - 1], CurEnv);
+		j_has_dot = strchr(jbuf, '.') != NULL;
+	}
+#endif
+
+	if (tTd(15, 1))
+		printf("getrequests: %d\n", DaemonSocket);
+
+	for (;;)
+	{
+		register int pid;
+		auto int lotherend;
+		extern bool refuseconnections();
+
+		/* see if we are rejecting connections */
+		CurrentLA = getla();
+		if (refuseconnections())
+		{
+			if (DaemonSocket >= 0)
+			{
+				/* close socket so peer will fail quickly */
+				(void) close(DaemonSocket);
+				DaemonSocket = -1;
+			}
+			refusingconnections = TRUE;
+			setproctitle("rejecting connections: load average: %d",
+				CurrentLA);
+			sleep(15);
+			continue;
+		}
+
+		if (refusingconnections)
+		{
+			/* start listening again */
+			(void) opendaemonsocket(FALSE);
+			setproctitle("accepting connections");
+			refusingconnections = FALSE;
+		}
+
+#ifdef XDEBUG
+		/* check for disaster */
+		{
+			register STAB *s;
+			char jbuf[MAXHOSTNAMELEN];
+
+			expand("\201j", jbuf, &jbuf[sizeof jbuf - 1], CurEnv);
+			if ((s = stab(jbuf, ST_CLASS, ST_FIND)) == NULL ||
+			    !bitnset('w', s->s_class))
+			{
+				dumpstate("daemon lost $j");
+				syslog(LOG_ALERT, "daemon process doesn't have $j in $=w; see syslog");
+				abort();
+			}
+			else if (j_has_dot && strchr(jbuf, '.') == NULL)
+			{
+				dumpstate("daemon $j lost dot");
+				syslog(LOG_ALERT, "daemon process $j lost dot; see syslog");
+				abort();
+			}
+		}
+#endif
+
+		/* wait for a connection */
+		do
+		{
+			errno = 0;
+			lotherend = socksize;
+			t = accept(DaemonSocket,
+			    (struct sockaddr *)&RealHostAddr, &lotherend);
+		} while (t < 0 && errno == EINTR);
+		if (t < 0)
+		{
+			syserr("getrequests: accept");
+			sleep(5);
+			continue;
+		}
+
+		/*
+		**  Create a subprocess to process the mail.
+		*/
+
+		if (tTd(15, 2))
+			printf("getrequests: forking (fd = %d)\n", t);
+
+		pid = fork();
+		if (pid < 0)
+		{
+			syserr("daemon: cannot fork");
+			sleep(10);
+			(void) close(t);
+			continue;
+		}
+
+		if (pid == 0)
+		{
+			char *p;
+			extern char *hostnamebyanyaddr();
+
+			/*
+			**  CHILD -- return to caller.
+			**	Collect verified idea of sending host.
+			**	Verify calling user id if possible here.
+			*/
+
+			(void) setsignal(SIGCHLD, SIG_DFL);
+			DisConnected = FALSE;
+
+			setproctitle("startup with %s",
+				anynet_ntoa(&RealHostAddr));
+
+			/* determine host name */
+			p = hostnamebyanyaddr(&RealHostAddr);
+			RealHostName = newstr(p);
+			setproctitle("startup with %s", p);
+
+#ifdef LOG
+			if (LogLevel > 11)
+			{
+				/* log connection information */
+				syslog(LOG_INFO, "connect from %s (%s)",
+					RealHostName, anynet_ntoa(&RealHostAddr));
+			}
+#endif
+
+			(void) close(DaemonSocket);
+			if ((InChannel = fdopen(t, "r")) == NULL ||
+			    (t = dup(t)) < 0 ||
+			    (OutChannel = fdopen(t, "w")) == NULL)
+			{
+				syserr("cannot open SMTP server channel, fd=%d", t);
+				exit(0);
+			}
+
+			/* should we check for illegal connection here? XXX */
+#ifdef XLA
+			if (!xla_host_ok(RealHostName))
+			{
+				message("421 Too many SMTP sessions for this host");
+				exit(0);
+			}
+#endif
+
+			if (tTd(15, 2))
+				printf("getreq: returning\n");
+			return;
+		}
+
+		/* close the port so that others will hang (for a while) */
+		(void) close(t);
+	}
+	/*NOTREACHED*/
+}
+/*
+**  OPENDAEMONSOCKET -- open the SMTP socket
+**
+**	Deals with setting all appropriate options.  DaemonAddr must
+**	be set up in advance.
+**
+**	Parameters:
+**		firsttime -- set if this is the initial open.
+**
+**	Returns:
+**		Size in bytes of the daemon socket addr.
+**
+**	Side Effects:
+**		Leaves DaemonSocket set to the open socket.
+**		Exits if the socket cannot be created.
+*/
+
+#define MAXOPENTRIES	10	/* maximum number of tries to open connection */
+
+int
+opendaemonsocket(firsttime)
+	bool firsttime;
+{
+	int on = 1;
+	int socksize;
+	int ntries = 0;
+	int saveerrno;
+
+	if (tTd(15, 2))
+		printf("opendaemonsocket()\n");
+
+	do
+	{
+		if (ntries > 0)
+			sleep(5);
+		if (firsttime || DaemonSocket < 0)
+		{
+			DaemonSocket = socket(DaemonAddr.sa.sa_family, SOCK_STREAM, 0);
+			if (DaemonSocket < 0)
+			{
+				/* probably another daemon already */
+				saveerrno = errno;
+				syserr("opendaemonsocket: can't create server SMTP socket");
+			  severe:
+# ifdef LOG
+				if (LogLevel > 0)
+					syslog(LOG_ALERT, "problem creating SMTP socket");
+# endif /* LOG */
+				DaemonSocket = -1;
+				continue;
+			}
+
+			/* turn on network debugging? */
+			if (tTd(15, 101))
+				(void) setsockopt(DaemonSocket, SOL_SOCKET,
+						  SO_DEBUG, (char *)&on,
+						  sizeof on);
+
+			(void) setsockopt(DaemonSocket, SOL_SOCKET,
+					  SO_REUSEADDR, (char *)&on, sizeof on);
+			(void) setsockopt(DaemonSocket, SOL_SOCKET,
+					  SO_KEEPALIVE, (char *)&on, sizeof on);
+
+#ifdef SO_RCVBUF
+			if (TcpRcvBufferSize > 0)
+			{
+				if (setsockopt(DaemonSocket, SOL_SOCKET,
+					       SO_RCVBUF,
+					       (char *) &TcpRcvBufferSize,
+					       sizeof(TcpRcvBufferSize)) < 0)
+					syserr("getrequests: setsockopt(SO_RCVBUF)");
+			}
+#endif
+
+			switch (DaemonAddr.sa.sa_family)
+			{
+# ifdef NETINET
+			  case AF_INET:
+				socksize = sizeof DaemonAddr.sin;
+				break;
+# endif
+
+# ifdef NETISO
+			  case AF_ISO:
+				socksize = sizeof DaemonAddr.siso;
+				break;
+# endif
+
+			  default:
+				socksize = sizeof DaemonAddr;
+				break;
+			}
+
+			if (bind(DaemonSocket, &DaemonAddr.sa, socksize) < 0)
+			{
+				saveerrno = errno;
+				syserr("getrequests: cannot bind");
+				(void) close(DaemonSocket);
+				goto severe;
+			}
+		}
+		if (!firsttime && listen(DaemonSocket, ListenQueueSize) < 0)
+		{
+			saveerrno = errno;
+			syserr("getrequests: cannot listen");
+			(void) close(DaemonSocket);
+			goto severe;
+		}
+		return socksize;
+	} while (ntries++ < MAXOPENTRIES && transienterror(saveerrno));
+	finis();
+}
+/*
+**  CLRDAEMON -- reset the daemon connection
+**
+**	Parameters:
+**		none.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		releases any resources used by the passive daemon.
+*/
+
+clrdaemon()
+{
+	if (DaemonSocket >= 0)
+		(void) close(DaemonSocket);
+	DaemonSocket = -1;
+}
+/*
+**  SETDAEMONOPTIONS -- set options for running the daemon
+**
+**	Parameters:
+**		p -- the options line.
+**
+**	Returns:
+**		none.
+*/
+
+setdaemonoptions(p)
+	register char *p;
+{
+	if (DaemonAddr.sa.sa_family == AF_UNSPEC)
+		DaemonAddr.sa.sa_family = AF_INET;
+
+	while (p != NULL)
+	{
+		register char *f;
+		register char *v;
+
+		while (isascii(*p) && isspace(*p))
+			p++;
+		if (*p == '\0')
+			break;
+		f = p;
+		p = strchr(p, ',');
+		if (p != NULL)
+			*p++ = '\0';
+		v = strchr(f, '=');
+		if (v == NULL)
+			continue;
+		while (isascii(*++v) && isspace(*v))
+			continue;
+
+		switch (*f)
+		{
+		  case 'F':		/* address family */
+			if (isascii(*v) && isdigit(*v))
+				DaemonAddr.sa.sa_family = atoi(v);
+#ifdef NETINET
+			else if (strcasecmp(v, "inet") == 0)
+				DaemonAddr.sa.sa_family = AF_INET;
+#endif
+#ifdef NETISO
+			else if (strcasecmp(v, "iso") == 0)
+				DaemonAddr.sa.sa_family = AF_ISO;
+#endif
+#ifdef NETNS
+			else if (strcasecmp(v, "ns") == 0)
+				DaemonAddr.sa.sa_family = AF_NS;
+#endif
+#ifdef NETX25
+			else if (strcasecmp(v, "x.25") == 0)
+				DaemonAddr.sa.sa_family = AF_CCITT;
+#endif
+			else
+				syserr("554 Unknown address family %s in Family=option", v);
+			break;
+
+		  case 'A':		/* address */
+			switch (DaemonAddr.sa.sa_family)
+			{
+#ifdef NETINET
+			  case AF_INET:
+				if (isascii(*v) && isdigit(*v))
+					DaemonAddr.sin.sin_addr.s_addr = inet_network(v);
+				else
+				{
+					register struct netent *np;
+
+					np = getnetbyname(v);
+					if (np == NULL)
+						syserr("554 network \"%s\" unknown", v);
+					else
+						DaemonAddr.sin.sin_addr.s_addr = np->n_net;
+				}
+				break;
+#endif
+
+			  default:
+				syserr("554 Address= option unsupported for family %d",
+					DaemonAddr.sa.sa_family);
+				break;
+			}
+			break;
+
+		  case 'P':		/* port */
+			switch (DaemonAddr.sa.sa_family)
+			{
+				short port;
+
+#ifdef NETINET
+			  case AF_INET:
+				if (isascii(*v) && isdigit(*v))
+					DaemonAddr.sin.sin_port = htons(atoi(v));
+				else
+				{
+					register struct servent *sp;
+
+					sp = getservbyname(v, "tcp");
+					if (sp == NULL)
+						syserr("554 service \"%s\" unknown", v);
+					else
+						DaemonAddr.sin.sin_port = sp->s_port;
+				}
+				break;
+#endif
+
+#ifdef NETISO
+			  case AF_ISO:
+				/* assume two byte transport selector */
+				if (isascii(*v) && isdigit(*v))
+					port = htons(atoi(v));
+				else
+				{
+					register struct servent *sp;
+
+					sp = getservbyname(v, "tcp");
+					if (sp == NULL)
+						syserr("554 service \"%s\" unknown", v);
+					else
+						port = sp->s_port;
+				}
+				bcopy((char *) &port, TSEL(&DaemonAddr.siso), 2);
+				break;
+#endif
+
+			  default:
+				syserr("554 Port= option unsupported for family %d",
+					DaemonAddr.sa.sa_family);
+				break;
+			}
+			break;
+
+		  case 'L':		/* listen queue size */
+			ListenQueueSize = atoi(v);
+			break;
+
+		  case 'S':		/* send buffer size */
+			TcpSndBufferSize = atoi(v);
+			break;
+
+		  case 'R':		/* receive buffer size */
+			TcpRcvBufferSize = atoi(v);
+			break;
+		}
+	}
+}
+/*
+**  MAKECONNECTION -- make a connection to an SMTP socket on another machine.
+**
+**	Parameters:
+**		host -- the name of the host.
+**		port -- the port number to connect to.
+**		mci -- a pointer to the mail connection information
+**			structure to be filled in.
+**		usesecureport -- if set, use a low numbered (reserved)
+**			port to provide some rudimentary authentication.
+**
+**	Returns:
+**		An exit code telling whether the connection could be
+**			made and if not why not.
+**
+**	Side Effects:
+**		none.
+*/
+
+SOCKADDR	CurHostAddr;		/* address of current host */
+
+int
+makeconnection(host, port, mci, usesecureport)
+	char *host;
+	u_short port;
+	register MCI *mci;
+	bool usesecureport;
+{
+	register int i, s;
+	register struct hostent *hp = (struct hostent *)NULL;
+	SOCKADDR addr;
+	int sav_errno;
+	int addrlen;
+#if NAMED_BIND
+	extern int h_errno;
+#endif
+
+	/*
+	**  Set up the address for the mailer.
+	**	Accept "[a.b.c.d]" syntax for host name.
+	*/
+
+#if NAMED_BIND
+	h_errno = 0;
+#endif
+	errno = 0;
+	bzero(&CurHostAddr, sizeof CurHostAddr);
+	SmtpPhase = mci->mci_phase = "initial connection";
+	CurHostName = host;
+
+	if (host[0] == '[')
+	{
+		register char *p = strchr(host, ']');
+
+		if (p != NULL)
+		{
+			*p = '\0';
+#ifdef NETINET
+			if (inet_aton(&host[1], &addr.sin.sin_addr) == 0)
+#endif
+			{
+				/* try it as a host name (avoid MX lookup) */
+				hp = gethostbyname(&host[1]);
+				if (hp == NULL && p[-1] == '.')
+				{
+					p[-1] = '\0';
+					hp = gethostbyname(&host[1]);
+					p[-1] = '.';
+				}
+				*p = ']';
+				goto gothostent;
+			}
+			*p = ']';
+		}
+		if (p == NULL)
+		{
+			usrerr("553 Invalid numeric domain spec \"%s\"", host);
+			return (EX_NOHOST);
+		}
+#ifdef NETINET
+		addr.sin.sin_family = AF_INET;		/*XXX*/
+#endif
+	}
+	else
+	{
+		register char *p = &host[strlen(host) - 1];
+
+		hp = gethostbyname(host);
+		if (hp == NULL && *p == '.')
+		{
+			*p = '\0';
+			hp = gethostbyname(host);
+			*p = '.';
+		}
+gothostent:
+		if (hp == NULL)
+		{
+#if NAMED_BIND
+			if (errno == ETIMEDOUT || h_errno == TRY_AGAIN)
+				return (EX_TEMPFAIL);
+
+			/* if name server is specified, assume temp fail */
+			if (errno == ECONNREFUSED && UseNameServer)
+				return (EX_TEMPFAIL);
+#endif
+			return (EX_NOHOST);
+		}
+		addr.sa.sa_family = hp->h_addrtype;
+		switch (hp->h_addrtype)
+		{
+#ifdef NETINET
+		  case AF_INET:
+			bcopy(hp->h_addr,
+				&addr.sin.sin_addr,
+				sizeof addr.sin.sin_addr);
+			break;
+#endif
+
+		  default:
+			bcopy(hp->h_addr,
+				addr.sa.sa_data,
+				hp->h_length);
+			break;
+		}
+		i = 1;
+	}
+
+	/*
+	**  Determine the port number.
+	*/
+
+	if (port != 0)
+		port = htons(port);
+	else
+	{
+		register struct servent *sp = getservbyname("smtp", "tcp");
+
+		if (sp == NULL)
+		{
+			syserr("554 makeconnection: service \"smtp\" unknown");
+			port = htons(25);
+		}
+		else
+			port = sp->s_port;
+	}
+
+	switch (addr.sa.sa_family)
+	{
+#ifdef NETINET
+	  case AF_INET:
+		addr.sin.sin_port = port;
+		addrlen = sizeof (struct sockaddr_in);
+		break;
+#endif
+
+#ifdef NETISO
+	  case AF_ISO:
+		/* assume two byte transport selector */
+		bcopy((char *) &port, TSEL((struct sockaddr_iso *) &addr), 2);
+		addrlen = sizeof (struct sockaddr_iso);
+		break;
+#endif
+
+	  default:
+		syserr("Can't connect to address family %d", addr.sa.sa_family);
+		return (EX_NOHOST);
+	}
+
+	/*
+	**  Try to actually open the connection.
+	*/
+
+#ifdef XLA
+	/* if too many connections, don't bother trying */
+	if (!xla_noqueue_ok(host))
+		return EX_TEMPFAIL;
+#endif
+
+	for (;;)
+	{
+		if (tTd(16, 1))
+			printf("makeconnection (%s [%s])\n",
+				host, anynet_ntoa(&addr));
+
+		/* save for logging */
+		CurHostAddr = addr;
+
+		if (usesecureport)
+		{
+			int rport = IPPORT_RESERVED - 1;
+
+			s = rresvport(&rport);
+		}
+		else
+		{
+			s = socket(AF_INET, SOCK_STREAM, 0);
+		}
+		if (s < 0)
+		{
+			sav_errno = errno;
+			syserr("makeconnection: no socket");
+			goto failure;
+		}
+
+#ifdef SO_SNDBUF
+		if (TcpSndBufferSize > 0)
+		{
+			if (setsockopt(s, SOL_SOCKET, SO_SNDBUF,
+				       (char *) &TcpSndBufferSize,
+				       sizeof(TcpSndBufferSize)) < 0)
+				syserr("makeconnection: setsockopt(SO_SNDBUF)");
+		}
+#endif
+
+		if (tTd(16, 1))
+			printf("makeconnection: fd=%d\n", s);
+
+		/* turn on network debugging? */
+		if (tTd(16, 101))
+		{
+			int on = 1;
+			(void) setsockopt(s, SOL_SOCKET, SO_DEBUG,
+					  (char *)&on, sizeof on);
+		}
+		if (CurEnv->e_xfp != NULL)
+			(void) fflush(CurEnv->e_xfp);		/* for debugging */
+		errno = 0;					/* for debugging */
+		if (connect(s, (struct sockaddr *) &addr, addrlen) >= 0)
+			break;
+
+		/* couldn't connect.... figure out why */
+		sav_errno = errno;
+		(void) close(s);
+		if (hp && hp->h_addr_list[i])
+		{
+			if (tTd(16, 1))
+				printf("Connect failed (%s); trying new address....\n",
+					errstring(sav_errno));
+			switch (addr.sa.sa_family)
+			{
+#ifdef NETINET
+			  case AF_INET:
+				bcopy(hp->h_addr_list[i++],
+				      &addr.sin.sin_addr,
+				      sizeof addr.sin.sin_addr);
+				break;
+#endif
+
+			  default:
+				bcopy(hp->h_addr_list[i++],
+					addr.sa.sa_data,
+					hp->h_length);
+				break;
+			}
+			continue;
+		}
+
+		/* failure, decide if temporary or not */
+	failure:
+#ifdef XLA
+		xla_host_end(host);
+#endif
+		if (transienterror(sav_errno))
+			return EX_TEMPFAIL;
+		else
+		{
+			message("%s", errstring(sav_errno));
+			return (EX_UNAVAILABLE);
+		}
+	}
+
+	/* connection ok, put it into canonical form */
+	if ((mci->mci_out = fdopen(s, "w")) == NULL ||
+	    (s = dup(s)) < 0 ||
+	    (mci->mci_in = fdopen(s, "r")) == NULL)
+	{
+		syserr("cannot open SMTP client channel, fd=%d", s);
+		return EX_TEMPFAIL;
+	}
+
+	return (EX_OK);
+}
+/*
+**  MYHOSTNAME -- return the name of this host.
+**
+**	Parameters:
+**		hostbuf -- a place to return the name of this host.
+**		size -- the size of hostbuf.
+**
+**	Returns:
+**		A list of aliases for this host.
+**
+**	Side Effects:
+**		Adds numeric codes to $=w.
+*/
+
+char **
+myhostname(hostbuf, size)
+	char hostbuf[];
+	int size;
+{
+	register struct hostent *hp;
+	extern struct hostent *gethostbyname();
+
+	if (gethostname(hostbuf, size) < 0)
+	{
+		(void) strcpy(hostbuf, "localhost");
+	}
+	hp = gethostbyname(hostbuf);
+	if (hp == NULL)
+	{
+		syserr("!My host name (%s) does not seem to exist!", hostbuf);
+	}
+	(void) strncpy(hostbuf, hp->h_name, size - 1);
+	hostbuf[size - 1] = '\0';
+
+#if NAMED_BIND
+	/* if still no dot, try DNS directly (i.e., avoid NIS problems) */
+	if (strchr(hostbuf, '.') == NULL)
+	{
+		extern bool getcanonname();
+		extern int h_errno;
+
+		/* try twice in case name server not yet started up */
+		if (!getcanonname(hostbuf, size, TRUE) &&
+		    UseNameServer &&
+		    (h_errno != TRY_AGAIN ||
+		     (sleep(30), !getcanonname(hostbuf, size, TRUE))))
+		{
+			errno = h_errno + E_DNSBASE;
+			syserr("!My host name (%s) not known to DNS",
+				hostbuf);
+		}
+	}
+#endif
+
+	if (hp->h_addrtype == AF_INET && hp->h_length == 4)
+	{
+		register int i;
+
+		for (i = 0; hp->h_addr_list[i] != NULL; i++)
+		{
+			char ipbuf[100];
+
+			sprintf(ipbuf, "[%s]",
+				inet_ntoa(*((struct in_addr *) hp->h_addr_list[i])));
+			setclass('w', ipbuf);
+		}
+	}
+
+	return (hp->h_aliases);
+}
+/*
+**  GETAUTHINFO -- get the real host name asociated with a file descriptor
+**
+**	Uses RFC1413 protocol to try to get info from the other end.
+**
+**	Parameters:
+**		fd -- the descriptor
+**
+**	Returns:
+**		The user@host information associated with this descriptor.
+*/
+
+#if IDENTPROTO
+
+static jmp_buf	CtxAuthTimeout;
+
+static
+authtimeout()
+{
+	longjmp(CtxAuthTimeout, 1);
+}
+
+#endif
+
+char *
+getauthinfo(fd)
+	int fd;
+{
+	int falen;
+	register char *p;
+#if IDENTPROTO
+	SOCKADDR la;
+	int lalen;
+	register struct servent *sp;
+	int s;
+	int i;
+	EVENT *ev;
+	int nleft;
+	char ibuf[MAXNAME + 1];
+#endif
+	static char hbuf[MAXNAME * 2 + 2];
+	extern char *hostnamebyanyaddr();
+	extern char RealUserName[];			/* main.c */
+
+	falen = sizeof RealHostAddr;
+	if (getpeername(fd, &RealHostAddr.sa, &falen) < 0 || falen <= 0 ||
+	    RealHostAddr.sa.sa_family == 0)
+	{
+		(void) sprintf(hbuf, "%s@localhost", RealUserName);
+		if (tTd(9, 1))
+			printf("getauthinfo: %s\n", hbuf);
+		return hbuf;
+	}
+
+	if (RealHostName == NULL)
+	{
+		/* translate that to a host name */
+		RealHostName = newstr(hostnamebyanyaddr(&RealHostAddr));
+	}
+
+#if IDENTPROTO
+	if (TimeOuts.to_ident == 0)
+		goto noident;
+
+	lalen = sizeof la;
+	if (RealHostAddr.sa.sa_family != AF_INET ||
+	    getsockname(fd, &la.sa, &lalen) < 0 || lalen <= 0 ||
+	    la.sa.sa_family != AF_INET)
+	{
+		/* no ident info */
+		goto noident;
+	}
+
+	/* create ident query */
+	(void) sprintf(ibuf, "%d,%d\r\n",
+		ntohs(RealHostAddr.sin.sin_port), ntohs(la.sin.sin_port));
+
+	/* create local address */
+	la.sin.sin_port = 0;
+
+	/* create foreign address */
+	sp = getservbyname("auth", "tcp");
+	if (sp != NULL)
+		RealHostAddr.sin.sin_port = sp->s_port;
+	else
+		RealHostAddr.sin.sin_port = htons(113);
+
+	s = -1;
+	if (setjmp(CtxAuthTimeout) != 0)
+	{
+		if (s >= 0)
+			(void) close(s);
+		goto noident;
+	}
+
+	/* put a timeout around the whole thing */
+	ev = setevent(TimeOuts.to_ident, authtimeout, 0);
+
+	/* connect to foreign IDENT server using same address as SMTP socket */
+	s = socket(AF_INET, SOCK_STREAM, 0);
+	if (s < 0)
+	{
+		clrevent(ev);
+		goto noident;
+	}
+	if (bind(s, &la.sa, sizeof la.sin) < 0 ||
+	    connect(s, &RealHostAddr.sa, sizeof RealHostAddr.sin) < 0)
+	{
+		goto closeident;
+	}
+
+	if (tTd(9, 10))
+		printf("getauthinfo: sent %s", ibuf);
+
+	/* send query */
+	if (write(s, ibuf, strlen(ibuf)) < 0)
+		goto closeident;
+
+	/* get result */
+	p = &ibuf[0];
+	nleft = sizeof ibuf - 1;
+	while ((i = read(s, p, nleft)) > 0)
+	{
+		p += i;
+		nleft -= i;
+	}
+	(void) close(s);
+	clrevent(ev);
+	if (i < 0 || p == &ibuf[0])
+		goto noident;
+
+	if (*--p == '\n' && *--p == '\r')
+		p--;
+	*++p = '\0';
+
+	if (tTd(9, 3))
+		printf("getauthinfo:  got %s\n", ibuf);
+
+	/* parse result */
+	p = strchr(ibuf, ':');
+	if (p == NULL)
+	{
+		/* malformed response */
+		goto noident;
+	}
+	while (isascii(*++p) && isspace(*p))
+		continue;
+	if (strncasecmp(p, "userid", 6) != 0)
+	{
+		/* presumably an error string */
+		goto noident;
+	}
+	p += 6;
+	while (isascii(*p) && isspace(*p))
+		p++;
+	if (*p++ != ':')
+	{
+		/* either useridxx or malformed response */
+		goto noident;
+	}
+
+	/* p now points to the OSTYPE field */
+	p = strchr(p, ':');
+	if (p == NULL)
+	{
+		/* malformed response */
+		goto noident;
+	}
+
+	/* 1413 says don't do this -- but it's broken otherwise */
+	while (isascii(*++p) && isspace(*p))
+		continue;
+
+	/* p now points to the authenticated name -- copy carefully */
+	cleanstrcpy(hbuf, p, MAXNAME);
+	i = strlen(hbuf);
+	hbuf[i++] = '@';
+	strcpy(&hbuf[i], RealHostName == NULL ? "localhost" : RealHostName);
+	goto finish;
+
+closeident:
+	(void) close(s);
+	clrevent(ev);
+
+#endif /* IDENTPROTO */
+
+noident:
+	if (RealHostName == NULL)
+	{
+		if (tTd(9, 1))
+			printf("getauthinfo: NULL\n");
+		return NULL;
+	}
+	(void) strcpy(hbuf, RealHostName);
+
+finish:
+	if (RealHostName != NULL && RealHostName[0] != '[')
+	{
+		p = &hbuf[strlen(hbuf)];
+		(void) sprintf(p, " [%s]", anynet_ntoa(&RealHostAddr));
+	}
+	if (tTd(9, 1))
+		printf("getauthinfo: %s\n", hbuf);
+	return hbuf;
+}
+/*
+**  HOST_MAP_LOOKUP -- turn a hostname into canonical form
+**
+**	Parameters:
+**		map -- a pointer to this map (unused).
+**		name -- the (presumably unqualified) hostname.
+**		av -- unused -- for compatibility with other mapping
+**			functions.
+**		statp -- an exit status (out parameter) -- set to
+**			EX_TEMPFAIL if the name server is unavailable.
+**
+**	Returns:
+**		The mapping, if found.
+**		NULL if no mapping found.
+**
+**	Side Effects:
+**		Looks up the host specified in hbuf.  If it is not
+**		the canonical name for that host, return the canonical
+**		name.
+*/
+
+char *
+host_map_lookup(map, name, av, statp)
+	MAP *map;
+	char *name;
+	char **av;
+	int *statp;
+{
+	register struct hostent *hp;
+	struct in_addr in_addr;
+	char *cp;
+	int i;
+	register STAB *s;
+	char hbuf[MAXNAME];
+	extern struct hostent *gethostbyaddr();
+#if NAMED_BIND
+	extern int h_errno;
+#endif
+
+	/*
+	**  See if we have already looked up this name.  If so, just
+	**  return it.
+	*/
+
+	s = stab(name, ST_NAMECANON, ST_ENTER);
+	if (bitset(NCF_VALID, s->s_namecanon.nc_flags))
+	{
+		if (tTd(9, 1))
+			printf("host_map_lookup(%s) => CACHE %s\n",
+				name, s->s_namecanon.nc_cname);
+		errno = s->s_namecanon.nc_errno;
+#if NAMED_BIND
+		h_errno = s->s_namecanon.nc_herrno;
+#endif
+		*statp = s->s_namecanon.nc_stat;
+		if (CurEnv->e_message == NULL && *statp == EX_TEMPFAIL)
+		{
+			sprintf(hbuf, "%s: Name server timeout",
+				shortenstring(name, 33));
+			CurEnv->e_message = newstr(hbuf);
+		}
+		return s->s_namecanon.nc_cname;
+	}
+
+	/*
+	**  If first character is a bracket, then it is an address
+	**  lookup.  Address is copied into a temporary buffer to
+	**  strip the brackets and to preserve name if address is
+	**  unknown.
+	*/
+
+	if (*name != '[')
+	{
+		extern bool getcanonname();
+
+		if (tTd(9, 1))
+			printf("host_map_lookup(%s) => ", name);
+		s->s_namecanon.nc_flags |= NCF_VALID;		/* will be soon */
+		(void) strcpy(hbuf, name);
+		if (getcanonname(hbuf, sizeof hbuf - 1, TRUE))
+		{
+			if (tTd(9, 1))
+				printf("%s\n", hbuf);
+			cp = map_rewrite(map, hbuf, strlen(hbuf), av);
+			s->s_namecanon.nc_cname = newstr(cp);
+			return cp;
+		}
+		else
+		{
+			register struct hostent *hp;
+
+			s->s_namecanon.nc_errno = errno;
+#if NAMED_BIND
+			s->s_namecanon.nc_herrno = h_errno;
+			if (tTd(9, 1))
+				printf("FAIL (%d)\n", h_errno);
+			switch (h_errno)
+			{
+			  case TRY_AGAIN:
+				if (UseNameServer)
+				{
+					sprintf(hbuf, "%s: Name server timeout",
+						shortenstring(name, 33));
+					message("%s", hbuf);
+					if (CurEnv->e_message == NULL)
+						CurEnv->e_message = newstr(hbuf);
+				}
+				*statp = EX_TEMPFAIL;
+				break;
+
+			  case HOST_NOT_FOUND:
+				*statp = EX_NOHOST;
+				break;
+
+			  case NO_RECOVERY:
+				*statp = EX_SOFTWARE;
+				break;
+
+			  default:
+				*statp = EX_UNAVAILABLE;
+				break;
+			}
+#else
+			if (tTd(9, 1))
+				printf("FAIL\n");
+			*statp = EX_NOHOST;
+#endif
+			s->s_namecanon.nc_stat = *statp;
+			if (*statp != EX_TEMPFAIL || UseNameServer)
+				return NULL;
+
+			/*
+			**  Try to look it up in /etc/hosts
+			*/
+
+			hp = gethostbyname(name);
+			if (hp == NULL)
+			{
+				/* no dice there either */
+				s->s_namecanon.nc_stat = *statp = EX_NOHOST;
+				return NULL;
+			}
+
+			s->s_namecanon.nc_stat = *statp = EX_OK;
+			cp = map_rewrite(map, hp->h_name, strlen(hp->h_name), av);
+			s->s_namecanon.nc_cname = newstr(cp);
+			return cp;
+		}
+	}
+	if ((cp = strchr(name, ']')) == NULL)
+		return (NULL);
+	*cp = '\0';
+	(void) inet_aton(&name[1], &in_addr);
+
+	/* nope -- ask the name server */
+	hp = gethostbyaddr((char *)&in_addr, sizeof(in_addr), AF_INET);
+	s->s_namecanon.nc_errno = errno;
+#if NAMED_BIND
+	s->s_namecanon.nc_herrno = h_errno;
+#endif
+	s->s_namecanon.nc_flags |= NCF_VALID;		/* will be soon */
+	if (hp == NULL)
+	{
+		s->s_namecanon.nc_stat = *statp = EX_NOHOST;
+		return (NULL);
+	}
+
+	/* found a match -- copy out */
+	cp = map_rewrite(map, hp->h_name, strlen(hp->h_name), av);
+	s->s_namecanon.nc_stat = *statp = EX_OK;
+	s->s_namecanon.nc_cname = newstr(cp);
+	return cp;
+}
+/*
+**  ANYNET_NTOA -- convert a network address to printable form.
+**
+**	Parameters:
+**		sap -- a pointer to a sockaddr structure.
+**
+**	Returns:
+**		A printable version of that sockaddr.
+*/
+
+char *
+anynet_ntoa(sap)
+	register SOCKADDR *sap;
+{
+	register char *bp;
+	register char *ap;
+	int l;
+	static char buf[100];
+
+	/* check for null/zero family */
+	if (sap == NULL)
+		return "NULLADDR";
+	if (sap->sa.sa_family == 0)
+		return "0";
+
+	switch (sap->sa.sa_family)
+	{
+#ifdef MAYBENEXTRELEASE		/*** UNTESTED *** UNTESTED *** UNTESTED ***/
+#ifdef NETUNIX
+	  case AF_UNIX:
+	  	if (sap->sunix.sun_path[0] != '\0')
+	  		sprintf(buf, "[UNIX: %.64s]", sap->sunix.sun_path);
+	  	else
+	  		sprintf(buf, "[UNIX: localhost]");
+		return buf;
+#endif
+#endif
+
+#ifdef NETINET
+	  case AF_INET:
+		return inet_ntoa(((struct sockaddr_in *) sap)->sin_addr);
+#endif
+
+	  default:
+	  	/* this case is only to ensure syntactic correctness */
+	  	break;
+	}
+
+	/* unknown family -- just dump bytes */
+	(void) sprintf(buf, "Family %d: ", sap->sa.sa_family);
+	bp = &buf[strlen(buf)];
+	ap = sap->sa.sa_data;
+	for (l = sizeof sap->sa.sa_data; --l >= 0; )
+	{
+		(void) sprintf(bp, "%02x:", *ap++ & 0377);
+		bp += 3;
+	}
+	*--bp = '\0';
+	return buf;
+}
+/*
+**  HOSTNAMEBYANYADDR -- return name of host based on address
+**
+**	Parameters:
+**		sap -- SOCKADDR pointer
+**
+**	Returns:
+**		text representation of host name.
+**
+**	Side Effects:
+**		none.
+*/
+
+char *
+hostnamebyanyaddr(sap)
+	register SOCKADDR *sap;
+{
+	register struct hostent *hp;
+	int saveretry;
+
+#if NAMED_BIND
+	/* shorten name server timeout to avoid higher level timeouts */
+	saveretry = _res.retry;
+	_res.retry = 3;
+#endif /* NAMED_BIND */
+
+	switch (sap->sa.sa_family)
+	{
+#ifdef NETINET
+	  case AF_INET:
+		hp = gethostbyaddr((char *) &sap->sin.sin_addr,
+			sizeof sap->sin.sin_addr,
+			AF_INET);
+		break;
+#endif
+
+#ifdef NETISO
+	  case AF_ISO:
+		hp = gethostbyaddr((char *) &sap->siso.siso_addr,
+			sizeof sap->siso.siso_addr,
+			AF_ISO);
+		break;
+#endif
+
+#ifdef MAYBENEXTRELEASE		/*** UNTESTED *** UNTESTED *** UNTESTED ***/
+	  case AF_UNIX:
+		hp = NULL;
+		break;
+#endif
+
+	  default:
+		hp = gethostbyaddr(sap->sa.sa_data,
+			   sizeof sap->sa.sa_data,
+			   sap->sa.sa_family);
+		break;
+	}
+
+#if NAMED_BIND
+	_res.retry = saveretry;
+#endif /* NAMED_BIND */
+
+	if (hp != NULL)
+		return hp->h_name;
+	else
+	{
+		/* produce a dotted quad */
+		static char buf[512];
+
+		(void) sprintf(buf, "[%s]", anynet_ntoa(sap));
+		return buf;
+	}
+}
+
+# else /* DAEMON */
+/* code for systems without sophisticated networking */
+
+/*
+**  MYHOSTNAME -- stub version for case of no daemon code.
+**
+**	Can't convert to upper case here because might be a UUCP name.
+**
+**	Mark, you can change this to be anything you want......
+*/
+
+char **
+myhostname(hostbuf, size)
+	char hostbuf[];
+	int size;
+{
+	register FILE *f;
+
+	hostbuf[0] = '\0';
+	f = fopen("/usr/include/whoami", "r");
+	if (f != NULL)
+	{
+		(void) fgets(hostbuf, size, f);
+		fixcrlf(hostbuf, TRUE);
+		(void) fclose(f);
+	}
+	return (NULL);
+}
+/*
+**  GETAUTHINFO -- get the real host name asociated with a file descriptor
+**
+**	Parameters:
+**		fd -- the descriptor
+**
+**	Returns:
+**		The host name associated with this descriptor, if it can
+**			be determined.
+**		NULL otherwise.
+**
+**	Side Effects:
+**		none
+*/
+
+char *
+getauthinfo(fd)
+	int fd;
+{
+	return NULL;
+}
+/*
+**  MAPHOSTNAME -- turn a hostname into canonical form
+**
+**	Parameters:
+**		map -- a pointer to the database map.
+**		name -- a buffer containing a hostname.
+**		avp -- a pointer to a (cf file defined) argument vector.
+**		statp -- an exit status (out parameter).
+**
+**	Returns:
+**		mapped host name
+**		FALSE otherwise.
+**
+**	Side Effects:
+**		Looks up the host specified in name.  If it is not
+**		the canonical name for that host, replace it with
+**		the canonical name.  If the name is unknown, or it
+**		is already the canonical name, leave it unchanged.
+*/
+
+/*ARGSUSED*/
+char *
+host_map_lookup(map, name, avp, statp)
+	MAP *map;
+	char *name;
+	char **avp;
+	char *statp;
+{
+	register struct hostent *hp;
+
+	hp = gethostbyname(name);
+	if (hp != NULL)
+		return hp->h_name;
+	*statp = EX_NOHOST;
+	return NULL;
+}
+
+#endif /* DAEMON */
diff --git a/usr.sbin/sendmail/src/deliver.c b/usr.sbin/sendmail/src/deliver.c
new file mode 100644
index 00000000000..99e09f60289
--- /dev/null
+++ b/usr.sbin/sendmail/src/deliver.c
@@ -0,0 +1,2437 @@
+/*
+ * Copyright (c) 1983 Eric P. Allman
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)deliver.c	8.84.1.4 (Berkeley) 3/28/95";
+#endif /* not lint */
+
+#include "sendmail.h"
+#include <netdb.h>
+#include <errno.h>
+#if NAMED_BIND
+#include <arpa/nameser.h>
+#include <resolv.h>
+
+extern int	h_errno;
+#endif
+
+extern char	SmtpError[];
+
+/*
+**  SENDALL -- actually send all the messages.
+**
+**	Parameters:
+**		e -- the envelope to send.
+**		mode -- the delivery mode to use.  If SM_DEFAULT, use
+**			the current e->e_sendmode.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		Scans the send lists and sends everything it finds.
+**		Delivers any appropriate error messages.
+**		If we are running in a non-interactive mode, takes the
+**			appropriate action.
+*/
+
+sendall(e, mode)
+	ENVELOPE *e;
+	char mode;
+{
+	register ADDRESS *q;
+	char *owner;
+	int otherowners;
+	register ENVELOPE *ee;
+	ENVELOPE *splitenv = NULL;
+	bool announcequeueup;
+
+	/*
+	**  If we have had global, fatal errors, don't bother sending
+	**  the message at all if we are in SMTP mode.  Local errors
+	**  (e.g., a single address failing) will still cause the other
+	**  addresses to be sent.
+	*/
+
+	if (bitset(EF_FATALERRS, e->e_flags) &&
+	    (OpMode == MD_SMTP || OpMode == MD_DAEMON))
+	{
+		e->e_flags |= EF_CLRQUEUE;
+		return;
+	}
+
+	/* determine actual delivery mode */
+	CurrentLA = getla();
+	if (mode == SM_DEFAULT)
+	{
+		mode = e->e_sendmode;
+		if (mode != SM_VERIFY &&
+		    shouldqueue(e->e_msgpriority, e->e_ctime))
+			mode = SM_QUEUE;
+		announcequeueup = mode == SM_QUEUE;
+	}
+	else
+		announcequeueup = FALSE;
+
+	if (tTd(13, 1))
+	{
+		printf("\n===== SENDALL: mode %c, id %s, e_from ",
+			mode, e->e_id);
+		printaddr(&e->e_from, FALSE);
+		printf("sendqueue:\n");
+		printaddr(e->e_sendqueue, TRUE);
+	}
+
+	/*
+	**  Do any preprocessing necessary for the mode we are running.
+	**	Check to make sure the hop count is reasonable.
+	**	Delete sends to the sender in mailing lists.
+	*/
+
+	CurEnv = e;
+
+	if (e->e_hopcount > MaxHopCount)
+	{
+		errno = 0;
+		queueup(e, TRUE, announcequeueup);
+		e->e_flags |= EF_FATALERRS|EF_PM_NOTIFY|EF_CLRQUEUE;
+		syserr("554 too many hops %d (%d max): from %s via %s, to %s",
+			e->e_hopcount, MaxHopCount, e->e_from.q_paddr,
+			RealHostName == NULL ? "localhost" : RealHostName,
+			e->e_sendqueue->q_paddr);
+		return;
+	}
+
+	/*
+	**  Do sender deletion.
+	**
+	**	If the sender has the QQUEUEUP flag set, skip this.
+	**	This can happen if the name server is hosed when you
+	**	are trying to send mail.  The result is that the sender
+	**	is instantiated in the queue as a recipient.
+	*/
+
+	if (!bitset(EF_METOO, e->e_flags) &&
+	    !bitset(QQUEUEUP, e->e_from.q_flags))
+	{
+		if (tTd(13, 5))
+		{
+			printf("sendall: QDONTSEND ");
+			printaddr(&e->e_from, FALSE);
+		}
+		e->e_from.q_flags |= QDONTSEND;
+		(void) recipient(&e->e_from, &e->e_sendqueue, e);
+	}
+
+	/*
+	**  Handle alias owners.
+	**
+	**	We scan up the q_alias chain looking for owners.
+	**	We discard owners that are the same as the return path.
+	*/
+
+	for (q = e->e_sendqueue; q != NULL; q = q->q_next)
+	{
+		register struct address *a;
+
+		for (a = q; a != NULL && a->q_owner == NULL; a = a->q_alias)
+			continue;
+		if (a != NULL)
+			q->q_owner = a->q_owner;
+				
+		if (q->q_owner != NULL &&
+		    !bitset(QDONTSEND, q->q_flags) &&
+		    strcmp(q->q_owner, e->e_from.q_paddr) == 0)
+			q->q_owner = NULL;
+	}
+		
+	owner = "";
+	otherowners = 1;
+	while (owner != NULL && otherowners > 0)
+	{
+		owner = NULL;
+		otherowners = 0;
+
+		for (q = e->e_sendqueue; q != NULL; q = q->q_next)
+		{
+			if (bitset(QDONTSEND, q->q_flags))
+				continue;
+
+			if (q->q_owner != NULL)
+			{
+				if (owner == NULL)
+					owner = q->q_owner;
+				else if (owner != q->q_owner)
+				{
+					if (strcmp(owner, q->q_owner) == 0)
+					{
+						/* make future comparisons cheap */
+						q->q_owner = owner;
+					}
+					else
+					{
+						otherowners++;
+					}
+					owner = q->q_owner;
+				}
+			}
+			else
+			{
+				otherowners++;
+			}
+		}
+
+		if (owner != NULL && otherowners > 0)
+		{
+			extern HDR *copyheader();
+			extern ADDRESS *copyqueue();
+
+			/*
+			**  Split this envelope into two.
+			*/
+
+			ee = (ENVELOPE *) xalloc(sizeof(ENVELOPE));
+			*ee = *e;
+			ee->e_id = NULL;
+			(void) queuename(ee, '\0');
+
+			if (tTd(13, 1))
+				printf("sendall: split %s into %s\n",
+					e->e_id, ee->e_id);
+
+			ee->e_header = copyheader(e->e_header);
+			ee->e_sendqueue = copyqueue(e->e_sendqueue);
+			ee->e_errorqueue = copyqueue(e->e_errorqueue);
+			ee->e_flags = e->e_flags & ~(EF_INQUEUE|EF_CLRQUEUE|EF_FATALERRS|EF_SENDRECEIPT);
+			ee->e_flags |= EF_NORECEIPT;
+			setsender(owner, ee, NULL, TRUE);
+			if (tTd(13, 5))
+			{
+				printf("sendall(split): QDONTSEND ");
+				printaddr(&ee->e_from, FALSE);
+			}
+			ee->e_from.q_flags |= QDONTSEND;
+			ee->e_dfp = NULL;
+			ee->e_xfp = NULL;
+			ee->e_df = NULL;
+			ee->e_errormode = EM_MAIL;
+			ee->e_sibling = splitenv;
+			splitenv = ee;
+			
+			for (q = e->e_sendqueue; q != NULL; q = q->q_next)
+				if (q->q_owner == owner)
+				{
+					q->q_flags |= QDONTSEND;
+					q->q_flags &= ~QQUEUEUP;
+				}
+			for (q = ee->e_sendqueue; q != NULL; q = q->q_next)
+				if (q->q_owner != owner)
+				{
+					q->q_flags |= QDONTSEND;
+					q->q_flags &= ~QQUEUEUP;
+				}
+
+			if (e->e_df != NULL && mode != SM_VERIFY)
+			{
+				ee->e_dfp = NULL;
+				ee->e_df = queuename(ee, 'd');
+				ee->e_df = newstr(ee->e_df);
+				if (link(e->e_df, ee->e_df) < 0)
+				{
+					syserr("sendall: link(%s, %s)",
+						e->e_df, ee->e_df);
+				}
+			}
+#ifdef LOG
+			if (LogLevel > 4)
+				syslog(LOG_INFO, "%s: clone %s, owner=%s",
+					ee->e_id, e->e_id, owner);
+#endif
+		}
+	}
+
+	if (owner != NULL)
+	{
+		setsender(owner, e, NULL, TRUE);
+		if (tTd(13, 5))
+		{
+			printf("sendall(owner): QDONTSEND ");
+			printaddr(&e->e_from, FALSE);
+		}
+		e->e_from.q_flags |= QDONTSEND;
+		e->e_errormode = EM_MAIL;
+		e->e_flags |= EF_NORECEIPT;
+	}
+
+# ifdef QUEUE
+	if ((mode == SM_QUEUE || mode == SM_FORK ||
+	     (mode != SM_VERIFY && SuperSafe)) &&
+	    !bitset(EF_INQUEUE, e->e_flags))
+	{
+		/* be sure everything is instantiated in the queue */
+		queueup(e, TRUE, announcequeueup);
+		for (ee = splitenv; ee != NULL; ee = ee->e_sibling)
+			queueup(ee, TRUE, announcequeueup);
+	}
+#endif /* QUEUE */
+
+	if (splitenv != NULL)
+	{
+		if (tTd(13, 1))
+		{
+			printf("\nsendall: Split queue; remaining queue:\n");
+			printaddr(e->e_sendqueue, TRUE);
+		}
+
+		for (ee = splitenv; ee != NULL; ee = ee->e_sibling)
+		{
+			CurEnv = ee;
+			if (mode != SM_VERIFY)
+				openxscript(ee);
+			sendenvelope(ee, mode);
+			dropenvelope(ee);
+		}
+
+		CurEnv = e;
+	}
+	sendenvelope(e, mode);
+}
+
+sendenvelope(e, mode)
+	register ENVELOPE *e;
+	char mode;
+{
+	bool oldverbose;
+	int pid;
+	register ADDRESS *q;
+	char *qf;
+	char *id;
+
+	/*
+	**  If we have had global, fatal errors, don't bother sending
+	**  the message at all if we are in SMTP mode.  Local errors
+	**  (e.g., a single address failing) will still cause the other
+	**  addresses to be sent.
+	*/
+
+	if (bitset(EF_FATALERRS, e->e_flags) &&
+	    (OpMode == MD_SMTP || OpMode == MD_DAEMON))
+	{
+		e->e_flags |= EF_CLRQUEUE;
+		return;
+	}
+
+	oldverbose = Verbose;
+	switch (mode)
+	{
+	  case SM_VERIFY:
+		Verbose = TRUE;
+		break;
+
+	  case SM_QUEUE:
+  queueonly:
+		e->e_flags |= EF_INQUEUE|EF_KEEPQUEUE;
+		return;
+
+	  case SM_FORK:
+		if (e->e_xfp != NULL)
+			(void) fflush(e->e_xfp);
+
+# if !HASFLOCK
+		/*
+		**  Since fcntl locking has the interesting semantic that
+		**  the lock is owned by a process, not by an open file
+		**  descriptor, we have to flush this to the queue, and
+		**  then restart from scratch in the child.
+		*/
+
+		/* save id for future use */
+		id = e->e_id;
+
+		/* now drop the envelope in the parent */
+		e->e_flags |= EF_INQUEUE|EF_KEEPQUEUE;
+		dropenvelope(e);
+
+		/* and reacquire in the child */
+		(void) dowork(id, TRUE, FALSE, e);
+
+		return;
+
+# else /* HASFLOCK */
+
+		pid = fork();
+		if (pid < 0)
+		{
+			goto queueonly;
+		}
+		else if (pid > 0)
+		{
+			/* be sure we leave the temp files to our child */
+			/* can't call unlockqueue to avoid unlink of xfp */
+			if (e->e_lockfp != NULL)
+				(void) xfclose(e->e_lockfp, "sendenvelope", "lockfp");
+			e->e_lockfp = NULL;
+
+			/* close any random open files in the envelope */
+			closexscript(e);
+			if (e->e_dfp != NULL)
+				(void) xfclose(e->e_dfp, "sendenvelope", e->e_df);
+			e->e_dfp = NULL;
+			e->e_id = e->e_df = NULL;
+
+			/* catch intermediate zombie */
+			(void) waitfor(pid);
+			return;
+		}
+
+		/* double fork to avoid zombies */
+		pid = fork();
+		if (pid > 0)
+			exit(EX_OK);
+
+		/* be sure we are immune from the terminal */
+		disconnect(1, e);
+
+		/* prevent parent from waiting if there was an error */
+		if (pid < 0)
+		{
+			e->e_flags |= EF_INQUEUE|EF_KEEPQUEUE;
+			finis();
+		}
+
+		/*
+		**  Close any cached connections.
+		**
+		**	We don't send the QUIT protocol because the parent
+		**	still knows about the connection.
+		**
+		**	This should only happen when delivering an error
+		**	message.
+		*/
+
+		mci_flush(FALSE, NULL);
+
+# endif /* HASFLOCK */
+
+		break;
+	}
+
+	/*
+	**  Run through the list and send everything.
+	**
+	**	Set EF_GLOBALERRS so that error messages during delivery
+	**	result in returned mail.
+	*/
+
+	e->e_nsent = 0;
+	e->e_flags |= EF_GLOBALERRS;
+
+	/* now run through the queue */
+	for (q = e->e_sendqueue; q != NULL; q = q->q_next)
+	{
+#ifdef XDEBUG
+		char wbuf[MAXNAME + 20];
+
+		(void) sprintf(wbuf, "sendall(%s)", q->q_paddr);
+		checkfd012(wbuf);
+#endif
+		if (mode == SM_VERIFY)
+		{
+			e->e_to = q->q_paddr;
+			if (!bitset(QDONTSEND|QBADADDR, q->q_flags))
+			{
+				if (q->q_host != NULL && q->q_host[0] != '\0')
+					message("deliverable: mailer %s, host %s, user %s",
+						q->q_mailer->m_name,
+						q->q_host,
+						q->q_user);
+				else
+					message("deliverable: mailer %s, user %s",
+						q->q_mailer->m_name,
+						q->q_user);
+			}
+		}
+		else if (!bitset(QDONTSEND|QBADADDR, q->q_flags))
+		{
+# ifdef QUEUE
+			/*
+			**  Checkpoint the send list every few addresses
+			*/
+
+			if (e->e_nsent >= CheckpointInterval)
+			{
+				queueup(e, TRUE, FALSE);
+				e->e_nsent = 0;
+			}
+# endif /* QUEUE */
+			(void) deliver(e, q);
+		}
+	}
+	Verbose = oldverbose;
+
+#ifdef XDEBUG
+	checkfd012("end of sendenvelope");
+#endif
+
+	if (mode == SM_FORK)
+		finis();
+}
+/*
+**  DOFORK -- do a fork, retrying a couple of times on failure.
+**
+**	This MUST be a macro, since after a vfork we are running
+**	two processes on the same stack!!!
+**
+**	Parameters:
+**		none.
+**
+**	Returns:
+**		From a macro???  You've got to be kidding!
+**
+**	Side Effects:
+**		Modifies the ==> LOCAL <== variable 'pid', leaving:
+**			pid of child in parent, zero in child.
+**			-1 on unrecoverable error.
+**
+**	Notes:
+**		I'm awfully sorry this looks so awful.  That's
+**		vfork for you.....
+*/
+
+# define NFORKTRIES	5
+
+# ifndef FORK
+# define FORK	fork
+# endif
+
+# define DOFORK(fORKfN) \
+{\
+	register int i;\
+\
+	for (i = NFORKTRIES; --i >= 0; )\
+	{\
+		pid = fORKfN();\
+		if (pid >= 0)\
+			break;\
+		if (i > 0)\
+			sleep((unsigned) NFORKTRIES - i);\
+	}\
+}
+/*
+**  DOFORK -- simple fork interface to DOFORK.
+**
+**	Parameters:
+**		none.
+**
+**	Returns:
+**		pid of child in parent.
+**		zero in child.
+**		-1 on error.
+**
+**	Side Effects:
+**		returns twice, once in parent and once in child.
+*/
+
+dofork()
+{
+	register int pid;
+
+	DOFORK(fork);
+	return (pid);
+}
+/*
+**  DELIVER -- Deliver a message to a list of addresses.
+**
+**	This routine delivers to everyone on the same host as the
+**	user on the head of the list.  It is clever about mailers
+**	that don't handle multiple users.  It is NOT guaranteed
+**	that it will deliver to all these addresses however -- so
+**	deliver should be called once for each address on the
+**	list.
+**
+**	Parameters:
+**		e -- the envelope to deliver.
+**		firstto -- head of the address list to deliver to.
+**
+**	Returns:
+**		zero -- successfully delivered.
+**		else -- some failure, see ExitStat for more info.
+**
+**	Side Effects:
+**		The standard input is passed off to someone.
+*/
+
+deliver(e, firstto)
+	register ENVELOPE *e;
+	ADDRESS *firstto;
+{
+	char *host;			/* host being sent to */
+	char *user;			/* user being sent to */
+	char **pvp;
+	register char **mvp;
+	register char *p;
+	register MAILER *m;		/* mailer for this recipient */
+	ADDRESS *ctladdr;
+	register MCI *mci;
+	register ADDRESS *to = firstto;
+	bool clever = FALSE;		/* running user smtp to this mailer */
+	ADDRESS *tochain = NULL;	/* chain of users in this mailer call */
+	int rcode;			/* response code */
+	char *firstsig;			/* signature of firstto */
+	int pid;
+	char *curhost;
+	int mpvect[2];
+	int rpvect[2];
+	char *pv[MAXPV+1];
+	char tobuf[TOBUFSIZE];		/* text line of to people */
+	char buf[MAXNAME];
+	char rpathbuf[MAXNAME];		/* translated return path */
+	extern int checkcompat();
+
+	errno = 0;
+	if (bitset(QDONTSEND|QBADADDR|QQUEUEUP, to->q_flags))
+		return (0);
+
+#if NAMED_BIND
+	/* unless interactive, try twice, over a minute */
+	if (OpMode == MD_DAEMON || OpMode == MD_SMTP)
+	{
+		_res.retrans = 30;
+		_res.retry = 2;
+	}
+#endif 
+
+	m = to->q_mailer;
+	host = to->q_host;
+	CurEnv = e;			/* just in case */
+	e->e_statmsg = NULL;
+	SmtpError[0] = '\0';
+
+	if (tTd(10, 1))
+		printf("\n--deliver, id=%s, mailer=%s, host=`%s', first user=`%s'\n",
+			e->e_id, m->m_name, host, to->q_user);
+	if (tTd(10, 100))
+		printopenfds(FALSE);
+
+	/*
+	**  If this mailer is expensive, and if we don't want to make
+	**  connections now, just mark these addresses and return.
+	**	This is useful if we want to batch connections to
+	**	reduce load.  This will cause the messages to be
+	**	queued up, and a daemon will come along to send the
+	**	messages later.
+	**		This should be on a per-mailer basis.
+	*/
+
+	if (NoConnect && bitnset(M_EXPENSIVE, m->m_flags) && !Verbose)
+	{
+		for (; to != NULL; to = to->q_next)
+		{
+			if (bitset(QDONTSEND|QBADADDR|QQUEUEUP, to->q_flags) ||
+			    to->q_mailer != m)
+				continue;
+			to->q_flags |= QQUEUEUP;
+			e->e_to = to->q_paddr;
+			message("queued");
+			if (LogLevel > 8)
+				logdelivery(m, NULL, "queued", NULL, e);
+		}
+		e->e_to = NULL;
+		return (0);
+	}
+
+	/*
+	**  Do initial argv setup.
+	**	Insert the mailer name.  Notice that $x expansion is
+	**	NOT done on the mailer name.  Then, if the mailer has
+	**	a picky -f flag, we insert it as appropriate.  This
+	**	code does not check for 'pv' overflow; this places a
+	**	manifest lower limit of 4 for MAXPV.
+	**		The from address rewrite is expected to make
+	**		the address relative to the other end.
+	*/
+
+	/* rewrite from address, using rewriting rules */
+	rcode = EX_OK;
+	(void) strcpy(rpathbuf, remotename(e->e_from.q_paddr, m,
+					   RF_SENDERADDR|RF_CANONICAL,
+					   &rcode, e));
+	define('g', rpathbuf, e);		/* translated return path */
+	define('h', host, e);			/* to host */
+	Errors = 0;
+	pvp = pv;
+	*pvp++ = m->m_argv[0];
+
+	/* insert -f or -r flag as appropriate */
+	if (FromFlag && (bitnset(M_FOPT, m->m_flags) || bitnset(M_ROPT, m->m_flags)))
+	{
+		if (bitnset(M_FOPT, m->m_flags))
+			*pvp++ = "-f";
+		else
+			*pvp++ = "-r";
+		*pvp++ = newstr(rpathbuf);
+	}
+
+	/*
+	**  Append the other fixed parts of the argv.  These run
+	**  up to the first entry containing "$u".  There can only
+	**  be one of these, and there are only a few more slots
+	**  in the pv after it.
+	*/
+
+	for (mvp = m->m_argv; (p = *++mvp) != NULL; )
+	{
+		/* can't use strchr here because of sign extension problems */
+		while (*p != '\0')
+		{
+			if ((*p++ & 0377) == MACROEXPAND)
+			{
+				if (*p == 'u')
+					break;
+			}
+		}
+
+		if (*p != '\0')
+			break;
+
+		/* this entry is safe -- go ahead and process it */
+		expand(*mvp, buf, &buf[sizeof buf - 1], e);
+		*pvp++ = newstr(buf);
+		if (pvp >= &pv[MAXPV - 3])
+		{
+			syserr("554 Too many parameters to %s before $u", pv[0]);
+			return (-1);
+		}
+	}
+
+	/*
+	**  If we have no substitution for the user name in the argument
+	**  list, we know that we must supply the names otherwise -- and
+	**  SMTP is the answer!!
+	*/
+
+	if (*mvp == NULL)
+	{
+		/* running SMTP */
+# ifdef SMTP
+		clever = TRUE;
+		*pvp = NULL;
+# else /* SMTP */
+		/* oops!  we don't implement SMTP */
+		syserr("554 SMTP style mailer not implemented");
+		return (EX_SOFTWARE);
+# endif /* SMTP */
+	}
+
+	/*
+	**  At this point *mvp points to the argument with $u.  We
+	**  run through our address list and append all the addresses
+	**  we can.  If we run out of space, do not fret!  We can
+	**  always send another copy later.
+	*/
+
+	tobuf[0] = '\0';
+	e->e_to = tobuf;
+	ctladdr = NULL;
+	firstsig = hostsignature(firstto->q_mailer, firstto->q_host, e);
+	for (; to != NULL; to = to->q_next)
+	{
+		/* avoid sending multiple recipients to dumb mailers */
+		if (tobuf[0] != '\0' && !bitnset(M_MUSER, m->m_flags))
+			break;
+
+		/* if already sent or not for this host, don't send */
+		if (bitset(QDONTSEND|QBADADDR|QQUEUEUP, to->q_flags) ||
+		    to->q_mailer != firstto->q_mailer ||
+		    strcmp(hostsignature(to->q_mailer, to->q_host, e), firstsig) != 0)
+			continue;
+
+		/* avoid overflowing tobuf */
+		if (sizeof tobuf < (strlen(to->q_paddr) + strlen(tobuf) + 2))
+			break;
+
+		if (tTd(10, 1))
+		{
+			printf("\nsend to ");
+			printaddr(to, FALSE);
+		}
+
+		/* compute effective uid/gid when sending */
+		/* XXX perhaps this should be to->q_mailer != LocalMailer ?? */
+		/* XXX perhaps it should be a mailer flag? */
+		if (to->q_mailer == ProgMailer || to->q_mailer == FileMailer)
+			ctladdr = getctladdr(to);
+
+		user = to->q_user;
+		e->e_to = to->q_paddr;
+		if (tTd(10, 5))
+		{
+			printf("deliver: QDONTSEND ");
+			printaddr(to, FALSE);
+		}
+		to->q_flags |= QDONTSEND;
+
+		/*
+		**  Check to see that these people are allowed to
+		**  talk to each other.
+		*/
+
+		if (m->m_maxsize != 0 && e->e_msgsize > m->m_maxsize)
+		{
+			NoReturn = TRUE;
+			usrerr("552 Message is too large; %ld bytes max", m->m_maxsize);
+			giveresponse(EX_UNAVAILABLE, m, NULL, ctladdr, e);
+			continue;
+		}
+		rcode = checkcompat(to, e);
+		if (rcode != EX_OK)
+		{
+			markfailure(e, to, rcode);
+			giveresponse(rcode, m, NULL, ctladdr, e);
+			continue;
+		}
+
+		/*
+		**  Strip quote bits from names if the mailer is dumb
+		**	about them.
+		*/
+
+		if (bitnset(M_STRIPQ, m->m_flags))
+		{
+			stripquotes(user);
+			stripquotes(host);
+		}
+
+		/* hack attack -- delivermail compatibility */
+		if (m == ProgMailer && *user == '|')
+			user++;
+
+		/*
+		**  If an error message has already been given, don't
+		**	bother to send to this address.
+		**
+		**	>>>>>>>>>> This clause assumes that the local mailer
+		**	>> NOTE >> cannot do any further aliasing; that
+		**	>>>>>>>>>> function is subsumed by sendmail.
+		*/
+
+		if (bitset(QBADADDR|QQUEUEUP, to->q_flags))
+			continue;
+
+		/* save statistics.... */
+		markstats(e, to);
+
+		/*
+		**  See if this user name is "special".
+		**	If the user name has a slash in it, assume that this
+		**	is a file -- send it off without further ado.  Note
+		**	that this type of addresses is not processed along
+		**	with the others, so we fudge on the To person.
+		*/
+
+		if (m == FileMailer)
+		{
+			rcode = mailfile(user, ctladdr, e);
+			giveresponse(rcode, m, NULL, ctladdr, e);
+			if (rcode == EX_OK)
+				to->q_flags |= QSENT;
+			continue;
+		}
+
+		/*
+		**  Address is verified -- add this user to mailer
+		**  argv, and add it to the print list of recipients.
+		*/
+
+		/* link together the chain of recipients */
+		to->q_tchain = tochain;
+		tochain = to;
+
+		/* create list of users for error messages */
+		(void) strcat(tobuf, ",");
+		(void) strcat(tobuf, to->q_paddr);
+		define('u', user, e);		/* to user */
+		p = to->q_home;
+		if (p == NULL && ctladdr != NULL)
+			p = ctladdr->q_home;
+		define('z', p, e);	/* user's home */
+
+		/*
+		**  Expand out this user into argument list.
+		*/
+
+		if (!clever)
+		{
+			expand(*mvp, buf, &buf[sizeof buf - 1], e);
+			*pvp++ = newstr(buf);
+			if (pvp >= &pv[MAXPV - 2])
+			{
+				/* allow some space for trailing parms */
+				break;
+			}
+		}
+	}
+
+	/* see if any addresses still exist */
+	if (tobuf[0] == '\0')
+	{
+		define('g', (char *) NULL, e);
+		return (0);
+	}
+
+	/* print out messages as full list */
+	e->e_to = tobuf + 1;
+
+	/*
+	**  Fill out any parameters after the $u parameter.
+	*/
+
+	while (!clever && *++mvp != NULL)
+	{
+		expand(*mvp, buf, &buf[sizeof buf - 1], e);
+		*pvp++ = newstr(buf);
+		if (pvp >= &pv[MAXPV])
+			syserr("554 deliver: pv overflow after $u for %s", pv[0]);
+	}
+	*pvp++ = NULL;
+
+	/*
+	**  Call the mailer.
+	**	The argument vector gets built, pipes
+	**	are created as necessary, and we fork & exec as
+	**	appropriate.
+	**	If we are running SMTP, we just need to clean up.
+	*/
+
+	/*XXX this seems a bit wierd */
+	if (ctladdr == NULL && m != ProgMailer &&
+	    bitset(QGOODUID, e->e_from.q_flags))
+		ctladdr = &e->e_from;
+
+#if NAMED_BIND
+	if (ConfigLevel < 2)
+		_res.options &= ~(RES_DEFNAMES | RES_DNSRCH);	/* XXX */
+#endif
+
+	if (tTd(11, 1))
+	{
+		printf("openmailer:");
+		printav(pv);
+	}
+	errno = 0;
+
+	CurHostName = m->m_mailer;
+
+	/*
+	**  Deal with the special case of mail handled through an IPC
+	**  connection.
+	**	In this case we don't actually fork.  We must be
+	**	running SMTP for this to work.  We will return a
+	**	zero pid to indicate that we are running IPC.
+	**  We also handle a debug version that just talks to stdin/out.
+	*/
+
+	curhost = NULL;
+	SmtpPhase = NULL;
+	mci = NULL;
+
+#ifdef XDEBUG
+	{
+		char wbuf[MAXLINE];
+
+		/* make absolutely certain 0, 1, and 2 are in use */
+		sprintf(wbuf, "%s... openmailer(%s)", e->e_to, m->m_name);
+		checkfd012(wbuf);
+	}
+#endif
+
+	/* check for Local Person Communication -- not for mortals!!! */
+	if (strcmp(m->m_mailer, "[LPC]") == 0)
+	{
+		mci = (MCI *) xalloc(sizeof *mci);
+		bzero((char *) mci, sizeof *mci);
+		mci->mci_in = stdin;
+		mci->mci_out = stdout;
+		mci->mci_state = clever ? MCIS_OPENING : MCIS_OPEN;
+		mci->mci_mailer = m;
+	}
+	else if (strcmp(m->m_mailer, "[IPC]") == 0 ||
+		 strcmp(m->m_mailer, "[TCP]") == 0)
+	{
+#ifdef DAEMON
+		register int i;
+		register u_short port;
+
+		if (pv[0] == NULL || pv[1] == NULL || pv[1][0] == '\0')
+		{
+			syserr("null host name for %s mailer", m->m_mailer);
+			rcode = EX_CONFIG;
+			goto give_up;
+		}
+
+		CurHostName = pv[1];
+		curhost = hostsignature(m, pv[1], e);
+
+		if (curhost == NULL || curhost[0] == '\0')
+		{
+			syserr("null host signature for %s", pv[1]);
+			rcode = EX_CONFIG;
+			goto give_up;
+		}
+
+		if (!clever)
+		{
+			syserr("554 non-clever IPC");
+			rcode = EX_CONFIG;
+			goto give_up;
+		}
+		if (pv[2] != NULL)
+			port = atoi(pv[2]);
+		else
+			port = 0;
+tryhost:
+		while (*curhost != '\0')
+		{
+			register char *p;
+			static char hostbuf[MAXNAME];
+
+			/* pull the next host from the signature */
+			p = strchr(curhost, ':');
+			if (p == NULL)
+				p = &curhost[strlen(curhost)];
+			if (p == curhost)
+			{
+				syserr("deliver: null host name in signature");
+				curhost++;
+				continue;
+			}
+			strncpy(hostbuf, curhost, p - curhost);
+			hostbuf[p - curhost] = '\0';
+			if (*p != '\0')
+				p++;
+			curhost = p;
+
+			/* see if we already know that this host is fried */
+			CurHostName = hostbuf;
+			mci = mci_get(hostbuf, m);
+			if (mci->mci_state != MCIS_CLOSED)
+			{
+				if (tTd(11, 1))
+				{
+					printf("openmailer: ");
+					mci_dump(mci, FALSE);
+				}
+				CurHostName = mci->mci_host;
+				break;
+			}
+			mci->mci_mailer = m;
+			if (mci->mci_exitstat != EX_OK)
+				continue;
+
+			/* try the connection */
+			setproctitle("%s %s: %s", e->e_id, hostbuf, "user open");
+			message("Connecting to %s (%s)...",
+				hostbuf, m->m_name);
+			i = makeconnection(hostbuf, port, mci,
+				bitnset(M_SECURE_PORT, m->m_flags));
+			mci->mci_exitstat = i;
+			mci->mci_errno = errno;
+#if NAMED_BIND
+			mci->mci_herrno = h_errno;
+#endif
+			if (i == EX_OK)
+			{
+				mci->mci_state = MCIS_OPENING;
+				mci_cache(mci);
+				if (TrafficLogFile != NULL)
+					fprintf(TrafficLogFile, "%05d == CONNECT %s\n",
+						getpid(), hostbuf);
+				break;
+			}
+			else if (tTd(11, 1))
+				printf("openmailer: makeconnection => stat=%d, errno=%d\n",
+					i, errno);
+
+			/* enter status of this host */
+			setstat(i);
+
+			/* should print some message here for -v mode */
+		}
+		if (mci == NULL)
+		{
+			syserr("deliver: no host name");
+			rcode = EX_OSERR;
+			goto give_up;
+		}
+		mci->mci_pid = 0;
+#else /* no DAEMON */
+		syserr("554 openmailer: no IPC");
+		if (tTd(11, 1))
+			printf("openmailer: NULL\n");
+		rcode = EX_UNAVAILABLE;
+		goto give_up;
+#endif /* DAEMON */
+	}
+	else
+	{
+		if (TrafficLogFile != NULL)
+		{
+			char **av;
+
+			fprintf(TrafficLogFile, "%05d === EXEC", getpid());
+			for (av = pv; *av != NULL; av++)
+				fprintf(TrafficLogFile, " %s", *av);
+			fprintf(TrafficLogFile, "\n");
+		}
+
+		/* create a pipe to shove the mail through */
+		if (pipe(mpvect) < 0)
+		{
+			syserr("%s... openmailer(%s): pipe (to mailer)",
+				e->e_to, m->m_name);
+			if (tTd(11, 1))
+				printf("openmailer: NULL\n");
+			rcode = EX_OSERR;
+			goto give_up;
+		}
+
+		/* if this mailer speaks smtp, create a return pipe */
+		if (clever && pipe(rpvect) < 0)
+		{
+			syserr("%s... openmailer(%s): pipe (from mailer)",
+				e->e_to, m->m_name);
+			(void) close(mpvect[0]);
+			(void) close(mpvect[1]);
+			if (tTd(11, 1))
+				printf("openmailer: NULL\n");
+			rcode = EX_OSERR;
+			goto give_up;
+		}
+
+		/*
+		**  Actually fork the mailer process.
+		**	DOFORK is clever about retrying.
+		**
+		**	Dispose of SIGCHLD signal catchers that may be laying
+		**	around so that endmail will get it.
+		*/
+
+		if (e->e_xfp != NULL)
+			(void) fflush(e->e_xfp);		/* for debugging */
+		(void) fflush(stdout);
+# ifdef SIGCHLD
+		(void) setsignal(SIGCHLD, SIG_DFL);
+# endif /* SIGCHLD */
+		DOFORK(FORK);
+		/* pid is set by DOFORK */
+		if (pid < 0)
+		{
+			/* failure */
+			syserr("%s... openmailer(%s): cannot fork",
+				e->e_to, m->m_name);
+			(void) close(mpvect[0]);
+			(void) close(mpvect[1]);
+			if (clever)
+			{
+				(void) close(rpvect[0]);
+				(void) close(rpvect[1]);
+			}
+			if (tTd(11, 1))
+				printf("openmailer: NULL\n");
+			rcode = EX_OSERR;
+			goto give_up;
+		}
+		else if (pid == 0)
+		{
+			int i;
+			int saveerrno;
+			char **ep;
+			char *env[MAXUSERENVIRON];
+			extern char **environ;
+			extern int DtableSize;
+
+			if (e->e_lockfp != NULL)
+				(void) close(fileno(e->e_lockfp));
+
+			/* child -- set up input & exec mailer */
+			(void) setsignal(SIGINT, SIG_IGN);
+			(void) setsignal(SIGHUP, SIG_IGN);
+			(void) setsignal(SIGTERM, SIG_DFL);
+
+			/* reset user and group */
+			if (!bitnset(M_RESTR, m->m_flags))
+			{
+				if (ctladdr == NULL || ctladdr->q_uid == 0)
+				{
+					(void) initgroups(DefUser, DefGid);
+					(void) setgid(DefGid);
+					(void) setuid(DefUid);
+				}
+				else
+				{
+					(void) initgroups(ctladdr->q_ruser?
+						ctladdr->q_ruser: ctladdr->q_user,
+						ctladdr->q_gid);
+					(void) setgid(ctladdr->q_gid);
+					(void) setuid(ctladdr->q_uid);
+				}
+			}
+
+			if (tTd(11, 2))
+				printf("openmailer: running as r/euid=%d/%d\n",
+					getuid(), geteuid());
+
+			/* move into some "safe" directory */
+			if (m->m_execdir != NULL)
+			{
+				char *p, *q;
+				char buf[MAXLINE];
+
+				for (p = m->m_execdir; p != NULL; p = q)
+				{
+					q = strchr(p, ':');
+					if (q != NULL)
+						*q = '\0';
+					expand(p, buf, &buf[sizeof buf] - 1, e);
+					if (q != NULL)
+						*q++ = ':';
+					if (tTd(11, 20))
+						printf("openmailer: trydir %s\n",
+							buf);
+					if (buf[0] != '\0' && chdir(buf) >= 0)
+						break;
+				}
+			}
+
+			/* arrange to filter std & diag output of command */
+			if (clever)
+			{
+				(void) close(rpvect[0]);
+				if (dup2(rpvect[1], STDOUT_FILENO) < 0)
+				{
+					syserr("%s... openmailer(%s): cannot dup pipe %d for stdout",
+						e->e_to, m->m_name, rpvect[1]);
+					_exit(EX_OSERR);
+				}
+				(void) close(rpvect[1]);
+			}
+			else if (OpMode == MD_SMTP || OpMode == MD_DAEMON ||
+				  HoldErrs || DisConnected)
+			{
+				/* put mailer output in transcript */
+				if (dup2(fileno(e->e_xfp), STDOUT_FILENO) < 0)
+				{
+					syserr("%s... openmailer(%s): cannot dup xscript %d for stdout",
+						e->e_to, m->m_name,
+						fileno(e->e_xfp));
+					_exit(EX_OSERR);
+				}
+			}
+			if (dup2(STDOUT_FILENO, STDERR_FILENO) < 0)
+			{
+				syserr("%s... openmailer(%s): cannot dup stdout for stderr",
+					e->e_to, m->m_name);
+				_exit(EX_OSERR);
+			}
+
+			/* arrange to get standard input */
+			(void) close(mpvect[1]);
+			if (dup2(mpvect[0], STDIN_FILENO) < 0)
+			{
+				syserr("%s... openmailer(%s): cannot dup pipe %d for stdin",
+					e->e_to, m->m_name, mpvect[0]);
+				_exit(EX_OSERR);
+			}
+			(void) close(mpvect[0]);
+
+			/* arrange for all the files to be closed */
+			for (i = 3; i < DtableSize; i++)
+			{
+				register int j;
+
+				if ((j = fcntl(i, F_GETFD, 0)) != -1)
+					(void) fcntl(i, F_SETFD, j | 1);
+			}
+
+			/*
+			**  Set up the mailer environment
+			**	TZ is timezone information.
+			**	SYSTYPE is Apollo software sys type (required).
+			**	ISP is Apollo hardware system type (required).
+			*/
+
+			i = 0;
+			env[i++] = "AGENT=sendmail";
+			for (ep = environ; *ep != NULL; ep++)
+			{
+				if (strncmp(*ep, "TZ=", 3) == 0 ||
+				    strncmp(*ep, "ISP=", 4) == 0 ||
+				    strncmp(*ep, "SYSTYPE=", 8) == 0)
+					env[i++] = *ep;
+			}
+			env[i++] = NULL;
+
+			/* run disconnected from terminal */
+			(void) setsid();
+
+			/* try to execute the mailer */
+			execve(m->m_mailer, pv, env);
+			saveerrno = errno;
+			syserr("Cannot exec %s", m->m_mailer);
+			if (m == LocalMailer || transienterror(saveerrno))
+				_exit(EX_OSERR);
+			_exit(EX_UNAVAILABLE);
+		}
+
+		/*
+		**  Set up return value.
+		*/
+
+		mci = (MCI *) xalloc(sizeof *mci);
+		bzero((char *) mci, sizeof *mci);
+		mci->mci_mailer = m;
+		mci->mci_state = clever ? MCIS_OPENING : MCIS_OPEN;
+		mci->mci_pid = pid;
+		(void) close(mpvect[0]);
+		mci->mci_out = fdopen(mpvect[1], "w");
+		if (mci->mci_out == NULL)
+		{
+			syserr("deliver: cannot create mailer output channel, fd=%d",
+				mpvect[1]);
+			(void) close(mpvect[1]);
+			if (clever)
+			{
+				(void) close(rpvect[0]);
+				(void) close(rpvect[1]);
+			}
+			rcode = EX_OSERR;
+			goto give_up;
+		}
+		if (clever)
+		{
+			(void) close(rpvect[1]);
+			mci->mci_in = fdopen(rpvect[0], "r");
+			if (mci->mci_in == NULL)
+			{
+				syserr("deliver: cannot create mailer input channel, fd=%d",
+					mpvect[1]);
+				(void) close(rpvect[0]);
+				fclose(mci->mci_out);
+				mci->mci_out = NULL;
+				rcode = EX_OSERR;
+				goto give_up;
+			}
+		}
+		else
+		{
+			mci->mci_flags |= MCIF_TEMP;
+			mci->mci_in = NULL;
+		}
+	}
+
+	/*
+	**  If we are in SMTP opening state, send initial protocol.
+	*/
+
+	if (clever && mci->mci_state != MCIS_CLOSED)
+	{
+		smtpinit(m, mci, e);
+	}
+	if (tTd(11, 1))
+	{
+		printf("openmailer: ");
+		mci_dump(mci, FALSE);
+	}
+
+	if (mci->mci_state != MCIS_OPEN)
+	{
+		/* couldn't open the mailer */
+		rcode = mci->mci_exitstat;
+		errno = mci->mci_errno;
+#if NAMED_BIND
+		h_errno = mci->mci_herrno;
+#endif
+		if (rcode == EX_OK)
+		{
+			/* shouldn't happen */
+			syserr("554 deliver: rcode=%d, mci_state=%d, sig=%s",
+				rcode, mci->mci_state, firstsig);
+			rcode = EX_SOFTWARE;
+		}
+		else if (rcode == EX_TEMPFAIL && curhost != NULL && *curhost != '\0')
+		{
+			/* try next MX site */
+			goto tryhost;
+		}
+	}
+	else if (!clever)
+	{
+		/*
+		**  Format and send message.
+		*/
+
+		putfromline(mci, e);
+		(*e->e_puthdr)(mci, e);
+		putline("\n", mci);
+		(*e->e_putbody)(mci, e, NULL);
+
+		/* get the exit status */
+		rcode = endmailer(mci, e, pv);
+	}
+	else
+#ifdef SMTP
+	{
+		/*
+		**  Send the MAIL FROM: protocol
+		*/
+
+		rcode = smtpmailfrom(m, mci, e);
+		if (rcode == EX_OK)
+		{
+			register char *t = tobuf;
+			register int i;
+
+			/* send the recipient list */
+			tobuf[0] = '\0';
+			for (to = tochain; to != NULL; to = to->q_tchain)
+			{
+				e->e_to = to->q_paddr;
+				if ((i = smtprcpt(to, m, mci, e)) != EX_OK)
+				{
+					markfailure(e, to, i);
+					giveresponse(i, m, mci, ctladdr, e);
+				}
+				else
+				{
+					*t++ = ',';
+					for (p = to->q_paddr; *p; *t++ = *p++)
+						continue;
+					*t = '\0';
+				}
+			}
+
+			/* now send the data */
+			if (tobuf[0] == '\0')
+			{
+				rcode = EX_OK;
+				e->e_to = NULL;
+				if (bitset(MCIF_CACHED, mci->mci_flags))
+					smtprset(m, mci, e);
+			}
+			else
+			{
+				e->e_to = tobuf + 1;
+				rcode = smtpdata(m, mci, e);
+			}
+
+			/* now close the connection */
+			if (!bitset(MCIF_CACHED, mci->mci_flags))
+				smtpquit(m, mci, e);
+		}
+		if (rcode != EX_OK && curhost != NULL && *curhost != '\0')
+		{
+			/* try next MX site */
+			goto tryhost;
+		}
+	}
+#else /* not SMTP */
+	{
+		syserr("554 deliver: need SMTP compiled to use clever mailer");
+		rcode = EX_CONFIG;
+		goto give_up;
+	}
+#endif /* SMTP */
+#if NAMED_BIND
+	if (ConfigLevel < 2)
+		_res.options |= RES_DEFNAMES | RES_DNSRCH;	/* XXX */
+#endif
+
+	/* arrange a return receipt if requested */
+	if (rcode == EX_OK && e->e_receiptto != NULL &&
+	    bitnset(M_LOCALMAILER, m->m_flags))
+	{
+		e->e_flags |= EF_SENDRECEIPT;
+		/* do we want to send back more info? */
+	}
+
+	/*
+	**  Do final status disposal.
+	**	We check for something in tobuf for the SMTP case.
+	**	If we got a temporary failure, arrange to queue the
+	**		addressees.
+	*/
+
+  give_up:
+	if (tobuf[0] != '\0')
+		giveresponse(rcode, m, mci, ctladdr, e);
+	for (to = tochain; to != NULL; to = to->q_tchain)
+	{
+		if (rcode != EX_OK)
+			markfailure(e, to, rcode);
+		else
+		{
+			to->q_flags |= QSENT;
+			e->e_nsent++;
+			if (e->e_receiptto != NULL &&
+			    bitnset(M_LOCALMAILER, m->m_flags))
+			{
+				fprintf(e->e_xfp, "%s... Successfully delivered\n",
+					to->q_paddr);
+			}
+		}
+	}
+
+	/*
+	**  Restore state and return.
+	*/
+
+#ifdef XDEBUG
+	{
+		char wbuf[MAXLINE];
+
+		/* make absolutely certain 0, 1, and 2 are in use */
+		sprintf(wbuf, "%s... end of deliver(%s)",
+			e->e_to == NULL ? "NO-TO-LIST" : e->e_to,
+			m->m_name);
+		checkfd012(wbuf);
+	}
+#endif
+
+	errno = 0;
+	define('g', (char *) NULL, e);
+	return (rcode);
+}
+/*
+**  MARKFAILURE -- mark a failure on a specific address.
+**
+**	Parameters:
+**		e -- the envelope we are sending.
+**		q -- the address to mark.
+**		rcode -- the code signifying the particular failure.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		marks the address (and possibly the envelope) with the
+**			failure so that an error will be returned or
+**			the message will be queued, as appropriate.
+*/
+
+markfailure(e, q, rcode)
+	register ENVELOPE *e;
+	register ADDRESS *q;
+	int rcode;
+{
+	char buf[MAXLINE];
+
+	switch (rcode)
+	{
+	  case EX_OK:
+		break;
+
+	  case EX_TEMPFAIL:
+	  case EX_IOERR:
+	  case EX_OSERR:
+		q->q_flags |= QQUEUEUP;
+		break;
+
+	  default:
+		q->q_flags |= QBADADDR;
+		break;
+	}
+}
+/*
+**  ENDMAILER -- Wait for mailer to terminate.
+**
+**	We should never get fatal errors (e.g., segmentation
+**	violation), so we report those specially.  For other
+**	errors, we choose a status message (into statmsg),
+**	and if it represents an error, we print it.
+**
+**	Parameters:
+**		pid -- pid of mailer.
+**		e -- the current envelope.
+**		pv -- the parameter vector that invoked the mailer
+**			(for error messages).
+**
+**	Returns:
+**		exit code of mailer.
+**
+**	Side Effects:
+**		none.
+*/
+
+endmailer(mci, e, pv)
+	register MCI *mci;
+	register ENVELOPE *e;
+	char **pv;
+{
+	int st;
+
+	/* close any connections */
+	if (mci->mci_in != NULL)
+		(void) xfclose(mci->mci_in, mci->mci_mailer->m_name, "mci_in");
+	if (mci->mci_out != NULL)
+		(void) xfclose(mci->mci_out, mci->mci_mailer->m_name, "mci_out");
+	mci->mci_in = mci->mci_out = NULL;
+	mci->mci_state = MCIS_CLOSED;
+
+	/* in the IPC case there is nothing to wait for */
+	if (mci->mci_pid == 0)
+		return (EX_OK);
+
+	/* wait for the mailer process to die and collect status */
+	st = waitfor(mci->mci_pid);
+	if (st == -1)
+	{
+		syserr("endmailer %s: wait", pv[0]);
+		return (EX_SOFTWARE);
+	}
+
+	if (WIFEXITED(st))
+	{
+		/* normal death -- return status */
+		return (WEXITSTATUS(st));
+	}
+
+	/* it died a horrid death */
+	syserr("451 mailer %s died with signal %o",
+		mci->mci_mailer->m_name, st);
+
+	/* log the arguments */
+	if (pv != NULL && e->e_xfp != NULL)
+	{
+		register char **av;
+
+		fprintf(e->e_xfp, "Arguments:");
+		for (av = pv; *av != NULL; av++)
+			fprintf(e->e_xfp, " %s", *av);
+		fprintf(e->e_xfp, "\n");
+	}
+
+	ExitStat = EX_TEMPFAIL;
+	return (EX_TEMPFAIL);
+}
+/*
+**  GIVERESPONSE -- Interpret an error response from a mailer
+**
+**	Parameters:
+**		stat -- the status code from the mailer (high byte
+**			only; core dumps must have been taken care of
+**			already).
+**		m -- the mailer info for this mailer.
+**		mci -- the mailer connection info -- can be NULL if the
+**			response is given before the connection is made.
+**		ctladdr -- the controlling address for the recipient
+**			address(es).
+**		e -- the current envelope.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		Errors may be incremented.
+**		ExitStat may be set.
+*/
+
+giveresponse(stat, m, mci, ctladdr, e)
+	int stat;
+	register MAILER *m;
+	register MCI *mci;
+	ADDRESS *ctladdr;
+	ENVELOPE *e;
+{
+	register const char *statmsg;
+	extern char *SysExMsg[];
+	register int i;
+	extern int N_SysEx;
+	char buf[MAXLINE];
+
+	/*
+	**  Compute status message from code.
+	*/
+
+	i = stat - EX__BASE;
+	if (stat == 0)
+	{
+		statmsg = "250 Sent";
+		if (e->e_statmsg != NULL)
+		{
+			(void) sprintf(buf, "%s (%s)", statmsg, e->e_statmsg);
+			statmsg = buf;
+		}
+	}
+	else if (i < 0 || i > N_SysEx)
+	{
+		(void) sprintf(buf, "554 unknown mailer error %d", stat);
+		stat = EX_UNAVAILABLE;
+		statmsg = buf;
+	}
+	else if (stat == EX_TEMPFAIL)
+	{
+		(void) strcpy(buf, SysExMsg[i] + 1);
+#if NAMED_BIND
+		if (h_errno == TRY_AGAIN)
+			statmsg = errstring(h_errno+E_DNSBASE);
+		else
+#endif
+		{
+			if (errno != 0)
+				statmsg = errstring(errno);
+			else
+			{
+#ifdef SMTP
+				statmsg = SmtpError;
+#else /* SMTP */
+				statmsg = NULL;
+#endif /* SMTP */
+			}
+		}
+		if (statmsg != NULL && statmsg[0] != '\0')
+		{
+			(void) strcat(buf, ": ");
+			(void) strcat(buf, statmsg);
+		}
+		statmsg = buf;
+	}
+#if NAMED_BIND
+	else if (stat == EX_NOHOST && h_errno != 0)
+	{
+		statmsg = errstring(h_errno + E_DNSBASE);
+		(void) sprintf(buf, "%s (%s)", SysExMsg[i] + 1, statmsg);
+		statmsg = buf;
+	}
+#endif
+	else
+	{
+		statmsg = SysExMsg[i];
+		if (*statmsg++ == ':')
+		{
+			(void) sprintf(buf, "%s: %s", statmsg, errstring(errno));
+			statmsg = buf;
+		}
+	}
+
+	/*
+	**  Print the message as appropriate
+	*/
+
+	if (stat == EX_OK || stat == EX_TEMPFAIL)
+	{
+		extern char MsgBuf[];
+
+		message("%s", &statmsg[4]);
+		if (stat == EX_TEMPFAIL && e->e_xfp != NULL)
+			fprintf(e->e_xfp, "%s\n", &MsgBuf[4]);
+	}
+	else
+	{
+		char mbuf[8];
+
+		Errors++;
+		sprintf(mbuf, "%.3s %%s", statmsg);
+		usrerr(mbuf, &statmsg[4]);
+	}
+
+	/*
+	**  Final cleanup.
+	**	Log a record of the transaction.  Compute the new
+	**	ExitStat -- if we already had an error, stick with
+	**	that.
+	*/
+
+	if (LogLevel > ((stat == EX_TEMPFAIL) ? 8 : (stat == EX_OK) ? 7 : 6))
+		logdelivery(m, mci, &statmsg[4], ctladdr, e);
+
+	if (tTd(11, 2))
+		printf("giveresponse: stat=%d, e->e_message=%s\n",
+			stat, e->e_message == NULL ? "<NULL>" : e->e_message);
+
+	if (stat != EX_TEMPFAIL)
+		setstat(stat);
+	if (stat != EX_OK && (stat != EX_TEMPFAIL || e->e_message == NULL))
+	{
+		if (e->e_message != NULL)
+			free(e->e_message);
+		e->e_message = newstr(&statmsg[4]);
+	}
+	errno = 0;
+#if NAMED_BIND
+	h_errno = 0;
+#endif
+}
+/*
+**  LOGDELIVERY -- log the delivery in the system log
+**
+**	Care is taken to avoid logging lines that are too long, because
+**	some versions of syslog have an unfortunate proclivity for core
+**	dumping.  This is a hack, to be sure, that is at best empirical.
+**
+**	Parameters:
+**		m -- the mailer info.  Can be NULL for initial queue.
+**		mci -- the mailer connection info -- can be NULL if the
+**			log is occuring when no connection is active.
+**		stat -- the message to print for the status.
+**		ctladdr -- the controlling address for the to list.
+**		e -- the current envelope.
+**
+**	Returns:
+**		none
+**
+**	Side Effects:
+**		none
+*/
+
+logdelivery(m, mci, stat, ctladdr, e)
+	MAILER *m;
+	register MCI *mci;
+	char *stat;
+	ADDRESS *ctladdr;
+	register ENVELOPE *e;
+{
+# ifdef LOG
+	register char *bp;
+	register char *p;
+	int l;
+	char buf[512];
+
+#  if (SYSLOG_BUFSIZE) >= 256
+	bp = buf;
+	if (ctladdr != NULL)
+	{
+		strcpy(bp, ", ctladdr=");
+		strcat(bp, shortenstring(ctladdr->q_paddr, 83));
+		bp += strlen(bp);
+		if (bitset(QGOODUID, ctladdr->q_flags))
+		{
+			(void) sprintf(bp, " (%d/%d)",
+					ctladdr->q_uid, ctladdr->q_gid);
+			bp += strlen(bp);
+		}
+	}
+
+	(void) sprintf(bp, ", delay=%s", pintvl(curtime() - e->e_ctime, TRUE));
+	bp += strlen(bp);
+
+	if (m != NULL)
+	{
+		(void) strcpy(bp, ", mailer=");
+		(void) strcat(bp, m->m_name);
+		bp += strlen(bp);
+	}
+
+	if (mci != NULL && mci->mci_host != NULL)
+	{
+# ifdef DAEMON
+		extern SOCKADDR CurHostAddr;
+# endif
+
+		(void) strcpy(bp, ", relay=");
+		(void) strcat(bp, mci->mci_host);
+
+# ifdef DAEMON
+		(void) strcat(bp, " [");
+		(void) strcat(bp, anynet_ntoa(&CurHostAddr));
+		(void) strcat(bp, "]");
+# endif
+	}
+	else if (strcmp(stat, "queued") != 0)
+	{
+		char *p = macvalue('h', e);
+
+		if (p != NULL && p[0] != '\0')
+		{
+			(void) strcpy(bp, ", relay=");
+			(void) strcat(bp, p);
+		}
+	}
+	bp += strlen(bp);
+
+#define STATLEN		(((SYSLOG_BUFSIZE) - 100) / 4)
+#if (STATLEN) < 63
+# undef STATLEN
+# define STATLEN	63
+#endif
+#if (STATLEN) > 203
+# undef STATLEN
+# define STATLEN	203
+#endif
+
+	if ((bp - buf) > (sizeof buf - ((STATLEN) + 20)))
+	{
+		/* desperation move -- truncate data */
+		bp = buf + sizeof buf - ((STATLEN) + 17);
+		strcpy(bp, "...");
+		bp += 3;
+	}
+
+	(void) strcpy(bp, ", stat=");
+	bp += strlen(bp);
+
+	(void) strcpy(bp, shortenstring(stat, (STATLEN)));
+		
+	l = SYSLOG_BUFSIZE - 100 - strlen(buf);
+	p = e->e_to;
+	while (strlen(p) >= l)
+	{
+		register char *q = strchr(p + l, ',');
+
+		if (q == NULL)
+			break;
+		syslog(LOG_INFO, "%s: to=%.*s [more]%s",
+			e->e_id, ++q - p, p, buf);
+		p = q;
+	}
+	syslog(LOG_INFO, "%s: to=%s%s", e->e_id, p, buf);
+
+#  else		/* we have a very short log buffer size */
+
+	l = SYSLOG_BUFSIZE - 85;
+	p = e->e_to;
+	while (strlen(p) >= l)
+	{
+		register char *q = strchr(p + l, ',');
+
+		if (q == NULL)
+			break;
+		syslog(LOG_INFO, "%s: to=%.*s [more]",
+			e->e_id, ++q - p, p);
+		p = q;
+	}
+	syslog(LOG_INFO, "%s: to=%s", e->e_id, p);
+
+	if (ctladdr != NULL)
+	{
+		bp = buf;
+		strcpy(buf, "ctladdr=");
+		bp += strlen(buf);
+		strcpy(bp, shortenstring(ctladdr->q_paddr, 83));
+		bp += strlen(buf);
+		if (bitset(QGOODUID, ctladdr->q_flags))
+		{
+			(void) sprintf(bp, " (%d/%d)",
+					ctladdr->q_uid, ctladdr->q_gid);
+			bp += strlen(bp);
+		}
+		syslog(LOG_INFO, "%s: %s", e->e_id, buf);
+	}
+	bp = buf;
+	sprintf(bp, "delay=%s", pintvl(curtime() - e->e_ctime, TRUE));
+	bp += strlen(bp);
+
+	if (m != NULL)
+	{
+		sprintf(bp, ", mailer=%s", m->m_name);
+		bp += strlen(bp);
+	}
+	syslog(LOG_INFO, "%s: %s", e->e_id, buf);
+
+	buf[0] = '\0';
+	if (mci != NULL && mci->mci_host != NULL)
+	{
+# ifdef DAEMON
+		extern SOCKADDR CurHostAddr;
+# endif
+
+		sprintf(buf, "relay=%s", mci->mci_host);
+
+# ifdef DAEMON
+		(void) strcat(buf, " [");
+		(void) strcat(buf, anynet_ntoa(&CurHostAddr));
+		(void) strcat(buf, "]");
+# endif
+	}
+	else if (strcmp(stat, "queued") != 0)
+	{
+		char *p = macvalue('h', e);
+
+		if (p != NULL && p[0] != '\0')
+			sprintf(buf, "relay=%s", p);
+	}
+	if (buf[0] != '\0')
+		syslog(LOG_INFO, "%s: %s", e->e_id, buf);
+
+	syslog(LOG_INFO, "%s: stat=%s", e->e_id, shortenstring(stat, 63));
+#  endif /* short log buffer */
+# endif /* LOG */
+}
+/*
+**  PUTFROMLINE -- output a UNIX-style from line (or whatever)
+**
+**	This can be made an arbitrary message separator by changing $l
+**
+**	One of the ugliest hacks seen by human eyes is contained herein:
+**	UUCP wants those stupid "remote from <host>" lines.  Why oh why
+**	does a well-meaning programmer such as myself have to deal with
+**	this kind of antique garbage????
+**
+**	Parameters:
+**		mci -- the connection information.
+**		e -- the envelope.
+**
+**	Returns:
+**		none
+**
+**	Side Effects:
+**		outputs some text to fp.
+*/
+
+putfromline(mci, e)
+	register MCI *mci;
+	ENVELOPE *e;
+{
+	char *template = "\201l\n";
+	char buf[MAXLINE];
+
+	if (bitnset(M_NHDR, mci->mci_mailer->m_flags))
+		return;
+
+# ifdef UGLYUUCP
+	if (bitnset(M_UGLYUUCP, mci->mci_mailer->m_flags))
+	{
+		char *bang;
+		char xbuf[MAXLINE];
+
+		expand("\201g", buf, &buf[sizeof buf - 1], e);
+		bang = strchr(buf, '!');
+		if (bang == NULL)
+		{
+			errno = 0;
+			syserr("554 No ! in UUCP From address! (%s given)", buf);
+		}
+		else
+		{
+			*bang++ = '\0';
+			(void) sprintf(xbuf, "From %s  \201d remote from %s\n", bang, buf);
+			template = xbuf;
+		}
+	}
+# endif /* UGLYUUCP */
+	expand(template, buf, &buf[sizeof buf - 1], e);
+	putline(buf, mci);
+}
+/*
+**  PUTBODY -- put the body of a message.
+**
+**	Parameters:
+**		mci -- the connection information.
+**		e -- the envelope to put out.
+**		separator -- if non-NULL, a message separator that must
+**			not be permitted in the resulting message.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		The message is written onto fp.
+*/
+
+putbody(mci, e, separator)
+	register MCI *mci;
+	register ENVELOPE *e;
+	char *separator;
+{
+	char buf[MAXLINE];
+
+	/*
+	**  Output the body of the message
+	*/
+
+	if (e->e_dfp == NULL)
+	{
+		if (e->e_df != NULL)
+		{
+			e->e_dfp = fopen(e->e_df, "r");
+			if (e->e_dfp == NULL)
+				syserr("putbody: Cannot open %s for %s from %s",
+				e->e_df, e->e_to, e->e_from.q_paddr);
+		}
+		else
+			putline("<<< No Message Collected >>>", mci);
+	}
+	if (e->e_dfp != NULL)
+	{
+		rewind(e->e_dfp);
+		while (!ferror(mci->mci_out) && fgets(buf, sizeof buf, e->e_dfp) != NULL)
+		{
+			if (buf[0] == 'F' &&
+			    bitnset(M_ESCFROM, mci->mci_mailer->m_flags) &&
+			    strncmp(buf, "From ", 5) == 0)
+				(void) putc('>', mci->mci_out);
+			if (buf[0] == '-' && buf[1] == '-' && separator != NULL)
+			{
+				/* possible separator */
+				int sl = strlen(separator);
+
+				if (strncmp(&buf[2], separator, sl) == 0)
+					(void) putc(' ', mci->mci_out);
+			}
+			putline(buf, mci);
+		}
+
+		if (ferror(e->e_dfp))
+		{
+			syserr("putbody: %s: read error", e->e_df);
+			ExitStat = EX_IOERR;
+		}
+	}
+
+	/* some mailers want extra blank line at end of message */
+	if (bitnset(M_BLANKEND, mci->mci_mailer->m_flags) &&
+	    buf[0] != '\0' && buf[0] != '\n')
+		putline("", mci);
+
+	(void) fflush(mci->mci_out);
+	if (ferror(mci->mci_out) && errno != EPIPE)
+	{
+		syserr("putbody: write error");
+		ExitStat = EX_IOERR;
+	}
+	errno = 0;
+}
+/*
+**  MAILFILE -- Send a message to a file.
+**
+**	If the file has the setuid/setgid bits set, but NO execute
+**	bits, sendmail will try to become the owner of that file
+**	rather than the real user.  Obviously, this only works if
+**	sendmail runs as root.
+**
+**	This could be done as a subordinate mailer, except that it
+**	is used implicitly to save messages in ~/dead.letter.  We
+**	view this as being sufficiently important as to include it
+**	here.  For example, if the system is dying, we shouldn't have
+**	to create another process plus some pipes to save the message.
+**
+**	Parameters:
+**		filename -- the name of the file to send to.
+**		ctladdr -- the controlling address header -- includes
+**			the userid/groupid to be when sending.
+**
+**	Returns:
+**		The exit code associated with the operation.
+**
+**	Side Effects:
+**		none.
+*/
+
+mailfile(filename, ctladdr, e)
+	char *filename;
+	ADDRESS *ctladdr;
+	register ENVELOPE *e;
+{
+	register FILE *f;
+	register int pid;
+	int mode;
+
+	if (tTd(11, 1))
+	{
+		printf("mailfile %s\n  ctladdr=", filename);
+		printaddr(ctladdr, FALSE);
+	}
+
+	if (e->e_xfp != NULL)
+		fflush(e->e_xfp);
+
+	/*
+	**  Fork so we can change permissions here.
+	**	Note that we MUST use fork, not vfork, because of
+	**	the complications of calling subroutines, etc.
+	*/
+
+	DOFORK(fork);
+
+	if (pid < 0)
+		return (EX_OSERR);
+	else if (pid == 0)
+	{
+		/* child -- actually write to file */
+		struct stat stb;
+		struct stat fsb;
+		MCI mcibuf;
+		int oflags = O_WRONLY|O_APPEND;
+
+		if (e->e_lockfp != NULL)
+		{
+			fclose(e->e_lockfp);
+			e->e_lockfp = NULL;
+		}
+
+		(void) setsignal(SIGINT, SIG_DFL);
+		(void) setsignal(SIGHUP, SIG_DFL);
+		(void) setsignal(SIGTERM, SIG_DFL);
+		(void) umask(OldUmask);
+
+		if (stat(filename, &stb) < 0)
+		{
+			stb.st_mode = FileMode;
+			oflags |= O_CREAT|O_EXCL;
+		}
+		else if (bitset(0111, stb.st_mode))
+			exit(EX_CANTCREAT);
+		mode = stb.st_mode;
+
+		/* limit the errors to those actually caused in the child */
+		errno = 0;
+		ExitStat = EX_OK;
+
+		if (ctladdr != NULL)
+		{
+			/* ignore setuid and setgid bits */
+			mode &= ~(S_ISGID|S_ISUID);
+		}
+
+		/* we have to open the dfile BEFORE setuid */
+		if (e->e_dfp == NULL && e->e_df != NULL)
+		{
+			e->e_dfp = fopen(e->e_df, "r");
+			if (e->e_dfp == NULL)
+			{
+				syserr("mailfile: Cannot open %s for %s from %s",
+					e->e_df, e->e_to, e->e_from.q_paddr);
+			}
+		}
+
+		if (!bitset(S_ISGID, mode) || setgid(stb.st_gid) < 0)
+		{
+			if (ctladdr == NULL || ctladdr->q_uid == 0)
+			{
+				(void) initgroups(DefUser, DefGid);
+			}
+			else
+			{
+				(void) initgroups(ctladdr->q_ruser ?
+					ctladdr->q_ruser : ctladdr->q_user,
+					ctladdr->q_gid);
+			}
+		}
+		if (!bitset(S_ISUID, mode) || setuid(stb.st_uid) < 0)
+		{
+			if (ctladdr == NULL || ctladdr->q_uid == 0)
+				(void) setuid(DefUid);
+			else
+				(void) setuid(ctladdr->q_uid);
+		}
+		FileName = filename;
+		LineNumber = 0;
+		f = dfopen(filename, oflags, FileMode);
+		if (f == NULL)
+		{
+			message("554 cannot open: %s", errstring(errno));
+			exit(EX_CANTCREAT);
+		}
+		if (fstat(fileno(f), &fsb) < 0 ||
+		    !bitset(O_CREAT, oflags) &&
+		     (stb.st_nlink != fsb.st_nlink ||
+		      stb.st_dev != fsb.st_dev ||
+		      stb.st_ino != fsb.st_ino ||
+		      stb.st_uid != fsb.st_uid))
+		{
+			message("554 cannot write: file changed after open");
+			exit(EX_CANTCREAT);
+		}
+
+		bzero(&mcibuf, sizeof mcibuf);
+		mcibuf.mci_mailer = FileMailer;
+		mcibuf.mci_out = f;
+		if (bitnset(M_7BITS, FileMailer->m_flags))
+			mcibuf.mci_flags |= MCIF_7BIT;
+
+		putfromline(&mcibuf, e);
+		(*e->e_puthdr)(&mcibuf, e);
+		putline("\n", &mcibuf);
+		(*e->e_putbody)(&mcibuf, e, NULL);
+		putline("\n", &mcibuf);
+		if (ferror(f))
+		{
+			message("451 I/O error: %s", errstring(errno));
+			setstat(EX_IOERR);
+		}
+		(void) xfclose(f, "mailfile", filename);
+		(void) fflush(stdout);
+
+		/* reset ISUID & ISGID bits for paranoid systems */
+		(void) chmod(filename, (int) stb.st_mode);
+		exit(ExitStat);
+		/*NOTREACHED*/
+	}
+	else
+	{
+		/* parent -- wait for exit status */
+		int st;
+
+		st = waitfor(pid);
+		if (WIFEXITED(st))
+			return (WEXITSTATUS(st));
+		else
+		{
+			syserr("child died on signal %d", st);
+			return (EX_UNAVAILABLE);
+		}
+		/*NOTREACHED*/
+	}
+}
+/*
+**  HOSTSIGNATURE -- return the "signature" for a host.
+**
+**	The signature describes how we are going to send this -- it
+**	can be just the hostname (for non-Internet hosts) or can be
+**	an ordered list of MX hosts.
+**
+**	Parameters:
+**		m -- the mailer describing this host.
+**		host -- the host name.
+**		e -- the current envelope.
+**
+**	Returns:
+**		The signature for this host.
+**
+**	Side Effects:
+**		Can tweak the symbol table.
+*/
+
+char *
+hostsignature(m, host, e)
+	register MAILER *m;
+	char *host;
+	ENVELOPE *e;
+{
+	register char *p;
+	register STAB *s;
+	int i;
+	int len;
+#if NAMED_BIND
+	int nmx;
+	auto int rcode;
+	char *hp;
+	char *endp;
+	int oldoptions;
+	char *mxhosts[MAXMXHOSTS + 1];
+#endif
+
+	/*
+	**  Check to see if this uses IPC -- if not, it can't have MX records.
+	*/
+
+	p = m->m_mailer;
+	if (strcmp(p, "[IPC]") != 0 && strcmp(p, "[TCP]") != 0)
+	{
+		/* just an ordinary mailer */
+		return host;
+	}
+
+	/*
+	**  Look it up in the symbol table.
+	*/
+
+	s = stab(host, ST_HOSTSIG, ST_ENTER);
+	if (s->s_hostsig != NULL)
+		return s->s_hostsig;
+
+	/*
+	**  Not already there -- create a signature.
+	*/
+
+#if NAMED_BIND
+	if (ConfigLevel < 2)
+	{
+		oldoptions = _res.options;
+		_res.options &= ~(RES_DEFNAMES | RES_DNSRCH);	/* XXX */
+	}
+
+	for (hp = host; hp != NULL; hp = endp)
+	{
+		endp = strchr(hp, ':');
+		if (endp != NULL)
+			*endp = '\0';
+
+		nmx = getmxrr(hp, mxhosts, TRUE, &rcode);
+
+		if (nmx <= 0)
+		{
+			register MCI *mci;
+
+			/* update the connection info for this host */
+			mci = mci_get(hp, m);
+			mci->mci_exitstat = rcode;
+			mci->mci_errno = errno;
+#if NAMED_BIND
+			mci->mci_herrno = h_errno;
+#endif
+
+			/* and return the original host name as the signature */
+			nmx = 1;
+			mxhosts[0] = hp;
+		}
+
+		len = 0;
+		for (i = 0; i < nmx; i++)
+		{
+			len += strlen(mxhosts[i]) + 1;
+		}
+		if (s->s_hostsig != NULL)
+			len += strlen(s->s_hostsig) + 1;
+		p = xalloc(len);
+		if (s->s_hostsig != NULL)
+		{
+			(void) strcpy(p, s->s_hostsig);
+			free(s->s_hostsig);
+			s->s_hostsig = p;
+			p += strlen(p);
+			*p++ = ':';
+		}
+		else
+			s->s_hostsig = p;
+		for (i = 0; i < nmx; i++)
+		{
+			if (i != 0)
+				*p++ = ':';
+			strcpy(p, mxhosts[i]);
+			p += strlen(p);
+		}
+		if (endp != NULL)
+			*endp++ = ':';
+	}
+	makelower(s->s_hostsig);
+	if (ConfigLevel < 2)
+		_res.options = oldoptions;
+#else
+	/* not using BIND -- the signature is just the host name */
+	s->s_hostsig = host;
+#endif
+	if (tTd(17, 1))
+		printf("hostsignature(%s) = %s\n", host, s->s_hostsig);
+	return s->s_hostsig;
+}
diff --git a/usr.sbin/sendmail/src/domain.c b/usr.sbin/sendmail/src/domain.c
new file mode 100644
index 00000000000..913b6f0f62c
--- /dev/null
+++ b/usr.sbin/sendmail/src/domain.c
@@ -0,0 +1,771 @@
+/*
+ * Copyright (c) 1986 Eric P. Allman
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "sendmail.h"
+
+#ifndef lint
+#if NAMED_BIND
+static char sccsid[] = "@(#)domain.c	8.19.1.1 (Berkeley) 3/6/95 (with name server)";
+#else
+static char sccsid[] = "@(#)domain.c	8.19.1.1 (Berkeley) 3/6/95 (without name server)";
+#endif
+#endif /* not lint */
+
+#if NAMED_BIND
+
+#include <errno.h>
+#include <arpa/nameser.h>
+#include <resolv.h>
+#include <netdb.h>
+
+typedef union
+{
+	HEADER	qb1;
+	char	qb2[PACKETSZ];
+} querybuf;
+
+static char	MXHostBuf[MAXMXHOSTS*PACKETSZ];
+
+#ifndef MAXDNSRCH
+#define MAXDNSRCH	6	/* number of possible domains to search */
+#endif
+
+#ifndef MAX
+#define MAX(a, b)	((a) > (b) ? (a) : (b))
+#endif
+
+#ifndef NO_DATA
+# define NO_DATA	NO_ADDRESS
+#endif
+
+#ifndef HEADERSZ
+# define HEADERSZ	sizeof(HEADER)
+#endif
+
+/* don't use sizeof because sizeof(long) is different on 64-bit machines */
+#define SHORTSIZE	2	/* size of a short (really, must be 2) */
+#define LONGSIZE	4	/* size of a long (really, must be 4) */
+
+#define MAXCNAMEDEPTH	10	/* maximum depth of CNAME recursion */
+/*
+**  GETMXRR -- get MX resource records for a domain
+**
+**	Parameters:
+**		host -- the name of the host to MX.
+**		mxhosts -- a pointer to a return buffer of MX records.
+**		droplocalhost -- If TRUE, all MX records less preferred
+**			than the local host (as determined by $=w) will
+**			be discarded.
+**		rcode -- a pointer to an EX_ status code.
+**
+**	Returns:
+**		The number of MX records found.
+**		-1 if there is an internal failure.
+**		If no MX records are found, mxhosts[0] is set to host
+**			and 1 is returned.
+*/
+
+getmxrr(host, mxhosts, droplocalhost, rcode)
+	char *host;
+	char **mxhosts;
+	bool droplocalhost;
+	int *rcode;
+{
+	extern int h_errno;
+	register u_char *eom, *cp;
+	register int i, j, n;
+	int nmx = 0;
+	register char *bp;
+	HEADER *hp;
+	querybuf answer;
+	int ancount, qdcount, buflen;
+	bool seenlocal = FALSE;
+	u_short pref, localpref, type;
+	char *fallbackMX = FallBackMX;
+	static bool firsttime = TRUE;
+	STAB *st;
+	bool trycanon = FALSE;
+	u_short prefer[MAXMXHOSTS];
+	int weight[MAXMXHOSTS];
+	extern bool getcanonname();
+
+	if (tTd(8, 2))
+		printf("getmxrr(%s, droplocalhost=%d)\n", host, droplocalhost);
+
+	if (fallbackMX != NULL)
+	{
+		if (firsttime && res_query(FallBackMX, C_IN, T_A,
+					   (char *) &answer, sizeof answer) < 0)
+		{
+			/* this entry is bogus */
+			fallbackMX = FallBackMX = NULL;
+		}
+		else if (droplocalhost &&
+			 (st = stab(fallbackMX, ST_CLASS, ST_FIND)) != NULL &&
+			 bitnset('w', st->s_class))
+		{
+			/* don't use fallback for this pass */
+			fallbackMX = NULL;
+		}
+		firsttime = FALSE;
+	}
+
+	/* efficiency hack -- numeric or non-MX lookups */
+	if (host[0] == '[')
+		goto punt;
+
+	errno = 0;
+	n = res_search(host, C_IN, T_MX, (char *)&answer, sizeof(answer));
+	if (n < 0)
+	{
+		if (tTd(8, 1))
+			printf("getmxrr: res_search(%s) failed (errno=%d, h_errno=%d)\n",
+			    (host == NULL) ? "<NULL>" : host, errno, h_errno);
+		switch (h_errno)
+		{
+		  case NO_DATA:
+			trycanon = TRUE;
+			/* fall through */
+
+		  case NO_RECOVERY:
+			/* no MX data on this host */
+			goto punt;
+
+		  case HOST_NOT_FOUND:
+#ifdef BROKEN_RES_SEARCH
+			/* Ultrix resolver returns failure w/ h_errno=0 */
+		  case 0:
+#endif
+			/* the host just doesn't exist */
+			*rcode = EX_NOHOST;
+
+			if (!UseNameServer)
+			{
+				/* might exist in /etc/hosts */
+				goto punt;
+			}
+			break;
+
+		  case TRY_AGAIN:
+			/* couldn't connect to the name server */
+			if (!UseNameServer && errno == ECONNREFUSED)
+				goto punt;
+
+			/* it might come up later; better queue it up */
+			*rcode = EX_TEMPFAIL;
+			break;
+
+		  default:
+			syserr("getmxrr: res_search (%s) failed with impossible h_errno (%d)\n",
+				host, h_errno);
+			*rcode = EX_OSERR;
+			break;
+		}
+
+		/* irreconcilable differences */
+		return (-1);
+	}
+
+	/* find first satisfactory answer */
+	hp = (HEADER *)&answer;
+	cp = (u_char *)&answer + HEADERSZ;
+	eom = (u_char *)&answer + n;
+	for (qdcount = ntohs(hp->qdcount); qdcount--; cp += n + QFIXEDSZ)
+		if ((n = dn_skipname(cp, eom)) < 0)
+			goto punt;
+	buflen = sizeof(MXHostBuf) - 1;
+	bp = MXHostBuf;
+	ancount = ntohs(hp->ancount);
+	while (--ancount >= 0 && cp < eom && nmx < MAXMXHOSTS - 1)
+	{
+		if ((n = dn_expand((u_char *)&answer,
+		    eom, cp, (u_char *)bp, buflen)) < 0)
+			break;
+		cp += n;
+		GETSHORT(type, cp);
+ 		cp += SHORTSIZE + LONGSIZE;
+		GETSHORT(n, cp);
+		if (type != T_MX)
+		{
+			if (tTd(8, 8) || _res.options & RES_DEBUG)
+				printf("unexpected answer type %d, size %d\n",
+				    type, n);
+			cp += n;
+			continue;
+		}
+		GETSHORT(pref, cp);
+		if ((n = dn_expand((u_char *)&answer, eom, cp,
+				   (u_char *)bp, buflen)) < 0)
+			break;
+		cp += n;
+		if (droplocalhost &&
+		    (st = stab(bp, ST_CLASS, ST_FIND)) != NULL &&
+		    bitnset('w', st->s_class))
+		{
+			if (tTd(8, 3))
+				printf("found localhost (%s) in MX list, pref=%d\n",
+					bp, pref);
+			if (!seenlocal || pref < localpref)
+				localpref = pref;
+			seenlocal = TRUE;
+			continue;
+		}
+		weight[nmx] = mxrand(bp);
+		prefer[nmx] = pref;
+		mxhosts[nmx++] = bp;
+		n = strlen(bp);
+		bp += n;
+		if (bp[-1] != '.')
+		{
+			*bp++ = '.';
+			n++;
+		}
+		*bp++ = '\0';
+		buflen -= n + 1;
+	}
+
+	/* sort the records */
+	for (i = 0; i < nmx; i++)
+	{
+		for (j = i + 1; j < nmx; j++)
+		{
+			if (prefer[i] > prefer[j] ||
+			    (prefer[i] == prefer[j] && weight[i] > weight[j]))
+			{
+				register int temp;
+				register char *temp1;
+
+				temp = prefer[i];
+				prefer[i] = prefer[j];
+				prefer[j] = temp;
+				temp1 = mxhosts[i];
+				mxhosts[i] = mxhosts[j];
+				mxhosts[j] = temp1;
+				temp = weight[i];
+				weight[i] = weight[j];
+				weight[j] = temp;
+			}
+		}
+		if (seenlocal && prefer[i] >= localpref)
+		{
+			/* truncate higher preference part of list */
+			nmx = i;
+		}
+	}
+
+	if (nmx == 0)
+	{
+punt:
+		if (seenlocal &&
+		    (!TryNullMXList || gethostbyname(host) == NULL))
+		{
+			/*
+			**  If we have deleted all MX entries, this is
+			**  an error -- we should NEVER send to a host that
+			**  has an MX, and this should have been caught
+			**  earlier in the config file.
+			**
+			**  Some sites prefer to go ahead and try the
+			**  A record anyway; that case is handled by
+			**  setting TryNullMXList.  I believe this is a
+			**  bad idea, but it's up to you....
+			*/
+
+			*rcode = EX_CONFIG;
+			syserr("MX list for %s points back to %s",
+				host, MyHostName);
+			return -1;
+		}
+		strcpy(MXHostBuf, host);
+		mxhosts[0] = MXHostBuf;
+		if (host[0] == '[')
+		{
+			register char *p;
+			struct in_addr junk;
+
+			/* this may be an MX suppression-style address */
+			p = strchr(MXHostBuf, ']');
+			if (p != NULL)
+			{
+				*p = '\0';
+				if (inet_aton(&MXHostBuf[1], &junk) != 0)
+					*p = ']';
+				else
+				{
+					trycanon = TRUE;
+					mxhosts[0]++;
+				}
+			}
+		}
+		if (trycanon &&
+		    getcanonname(mxhosts[0], sizeof MXHostBuf - 2, FALSE))
+		{
+			bp = &MXHostBuf[strlen(MXHostBuf)];
+			if (bp[-1] != '.')
+			{
+				*bp++ = '.';
+				*bp = '\0';
+			}
+		}
+		nmx = 1;
+	}
+
+	/* if we have a default lowest preference, include that */
+	if (fallbackMX != NULL && !seenlocal)
+		mxhosts[nmx++] = fallbackMX;
+
+	return (nmx);
+}
+/*
+**  MXRAND -- create a randomizer for equal MX preferences
+**
+**	If two MX hosts have equal preferences we want to randomize
+**	the selection.  But in order for signatures to be the same,
+**	we need to randomize the same way each time.  This function
+**	computes a pseudo-random hash function from the host name.
+**
+**	Parameters:
+**		host -- the name of the host.
+**
+**	Returns:
+**		A random but repeatable value based on the host name.
+**
+**	Side Effects:
+**		none.
+*/
+
+mxrand(host)
+	register char *host;
+{
+	int hfunc;
+	static unsigned int seed;
+
+	if (seed == 0)
+	{
+		seed = (int) curtime() & 0xffff;
+		if (seed == 0)
+			seed++;
+	}
+
+	if (tTd(17, 9))
+		printf("mxrand(%s)", host);
+
+	hfunc = seed;
+	while (*host != '\0')
+	{
+		int c = *host++;
+
+		if (isascii(c) && isupper(c))
+			c = tolower(c);
+		hfunc = ((hfunc << 1) ^ c) % 2003;
+	}
+
+	hfunc &= 0xff;
+
+	if (tTd(17, 9))
+		printf(" = %d\n", hfunc);
+	return hfunc;
+}
+/*
+**  GETCANONNAME -- get the canonical name for named host
+**
+**	This algorithm tries to be smart about wildcard MX records.
+**	This is hard to do because DNS doesn't tell is if we matched
+**	against a wildcard or a specific MX.
+**	
+**	We always prefer A & CNAME records, since these are presumed
+**	to be specific.
+**
+**	If we match an MX in one pass and lose it in the next, we use
+**	the old one.  For example, consider an MX matching *.FOO.BAR.COM.
+**	A hostname bletch.foo.bar.com will match against this MX, but
+**	will stop matching when we try bletch.bar.com -- so we know
+**	that bletch.foo.bar.com must have been right.  This fails if
+**	there was also an MX record matching *.BAR.COM, but there are
+**	some things that just can't be fixed.
+**
+**	Parameters:
+**		host -- a buffer containing the name of the host.
+**			This is a value-result parameter.
+**		hbsize -- the size of the host buffer.
+**		trymx -- if set, try MX records as well as A and CNAME.
+**
+**	Returns:
+**		TRUE -- if the host matched.
+**		FALSE -- otherwise.
+*/
+
+bool
+getcanonname(host, hbsize, trymx)
+	char *host;
+	int hbsize;
+	bool trymx;
+{
+	extern int h_errno;
+	register u_char *eom, *ap;
+	register char *cp;
+	register int n; 
+	HEADER *hp;
+	querybuf answer;
+	int ancount, qdcount;
+	int ret;
+	char **domain;
+	int type;
+	char **dp;
+	char *mxmatch;
+	bool amatch;
+	bool gotmx;
+	int qtype;
+	int loopcnt;
+	char *xp;
+	char nbuf[MAX(PACKETSZ, MAXDNAME*2+2)];
+	char *searchlist[MAXDNSRCH+2];
+	extern char *gethostalias();
+
+	if (tTd(8, 2))
+		printf("getcanonname(%s)\n", host);
+
+	if ((_res.options & RES_INIT) == 0 && res_init() == -1)
+		return (FALSE);
+
+	/*
+	**  Initialize domain search list.  If there is at least one
+	**  dot in the name, search the unmodified name first so we
+	**  find "vse.CS" in Czechoslovakia instead of in the local
+	**  domain (e.g., vse.CS.Berkeley.EDU).
+	**
+	**  Older versions of the resolver could create this
+	**  list by tearing apart the host name.
+	*/
+
+	loopcnt = 0;
+cnameloop:
+	for (cp = host, n = 0; *cp; cp++)
+		if (*cp == '.')
+			n++;
+
+	if (n == 0 && (xp = gethostalias(host)) != NULL)
+	{
+		if (loopcnt++ > MAXCNAMEDEPTH)
+		{
+			syserr("loop in ${HOSTALIASES} file");
+		}
+		else
+		{
+			strncpy(host, xp, hbsize);
+			host[hbsize - 1] = '\0';
+			goto cnameloop;
+		}
+	}
+
+	dp = searchlist;
+	if (n > 0)
+		*dp++ = "";
+	if (n >= 0 && *--cp != '.' && bitset(RES_DNSRCH, _res.options))
+	{
+		for (domain = _res.dnsrch; *domain != NULL; )
+			*dp++ = *domain++;
+	}
+	else if (n == 0 && bitset(RES_DEFNAMES, _res.options))
+	{
+		*dp++ = _res.defdname;
+	}
+	else if (*cp == '.')
+	{
+		*cp = '\0';
+	}
+	*dp = NULL;
+
+	/*
+	**  Now run through the search list for the name in question.
+	*/
+
+	mxmatch = NULL;
+	qtype = T_ANY;
+
+	for (dp = searchlist; *dp != NULL; )
+	{
+		if (qtype == T_ANY)
+			gotmx = FALSE;
+		if (tTd(8, 5))
+			printf("getcanonname: trying %s.%s (%s)\n", host, *dp,
+				qtype == T_ANY ? "ANY" : qtype == T_A ? "A" :
+				qtype == T_MX ? "MX" : "???");
+		ret = res_querydomain(host, *dp, C_IN, qtype,
+				      &answer, sizeof(answer));
+		if (ret <= 0)
+		{
+			if (tTd(8, 7))
+				printf("\tNO: errno=%d, h_errno=%d\n",
+					errno, h_errno);
+
+			if (errno == ECONNREFUSED || h_errno == TRY_AGAIN)
+			{
+				/* the name server seems to be down */
+				h_errno = TRY_AGAIN;
+				return FALSE;
+			}
+
+			if (h_errno != HOST_NOT_FOUND)
+			{
+				/* might have another type of interest */
+				if (qtype == T_ANY)
+				{
+					qtype = T_A;
+					continue;
+				}
+				else if (qtype == T_A && !gotmx && trymx)
+				{
+					qtype = T_MX;
+					continue;
+				}
+			}
+
+			if (mxmatch != NULL)
+			{
+				/* we matched before -- use that one */
+				break;
+			}
+
+			/* otherwise, try the next name */
+			dp++;
+			qtype = T_ANY;
+			continue;
+		}
+		else if (tTd(8, 7))
+			printf("\tYES\n");
+
+		/*
+		**  This might be a bogus match.  Search for A or
+		**  CNAME records.  If we don't have a matching
+		**  wild card MX record, we will accept MX as well.
+		*/
+
+		hp = (HEADER *) &answer;
+		ap = (u_char *) &answer + HEADERSZ;
+		eom = (u_char *) &answer + ret;
+
+		/* skip question part of response -- we know what we asked */
+		for (qdcount = ntohs(hp->qdcount); qdcount--; ap += ret + QFIXEDSZ)
+		{
+			if ((ret = dn_skipname(ap, eom)) < 0)
+			{
+				if (tTd(8, 20))
+					printf("qdcount failure (%d)\n",
+						ntohs(hp->qdcount));
+				return FALSE;		/* ???XXX??? */
+			}
+		}
+
+		amatch = FALSE;
+		for (ancount = ntohs(hp->ancount); --ancount >= 0 && ap < eom; ap += n)
+		{
+			n = dn_expand((u_char *) &answer, eom, ap,
+				      (u_char *) nbuf, sizeof nbuf);
+			if (n < 0)
+				break;
+			ap += n;
+			GETSHORT(type, ap);
+			ap += SHORTSIZE + LONGSIZE;
+			GETSHORT(n, ap);
+			switch (type)
+			{
+			  case T_MX:
+				gotmx = TRUE;
+				if (**dp != '\0')
+				{
+					/* got a match -- save that info */
+					if (trymx && mxmatch == NULL)
+						mxmatch = *dp;
+					continue;
+				}
+
+				/* exact MX matches are as good as an A match */
+				/* fall through */
+
+			  case T_A:
+				/* good show */
+				amatch = TRUE;
+
+				/* continue in case a CNAME also exists */
+				continue;
+
+			  case T_CNAME:
+				if (loopcnt++ > MAXCNAMEDEPTH)
+				{
+					/*XXX should notify postmaster XXX*/
+					message("DNS failure: CNAME loop for %s",
+						host);
+					if (CurEnv->e_message == NULL)
+					{
+						char ebuf[MAXLINE];
+
+						sprintf(ebuf, "Deferred: DNS failure: CNAME loop for %s",
+							host);
+						CurEnv->e_message = newstr(ebuf);
+					}
+					h_errno = NO_RECOVERY;
+					return FALSE;
+				}
+
+				/* value points at name */
+				if ((ret = dn_expand((u_char *)&answer,
+				    eom, ap, (u_char *)nbuf, sizeof(nbuf))) < 0)
+					break;
+				(void)strncpy(host, nbuf, hbsize); /* XXX */
+				host[hbsize - 1] = '\0';
+
+				/*
+				**  RFC 1034 section 3.6 specifies that CNAME
+				**  should point at the canonical name -- but
+				**  urges software to try again anyway.
+				*/
+
+				goto cnameloop;
+
+			  default:
+				/* not a record of interest */
+				continue;
+			}
+		}
+
+		if (amatch)
+		{
+			/* got an A record and no CNAME */
+			mxmatch = *dp;
+			break;
+		}
+
+		/*
+		**  If this was a T_ANY query, we may have the info but
+		**  need an explicit query.  Try T_A, then T_MX.
+		*/
+
+		if (qtype == T_ANY)
+			qtype = T_A;
+		else if (qtype == T_A && !gotmx && trymx)
+			qtype = T_MX;
+		else
+		{
+			/* really nothing in this domain; try the next */
+			qtype = T_ANY;
+			dp++;
+		}
+	}
+
+	if (mxmatch == NULL)
+		return FALSE;
+
+	/* create matching name and return */
+	(void) sprintf(nbuf, "%.*s%s%.*s", MAXDNAME, host,
+			*mxmatch == '\0' ? "" : ".",
+			MAXDNAME, mxmatch);
+	strncpy(host, nbuf, hbsize);
+	host[hbsize - 1] = '\0';
+	return TRUE;
+}
+
+
+char *
+gethostalias(host)
+	char *host;
+{
+	char *fname;
+	FILE *fp;
+	register char *p;
+	char buf[MAXLINE];
+	static char hbuf[MAXDNAME];
+
+	fname = getenv("HOSTALIASES");
+	if (fname == NULL || (fp = fopen(fname, "r")) == NULL)
+		return NULL;
+	setbuf(fp, NULL);
+	while (fgets(buf, sizeof buf, fp) != NULL)
+	{
+		for (p = buf; p != '\0' && !(isascii(*p) && isspace(*p)); p++)
+			continue;
+		if (*p == 0)
+		{
+			/* syntax error */
+			continue;
+		}
+		*p++ = '\0';
+		if (strcasecmp(buf, host) == 0)
+			break;
+	}
+
+	if (feof(fp))
+	{
+		/* no match */
+		fclose(fp);
+		return NULL;
+	}
+
+	/* got a match; extract the equivalent name */
+	while (*p != '\0' && isascii(*p) && isspace(*p))
+		p++;
+	host = p;
+	while (*p != '\0' && !(isascii(*p) && isspace(*p)))
+		p++;
+	*p = '\0';
+	strncpy(hbuf, host, sizeof hbuf - 1);
+	hbuf[sizeof hbuf - 1] = '\0';
+	return hbuf;
+}
+
+
+#else /* not NAMED_BIND */
+
+#include <netdb.h>
+
+bool
+getcanonname(host, hbsize, trymx)
+	char *host;
+	int hbsize;
+	bool trymx;
+{
+	struct hostent *hp;
+
+	hp = gethostbyname(host);
+	if (hp == NULL)
+		return (FALSE);
+
+	if (strlen(hp->h_name) >= hbsize)
+		return (FALSE);
+
+	(void) strcpy(host, hp->h_name);
+	return (TRUE);
+}
+
+#endif /* not NAMED_BIND */
diff --git a/usr.sbin/sendmail/src/envelope.c b/usr.sbin/sendmail/src/envelope.c
new file mode 100644
index 00000000000..e8bb1e479fe
--- /dev/null
+++ b/usr.sbin/sendmail/src/envelope.c
@@ -0,0 +1,777 @@
+/*
+ * Copyright (c) 1983 Eric P. Allman
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)envelope.c	8.34.1.1 (Berkeley) 2/28/95";
+#endif /* not lint */
+
+#include "sendmail.h"
+#include <pwd.h>
+
+/*
+**  NEWENVELOPE -- allocate a new envelope
+**
+**	Supports inheritance.
+**
+**	Parameters:
+**		e -- the new envelope to fill in.
+**		parent -- the envelope to be the parent of e.
+**
+**	Returns:
+**		e.
+**
+**	Side Effects:
+**		none.
+*/
+
+ENVELOPE *
+newenvelope(e, parent)
+	register ENVELOPE *e;
+	register ENVELOPE *parent;
+{
+	extern putheader(), putbody();
+	extern ENVELOPE BlankEnvelope;
+
+	if (e == parent && e->e_parent != NULL)
+		parent = e->e_parent;
+	clearenvelope(e, TRUE);
+	if (e == CurEnv)
+		bcopy((char *) &NullAddress, (char *) &e->e_from, sizeof e->e_from);
+	else
+		bcopy((char *) &CurEnv->e_from, (char *) &e->e_from, sizeof e->e_from);
+	e->e_parent = parent;
+	e->e_ctime = curtime();
+	if (parent != NULL)
+		e->e_msgpriority = parent->e_msgsize;
+	e->e_puthdr = putheader;
+	e->e_putbody = putbody;
+	if (CurEnv->e_xfp != NULL)
+		(void) fflush(CurEnv->e_xfp);
+
+	return (e);
+}
+/*
+**  DROPENVELOPE -- deallocate an envelope.
+**
+**	Parameters:
+**		e -- the envelope to deallocate.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		housekeeping necessary to dispose of an envelope.
+**		Unlocks this queue file.
+*/
+
+void
+dropenvelope(e)
+	register ENVELOPE *e;
+{
+	bool queueit = FALSE;
+	bool saveit = bitset(EF_FATALERRS, e->e_flags);
+	register ADDRESS *q;
+	char *id = e->e_id;
+	char buf[MAXLINE];
+
+	if (tTd(50, 1))
+	{
+		printf("dropenvelope %x: id=", e);
+		xputs(e->e_id);
+		printf(", flags=0x%x\n", e->e_flags);
+		if (tTd(50, 10))
+		{
+			printf("sendq=");
+			printaddr(e->e_sendqueue, TRUE);
+		}
+	}
+
+	/* we must have an id to remove disk files */
+	if (id == NULL)
+		return;
+
+#ifdef LOG
+	if (LogLevel > 4 && bitset(EF_LOGSENDER, e->e_flags))
+		logsender(e, NULL);
+	if (LogLevel > 84)
+		syslog(LOG_DEBUG, "dropenvelope, id=%s, flags=0x%x, pid=%d",
+				  id, e->e_flags, getpid());
+#endif /* LOG */
+	e->e_flags &= ~EF_LOGSENDER;
+
+	/* post statistics */
+	poststats(StatFile);
+
+	/*
+	**  Extract state information from dregs of send list.
+	*/
+
+	e->e_flags &= ~EF_QUEUERUN;
+	for (q = e->e_sendqueue; q != NULL; q = q->q_next)
+	{
+		if (bitset(QQUEUEUP, q->q_flags))
+			queueit = TRUE;
+		if (!bitset(QDONTSEND, q->q_flags) &&
+		    bitset(QBADADDR, q->q_flags))
+		{
+			if (q->q_owner == NULL &&
+			    strcmp(e->e_from.q_paddr, "<>") != 0)
+				(void) sendtolist(e->e_from.q_paddr, NULL,
+						  &e->e_errorqueue, e);
+		}
+	}
+
+	/*
+	**  See if the message timed out.
+	*/
+
+	if (!queueit)
+		/* nothing to do */ ;
+	else if (curtime() > e->e_ctime + TimeOuts.to_q_return)
+	{
+		(void) sprintf(buf, "Cannot send message for %s",
+			pintvl(TimeOuts.to_q_return, FALSE));
+		if (e->e_message != NULL)
+			free(e->e_message);
+		e->e_message = newstr(buf);
+		message(buf);
+		e->e_flags |= EF_CLRQUEUE;
+		saveit = TRUE;
+		fprintf(e->e_xfp, "Message could not be delivered for %s\n",
+			pintvl(TimeOuts.to_q_return, FALSE));
+		fprintf(e->e_xfp, "Message will be deleted from queue\n");
+		for (q = e->e_sendqueue; q != NULL; q = q->q_next)
+		{
+			if (bitset(QQUEUEUP, q->q_flags))
+				q->q_flags |= QBADADDR;
+		}
+	}
+	else if (TimeOuts.to_q_warning > 0 &&
+	    curtime() > e->e_ctime + TimeOuts.to_q_warning)
+	{
+		if (!bitset(EF_WARNING|EF_RESPONSE, e->e_flags) &&
+		    e->e_class >= 0 &&
+		    strcmp(e->e_from.q_paddr, "<>") != 0)
+		{
+			(void) sprintf(buf,
+				"warning: cannot send message for %s",
+				pintvl(TimeOuts.to_q_warning, FALSE));
+			if (e->e_message != NULL)
+				free(e->e_message);
+			e->e_message = newstr(buf);
+			message(buf);
+			e->e_flags |= EF_WARNING;
+			saveit = TRUE;
+		}
+		fprintf(e->e_xfp,
+			"Warning: message still undelivered after %s\n",
+			pintvl(TimeOuts.to_q_warning, FALSE));
+		fprintf(e->e_xfp, "Will keep trying until message is %s old\n",
+			pintvl(TimeOuts.to_q_return, FALSE));
+		for (q = e->e_sendqueue; q != NULL; q = q->q_next)
+		{
+			if (bitset(QQUEUEUP, q->q_flags))
+				q->q_flags |= QREPORT;
+		}
+	}
+
+	/*
+	**  Send back return receipts as requested.
+	*/
+
+	if (e->e_receiptto != NULL && bitset(EF_SENDRECEIPT, e->e_flags)
+	    && !bitset(PRIV_NORECEIPTS, PrivacyFlags))
+	{
+		auto ADDRESS *rlist = NULL;
+
+		(void) sendtolist(e->e_receiptto, NULLADDR, &rlist, e);
+		(void) returntosender("Return receipt", rlist, FALSE, e);
+		e->e_flags &= ~EF_SENDRECEIPT;
+	}
+
+	/*
+	**  Arrange to send error messages if there are fatal errors.
+	*/
+
+	if (saveit && e->e_errormode != EM_QUIET)
+		savemail(e);
+
+	/*
+	**  Arrange to send warning messages to postmaster as requested.
+	*/
+
+	if (bitset(EF_PM_NOTIFY, e->e_flags) && PostMasterCopy != NULL &&
+	    !bitset(EF_RESPONSE, e->e_flags) && e->e_class >= 0)
+	{
+		auto ADDRESS *rlist = NULL;
+
+		(void) sendtolist(PostMasterCopy, NULLADDR, &rlist, e);
+		(void) returntosender(e->e_message, rlist, FALSE, e);
+	}
+
+	/*
+	**  Instantiate or deinstantiate the queue.
+	*/
+
+	if ((!queueit && !bitset(EF_KEEPQUEUE, e->e_flags)) ||
+	    bitset(EF_CLRQUEUE, e->e_flags))
+	{
+		if (tTd(50, 1))
+			printf("\n===== Dropping [dq]f%s =====\n\n", e->e_id);
+		if (e->e_df != NULL)
+			xunlink(e->e_df);
+		xunlink(queuename(e, 'q'));
+
+#ifdef LOG
+		if (LogLevel > 10)
+			syslog(LOG_INFO, "%s: done", id);
+#endif
+	}
+	else if (queueit || !bitset(EF_INQUEUE, e->e_flags))
+	{
+#ifdef QUEUE
+		queueup(e, bitset(EF_KEEPQUEUE, e->e_flags), FALSE);
+#else /* QUEUE */
+		syserr("554 dropenvelope: queueup");
+#endif /* QUEUE */
+	}
+
+	/* now unlock the job */
+	closexscript(e);
+	unlockqueue(e);
+
+	/* make sure that this envelope is marked unused */
+	if (e->e_dfp != NULL)
+		(void) xfclose(e->e_dfp, "dropenvelope", e->e_df);
+	e->e_dfp = NULL;
+	e->e_id = e->e_df = NULL;
+}
+/*
+**  CLEARENVELOPE -- clear an envelope without unlocking
+**
+**	This is normally used by a child process to get a clean
+**	envelope without disturbing the parent.
+**
+**	Parameters:
+**		e -- the envelope to clear.
+**		fullclear - if set, the current envelope is total
+**			garbage and should be ignored; otherwise,
+**			release any resources it may indicate.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		Closes files associated with the envelope.
+**		Marks the envelope as unallocated.
+*/
+
+void
+clearenvelope(e, fullclear)
+	register ENVELOPE *e;
+	bool fullclear;
+{
+	register HDR *bh;
+	register HDR **nhp;
+	extern ENVELOPE BlankEnvelope;
+
+	if (!fullclear)
+	{
+		/* clear out any file information */
+		if (e->e_xfp != NULL)
+			(void) xfclose(e->e_xfp, "clearenvelope xfp", e->e_id);
+		if (e->e_dfp != NULL)
+			(void) xfclose(e->e_dfp, "clearenvelope dfp", e->e_df);
+		e->e_xfp = e->e_dfp = NULL;
+	}
+
+	/* now clear out the data */
+	STRUCTCOPY(BlankEnvelope, *e);
+	if (Verbose)
+		e->e_sendmode = SM_DELIVER;
+	bh = BlankEnvelope.e_header;
+	nhp = &e->e_header;
+	while (bh != NULL)
+	{
+		*nhp = (HDR *) xalloc(sizeof *bh);
+		bcopy((char *) bh, (char *) *nhp, sizeof *bh);
+		bh = bh->h_link;
+		nhp = &(*nhp)->h_link;
+	}
+}
+/*
+**  INITSYS -- initialize instantiation of system
+**
+**	In Daemon mode, this is done in the child.
+**
+**	Parameters:
+**		none.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		Initializes the system macros, some global variables,
+**		etc.  In particular, the current time in various
+**		forms is set.
+*/
+
+void
+initsys(e)
+	register ENVELOPE *e;
+{
+	char cbuf[5];				/* holds hop count */
+	char pbuf[10];				/* holds pid */
+#ifdef TTYNAME
+	static char ybuf[60];			/* holds tty id */
+	register char *p;
+#endif /* TTYNAME */
+	extern char *ttyname();
+	extern void settime();
+	extern char Version[];
+
+	/*
+	**  Give this envelope a reality.
+	**	I.e., an id, a transcript, and a creation time.
+	*/
+
+	openxscript(e);
+	e->e_ctime = curtime();
+
+	/*
+	**  Set OutChannel to something useful if stdout isn't it.
+	**	This arranges that any extra stuff the mailer produces
+	**	gets sent back to the user on error (because it is
+	**	tucked away in the transcript).
+	*/
+
+	if (OpMode == MD_DAEMON && bitset(EF_QUEUERUN, e->e_flags) &&
+	    e->e_xfp != NULL)
+		OutChannel = e->e_xfp;
+
+	/*
+	**  Set up some basic system macros.
+	*/
+
+	/* process id */
+	(void) sprintf(pbuf, "%d", getpid());
+	define('p', newstr(pbuf), e);
+
+	/* hop count */
+	(void) sprintf(cbuf, "%d", e->e_hopcount);
+	define('c', newstr(cbuf), e);
+
+	/* time as integer, unix time, arpa time */
+	settime(e);
+
+#ifdef TTYNAME
+	/* tty name */
+	if (macvalue('y', e) == NULL)
+	{
+		p = ttyname(2);
+		if (p != NULL)
+		{
+			if (strrchr(p, '/') != NULL)
+				p = strrchr(p, '/') + 1;
+			(void) strcpy(ybuf, p);
+			define('y', ybuf, e);
+		}
+	}
+#endif /* TTYNAME */
+}
+/*
+**  SETTIME -- set the current time.
+**
+**	Parameters:
+**		none.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		Sets the various time macros -- $a, $b, $d, $t.
+*/
+
+void
+settime(e)
+	register ENVELOPE *e;
+{
+	register char *p;
+	auto time_t now;
+	char tbuf[20];				/* holds "current" time */
+	char dbuf[30];				/* holds ctime(tbuf) */
+	register struct tm *tm;
+	extern char *arpadate();
+	extern struct tm *gmtime();
+
+	now = curtime();
+	tm = gmtime(&now);
+	(void) sprintf(tbuf, "%04d%02d%02d%02d%02d", tm->tm_year + 1900,
+			tm->tm_mon+1, tm->tm_mday, tm->tm_hour, tm->tm_min);
+	define('t', newstr(tbuf), e);
+	(void) strcpy(dbuf, ctime(&now));
+	p = strchr(dbuf, '\n');
+	if (p != NULL)
+		*p = '\0';
+	define('d', newstr(dbuf), e);
+	p = arpadate(dbuf);
+	p = newstr(p);
+	if (macvalue('a', e) == NULL)
+		define('a', p, e);
+	define('b', p, e);
+}
+/*
+**  OPENXSCRIPT -- Open transcript file
+**
+**	Creates a transcript file for possible eventual mailing or
+**	sending back.
+**
+**	Parameters:
+**		e -- the envelope to create the transcript in/for.
+**
+**	Returns:
+**		none
+**
+**	Side Effects:
+**		Creates the transcript file.
+*/
+
+#ifndef O_APPEND
+#define O_APPEND	0
+#endif
+
+void
+openxscript(e)
+	register ENVELOPE *e;
+{
+	register char *p;
+	int fd;
+
+	if (e->e_xfp != NULL)
+		return;
+	p = queuename(e, 'x');
+	fd = open(p, O_WRONLY|O_CREAT|O_APPEND, 0644);
+	if (fd < 0)
+	{
+		syserr("Can't create transcript file %s", p);
+		fd = open("/dev/null", O_WRONLY, 0644);
+		if (fd < 0)
+			syserr("!Can't open /dev/null");
+	}
+	e->e_xfp = fdopen(fd, "a");
+	if (e->e_xfp == NULL)
+	{
+		syserr("!Can't create transcript stream %s", p);
+	}
+	if (tTd(46, 9))
+	{
+		printf("openxscript(%s):\n  ", p);
+		dumpfd(fileno(e->e_xfp), TRUE, FALSE);
+	}
+}
+/*
+**  CLOSEXSCRIPT -- close the transcript file.
+**
+**	Parameters:
+**		e -- the envelope containing the transcript to close.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		none.
+*/
+
+void
+closexscript(e)
+	register ENVELOPE *e;
+{
+	if (e->e_xfp == NULL)
+		return;
+	(void) xfclose(e->e_xfp, "closexscript", e->e_id);
+	e->e_xfp = NULL;
+}
+/*
+**  SETSENDER -- set the person who this message is from
+**
+**	Under certain circumstances allow the user to say who
+**	s/he is (using -f or -r).  These are:
+**	1.  The user's uid is zero (root).
+**	2.  The user's login name is in an approved list (typically
+**	    from a network server).
+**	3.  The address the user is trying to claim has a
+**	    "!" character in it (since #2 doesn't do it for
+**	    us if we are dialing out for UUCP).
+**	A better check to replace #3 would be if the
+**	effective uid is "UUCP" -- this would require me
+**	to rewrite getpwent to "grab" uucp as it went by,
+**	make getname more nasty, do another passwd file
+**	scan, or compile the UID of "UUCP" into the code,
+**	all of which are reprehensible.
+**
+**	Assuming all of these fail, we figure out something
+**	ourselves.
+**
+**	Parameters:
+**		from -- the person we would like to believe this message
+**			is from, as specified on the command line.
+**		e -- the envelope in which we would like the sender set.
+**		delimptr -- if non-NULL, set to the location of the
+**			trailing delimiter.
+**		internal -- set if this address is coming from an internal
+**			source such as an owner alias.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		sets sendmail's notion of who the from person is.
+*/
+
+void
+setsender(from, e, delimptr, internal)
+	char *from;
+	register ENVELOPE *e;
+	char **delimptr;
+	bool internal;
+{
+	register char **pvp;
+	char *realname = NULL;
+	register struct passwd *pw;
+	char delimchar;
+	char *bp;
+	char buf[MAXNAME + 2];
+	char pvpbuf[PSBUFSIZE];
+	extern struct passwd *getpwnam();
+	extern char *FullName;
+
+	if (tTd(45, 1))
+		printf("setsender(%s)\n", from == NULL ? "" : from);
+
+	/*
+	**  Figure out the real user executing us.
+	**	Username can return errno != 0 on non-errors.
+	*/
+
+	if (bitset(EF_QUEUERUN, e->e_flags) || OpMode == MD_SMTP ||
+	    OpMode == MD_ARPAFTP || OpMode == MD_DAEMON)
+		realname = from;
+	if (realname == NULL || realname[0] == '\0')
+		realname = username();
+
+	if (ConfigLevel < 2)
+		SuprErrs = TRUE;
+
+	delimchar = internal ? '\0' : ' ';
+	e->e_from.q_flags = QBADADDR;
+	if (from == NULL ||
+	    parseaddr(from, &e->e_from, RF_COPYALL|RF_SENDERADDR,
+		      delimchar, delimptr, e) == NULL ||
+	    bitset(QBADADDR, e->e_from.q_flags) ||
+	    e->e_from.q_mailer == ProgMailer ||
+	    e->e_from.q_mailer == FileMailer ||
+	    e->e_from.q_mailer == InclMailer)
+	{
+		/* log garbage addresses for traceback */
+# ifdef LOG
+		if (from != NULL && LogLevel > 2)
+		{
+			char *p;
+			char ebuf[MAXNAME * 2 + 2];
+
+			p = macvalue('_', e);
+			if (p == NULL)
+			{
+				char *host = RealHostName;
+				if (host == NULL)
+					host = MyHostName;
+				(void) sprintf(ebuf, "%s@%s", realname, host);
+				p = ebuf;
+			}
+			syslog(LOG_NOTICE,
+				"setsender: %s: invalid or unparseable, received from %s",
+				shortenstring(from, 83), p);
+		}
+# endif /* LOG */
+		if (from != NULL)
+		{
+			if (!bitset(QBADADDR, e->e_from.q_flags))
+			{
+				/* it was a bogus mailer in the from addr */
+				usrerr("553 Invalid sender address");
+			}
+			SuprErrs = TRUE;
+		}
+		if (from == realname ||
+		    parseaddr(from = newstr(realname), &e->e_from,
+			      RF_COPYALL|RF_SENDERADDR, ' ', NULL, e) == NULL)
+		{
+			char nbuf[100];
+
+			SuprErrs = TRUE;
+			expand("\201n", nbuf, &nbuf[sizeof nbuf], e);
+			if (parseaddr(from = newstr(nbuf), &e->e_from,
+				      RF_COPYALL, ' ', NULL, e) == NULL &&
+			    parseaddr(from = "postmaster", &e->e_from,
+			    	      RF_COPYALL, ' ', NULL, e) == NULL)
+				syserr("553 setsender: can't even parse postmaster!");
+		}
+	}
+	else
+		FromFlag = TRUE;
+	e->e_from.q_flags |= QDONTSEND;
+	if (tTd(45, 5))
+	{
+		printf("setsender: QDONTSEND ");
+		printaddr(&e->e_from, FALSE);
+	}
+	SuprErrs = FALSE;
+
+	pvp = NULL;
+	if (e->e_from.q_mailer == LocalMailer)
+	{
+# ifdef USERDB
+		register char *p;
+		extern char *udbsender();
+# endif
+
+		if (!internal)
+		{
+			/* if the user has given fullname already, don't redefine */
+			if (FullName == NULL)
+				FullName = macvalue('x', e);
+			if (FullName != NULL && FullName[0] == '\0')
+				FullName = NULL;
+
+# ifdef USERDB
+			p = udbsender(e->e_from.q_user);
+
+			if (p != NULL)
+			{
+				/*
+				**  We have an alternate address for the sender
+				*/
+
+				pvp = prescan(p, '\0', pvpbuf, sizeof pvpbuf, NULL);
+			}
+# endif /* USERDB */
+		}
+
+		if ((pw = getpwnam(e->e_from.q_user)) != NULL)
+		{
+			/*
+			**  Process passwd file entry.
+			*/
+
+			/* extract home directory */
+			if (strcmp(pw->pw_dir, "/") == 0)
+				e->e_from.q_home = newstr("");
+			else
+				e->e_from.q_home = newstr(pw->pw_dir);
+			define('z', e->e_from.q_home, e);
+
+			/* extract user and group id */
+			e->e_from.q_uid = pw->pw_uid;
+			e->e_from.q_gid = pw->pw_gid;
+			e->e_from.q_flags |= QGOODUID;
+
+			/* extract full name from passwd file */
+			if (FullName == NULL && pw->pw_gecos != NULL &&
+			    strcmp(pw->pw_name, e->e_from.q_user) == 0 &&
+			    !internal)
+			{
+				buildfname(pw->pw_gecos, e->e_from.q_user, buf);
+				if (buf[0] != '\0')
+					FullName = newstr(buf);
+			}
+		}
+		if (FullName != NULL && !internal)
+			define('x', FullName, e);
+	}
+	else if (!internal && OpMode != MD_DAEMON)
+	{
+		if (e->e_from.q_home == NULL)
+		{
+			e->e_from.q_home = getenv("HOME");
+			if (e->e_from.q_home != NULL &&
+			    strcmp(e->e_from.q_home, "/") == 0)
+				e->e_from.q_home++;
+		}
+		e->e_from.q_uid = RealUid;
+		e->e_from.q_gid = RealGid;
+		e->e_from.q_flags |= QGOODUID;
+	}
+
+	/*
+	**  Rewrite the from person to dispose of possible implicit
+	**	links in the net.
+	*/
+
+	if (pvp == NULL)
+		pvp = prescan(from, delimchar, pvpbuf, sizeof pvpbuf, NULL);
+	if (pvp == NULL)
+	{
+		/* don't need to give error -- prescan did that already */
+# ifdef LOG
+		if (LogLevel > 2)
+			syslog(LOG_NOTICE, "cannot prescan from (%s)", from);
+# endif
+		finis();
+	}
+	(void) rewrite(pvp, 3, 0, e);
+	(void) rewrite(pvp, 1, 0, e);
+	(void) rewrite(pvp, 4, 0, e);
+	bp = buf + 1;
+	cataddr(pvp, NULL, bp, sizeof buf - 2, '\0');
+	if (*bp == '@')
+	{
+		/* heuristic: route-addr: add angle brackets */
+		strcat(bp, ">");
+		*--bp = '<';
+	}
+	e->e_sender = newstr(bp);
+	define('f', e->e_sender, e);
+
+	/* save the domain spec if this mailer wants it */
+	if (e->e_from.q_mailer != NULL &&
+	    bitnset(M_CANONICAL, e->e_from.q_mailer->m_flags))
+	{
+		extern char **copyplist();
+
+		while (*pvp != NULL && strcmp(*pvp, "@") != 0)
+			pvp++;
+		if (*pvp != NULL)
+			e->e_fromdomain = copyplist(pvp, TRUE);
+	}
+}
diff --git a/usr.sbin/sendmail/src/err.c b/usr.sbin/sendmail/src/err.c
new file mode 100644
index 00000000000..c6a87e9f30d
--- /dev/null
+++ b/usr.sbin/sendmail/src/err.c
@@ -0,0 +1,561 @@
+/*
+ * Copyright (c) 1983 Eric P. Allman
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)err.c	8.27 (Berkeley) 4/18/94";
+#endif /* not lint */
+
+# include "sendmail.h"
+# include <errno.h>
+# include <netdb.h>
+# include <pwd.h>
+
+/*
+**  SYSERR -- Print error message.
+**
+**	Prints an error message via printf to the diagnostic
+**	output.  If LOG is defined, it logs it also.
+**
+**	If the first character of the syserr message is `!' it will
+**	log this as an ALERT message and exit immediately.  This can
+**	leave queue files in an indeterminate state, so it should not
+**	be used lightly.
+**
+**	Parameters:
+**		f -- the format string
+**		a, b, c, d, e -- parameters
+**
+**	Returns:
+**		none
+**		Through TopFrame if QuickAbort is set.
+**
+**	Side Effects:
+**		increments Errors.
+**		sets ExitStat.
+*/
+
+char	MsgBuf[BUFSIZ*2];	/* text of most recent message */
+
+static void	fmtmsg();
+
+#if NAMED_BIND && !defined(NO_DATA)
+# define NO_DATA	NO_ADDRESS
+#endif
+
+void
+/*VARARGS1*/
+#ifdef __STDC__
+syserr(const char *fmt, ...)
+#else
+syserr(fmt, va_alist)
+	const char *fmt;
+	va_dcl
+#endif
+{
+	register char *p;
+	int olderrno = errno;
+	bool panic;
+#ifdef LOG
+	char *uname;
+	struct passwd *pw;
+	char ubuf[80];
+#endif
+	VA_LOCAL_DECL
+
+	panic = *fmt == '!';
+	if (panic)
+		fmt++;
+
+	/* format and output the error message */
+	if (olderrno == 0)
+		p = "554";
+	else
+		p = "451";
+	VA_START(fmt);
+	fmtmsg(MsgBuf, (char *) NULL, p, olderrno, fmt, ap);
+	VA_END;
+	puterrmsg(MsgBuf);
+
+	/* determine exit status if not already set */
+	if (ExitStat == EX_OK)
+	{
+		if (olderrno == 0)
+			ExitStat = EX_SOFTWARE;
+		else
+			ExitStat = EX_OSERR;
+		if (tTd(54, 1))
+			printf("syserr: ExitStat = %d\n", ExitStat);
+	}
+
+# ifdef LOG
+	pw = getpwuid(getuid());
+	if (pw != NULL)
+		uname = pw->pw_name;
+	else
+	{
+		uname = ubuf;
+		sprintf(ubuf, "UID%d", getuid());
+	}
+
+	if (LogLevel > 0)
+		syslog(panic ? LOG_ALERT : LOG_CRIT, "%s: SYSERR(%s): %s",
+			CurEnv->e_id == NULL ? "NOQUEUE" : CurEnv->e_id,
+			uname, &MsgBuf[4]);
+# endif /* LOG */
+	if (olderrno == EMFILE)
+	{
+		printopenfds(TRUE);
+		mci_dump_all(TRUE);
+	}
+	if (panic)
+	{
+#ifdef XLA
+		xla_all_end();
+#endif
+		exit(EX_OSERR);
+	}
+	errno = 0;
+	if (QuickAbort)
+		longjmp(TopFrame, 2);
+}
+/*
+**  USRERR -- Signal user error.
+**
+**	This is much like syserr except it is for user errors.
+**
+**	Parameters:
+**		fmt, a, b, c, d -- printf strings
+**
+**	Returns:
+**		none
+**		Through TopFrame if QuickAbort is set.
+**
+**	Side Effects:
+**		increments Errors.
+*/
+
+/*VARARGS1*/
+void
+#ifdef __STDC__
+usrerr(const char *fmt, ...)
+#else
+usrerr(fmt, va_alist)
+	const char *fmt;
+	va_dcl
+#endif
+{
+	VA_LOCAL_DECL
+
+	if (SuprErrs)
+		return;
+
+	VA_START(fmt);
+	fmtmsg(MsgBuf, CurEnv->e_to, "501", 0, fmt, ap);
+	VA_END;
+	puterrmsg(MsgBuf);
+
+# ifdef LOG
+	if (LogLevel > 3 && LogUsrErrs)
+		syslog(LOG_NOTICE, "%s: %s",
+			CurEnv->e_id == NULL ? "NOQUEUE" : CurEnv->e_id,
+			&MsgBuf[4]);
+# endif /* LOG */
+
+	if (QuickAbort)
+		longjmp(TopFrame, 1);
+}
+/*
+**  MESSAGE -- print message (not necessarily an error)
+**
+**	Parameters:
+**		msg -- the message (printf fmt) -- it can begin with
+**			an SMTP reply code.  If not, 050 is assumed.
+**		a, b, c, d, e -- printf arguments
+**
+**	Returns:
+**		none
+**
+**	Side Effects:
+**		none.
+*/
+
+/*VARARGS2*/
+void
+#ifdef __STDC__
+message(const char *msg, ...)
+#else
+message(msg, va_alist)
+	const char *msg;
+	va_dcl
+#endif
+{
+	VA_LOCAL_DECL
+
+	errno = 0;
+	VA_START(msg);
+	fmtmsg(MsgBuf, CurEnv->e_to, "050", 0, msg, ap);
+	VA_END;
+	putoutmsg(MsgBuf, FALSE);
+}
+/*
+**  NMESSAGE -- print message (not necessarily an error)
+**
+**	Just like "message" except it never puts the to... tag on.
+**
+**	Parameters:
+**		num -- the default ARPANET error number (in ascii)
+**		msg -- the message (printf fmt) -- if it begins
+**			with three digits, this number overrides num.
+**		a, b, c, d, e -- printf arguments
+**
+**	Returns:
+**		none
+**
+**	Side Effects:
+**		none.
+*/
+
+/*VARARGS2*/
+void
+#ifdef __STDC__
+nmessage(const char *msg, ...)
+#else
+nmessage(msg, va_alist)
+	const char *msg;
+	va_dcl
+#endif
+{
+	VA_LOCAL_DECL
+
+	errno = 0;
+	VA_START(msg);
+	fmtmsg(MsgBuf, (char *) NULL, "050", 0, msg, ap);
+	VA_END;
+	putoutmsg(MsgBuf, FALSE);
+}
+/*
+**  PUTOUTMSG -- output error message to transcript and channel
+**
+**	Parameters:
+**		msg -- message to output (in SMTP format).
+**		holdmsg -- if TRUE, don't output a copy of the message to
+**			our output channel.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		Outputs msg to the transcript.
+**		If appropriate, outputs it to the channel.
+**		Deletes SMTP reply code number as appropriate.
+*/
+
+putoutmsg(msg, holdmsg)
+	char *msg;
+	bool holdmsg;
+{
+	/* display for debugging */
+	if (tTd(54, 8))
+		printf("--- %s%s\n", msg, holdmsg ? " (held)" : "");
+
+	/* output to transcript if serious */
+	if (CurEnv->e_xfp != NULL && strchr("456", msg[0]) != NULL)
+		fprintf(CurEnv->e_xfp, "%s\n", msg);
+
+	/* output to channel if appropriate */
+	if (holdmsg || (!Verbose && msg[0] == '0'))
+		return;
+
+	/* map warnings to something SMTP can handle */
+	if (msg[0] == '6')
+		msg[0] = '5';
+
+	(void) fflush(stdout);
+
+	/* if DisConnected, OutChannel now points to the transcript */
+	if (!DisConnected &&
+	    (OpMode == MD_SMTP || OpMode == MD_DAEMON || OpMode == MD_ARPAFTP))
+		fprintf(OutChannel, "%s\r\n", msg);
+	else
+		fprintf(OutChannel, "%s\n", &msg[4]);
+	if (TrafficLogFile != NULL)
+		fprintf(TrafficLogFile, "%05d >>> %s\n", getpid(),
+			(OpMode == MD_SMTP || OpMode == MD_DAEMON) ? msg : &msg[4]);
+	if (msg[3] == ' ')
+		(void) fflush(OutChannel);
+	if (!ferror(OutChannel) || DisConnected)
+		return;
+
+	/*
+	**  Error on output -- if reporting lost channel, just ignore it.
+	**  Also, ignore errors from QUIT response (221 message) -- some
+	**	rude servers don't read result.
+	*/
+
+	if (feof(InChannel) || ferror(InChannel) || strncmp(msg, "221", 3) == 0)
+		return;
+
+	/* can't call syserr, 'cause we are using MsgBuf */
+	HoldErrs = TRUE;
+#ifdef LOG
+	if (LogLevel > 0)
+		syslog(LOG_CRIT,
+			"%s: SYSERR: putoutmsg (%s): error on output channel sending \"%s\": %s",
+			CurEnv->e_id == NULL ? "NOQUEUE" : CurEnv->e_id,
+			CurHostName == NULL ? "NO-HOST" : CurHostName,
+			msg, errstring(errno));
+#endif
+}
+/*
+**  PUTERRMSG -- like putoutmsg, but does special processing for error messages
+**
+**	Parameters:
+**		msg -- the message to output.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		Sets the fatal error bit in the envelope as appropriate.
+*/
+
+puterrmsg(msg)
+	char *msg;
+{
+	char msgcode = msg[0];
+
+	/* output the message as usual */
+	putoutmsg(msg, HoldErrs);
+
+	/* signal the error */
+	Errors++;
+	if (msgcode == '6')
+	{
+		/* notify the postmaster */
+		CurEnv->e_flags |= EF_PM_NOTIFY;
+	}
+	else if (msgcode == '5' && bitset(EF_GLOBALERRS, CurEnv->e_flags))
+	{
+		/* mark long-term fatal errors */
+		CurEnv->e_flags |= EF_FATALERRS;
+	}
+}
+/*
+**  FMTMSG -- format a message into buffer.
+**
+**	Parameters:
+**		eb -- error buffer to get result.
+**		to -- the recipient tag for this message.
+**		num -- arpanet error number.
+**		en -- the error number to display.
+**		fmt -- format of string.
+**		a, b, c, d, e -- arguments.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		none.
+*/
+
+static void
+fmtmsg(eb, to, num, eno, fmt, ap)
+	register char *eb;
+	char *to;
+	char *num;
+	int eno;
+	char *fmt;
+	va_list ap;
+{
+	char del;
+	char *meb;
+
+	/* output the reply code */
+	if (isdigit(fmt[0]) && isdigit(fmt[1]) && isdigit(fmt[2]))
+	{
+		num = fmt;
+		fmt += 4;
+	}
+	if (num[3] == '-')
+		del = '-';
+	else
+		del = ' ';
+	(void) sprintf(eb, "%3.3s%c", num, del);
+	eb += 4;
+
+	/* output the file name and line number */
+	if (FileName != NULL)
+	{
+		(void) sprintf(eb, "%s: line %d: ", FileName, LineNumber);
+		eb += strlen(eb);
+	}
+
+	/* output the "to" person */
+	if (to != NULL && to[0] != '\0')
+	{
+		(void) sprintf(eb, "%s... ", shortenstring(to, 203));
+		while (*eb != '\0')
+			*eb++ &= 0177;
+	}
+
+	meb = eb;
+
+	/* output the message */
+	(void) vsprintf(eb, fmt, ap);
+	while (*eb != '\0')
+		*eb++ &= 0177;
+
+	/* output the error code, if any */
+	if (eno != 0)
+	{
+		(void) sprintf(eb, ": %s", errstring(eno));
+		eb += strlen(eb);
+	}
+
+	if (num[0] == '5' || (CurEnv->e_message == NULL && num[0] == '4'))
+	{
+		if (CurEnv->e_message != NULL)
+			free(CurEnv->e_message);
+		CurEnv->e_message = newstr(meb);
+	}
+}
+/*
+**  ERRSTRING -- return string description of error code
+**
+**	Parameters:
+**		errnum -- the error number to translate
+**
+**	Returns:
+**		A string description of errnum.
+**
+**	Side Effects:
+**		none.
+*/
+
+const char *
+errstring(errnum)
+	int errnum;
+{
+	char *dnsmsg;
+	static char buf[MAXLINE];
+# ifndef ERRLIST_PREDEFINED
+	extern char *sys_errlist[];
+	extern int sys_nerr;
+# endif
+# ifdef SMTP
+	extern char *SmtpPhase;
+# endif /* SMTP */
+
+	/*
+	**  Handle special network error codes.
+	**
+	**	These are 4.2/4.3bsd specific; they should be in daemon.c.
+	*/
+
+	dnsmsg = NULL;
+	switch (errnum)
+	{
+# if defined(DAEMON) && defined(ETIMEDOUT)
+	  case ETIMEDOUT:
+	  case ECONNRESET:
+		(void) strcpy(buf, sys_errlist[errnum]);
+		if (SmtpPhase != NULL)
+		{
+			(void) strcat(buf, " during ");
+			(void) strcat(buf, SmtpPhase);
+		}
+		if (CurHostName != NULL)
+		{
+			(void) strcat(buf, " with ");
+			(void) strcat(buf, CurHostName);
+		}
+		return (buf);
+
+	  case EHOSTDOWN:
+		if (CurHostName == NULL)
+			break;
+		(void) sprintf(buf, "Host %s is down", CurHostName);
+		return (buf);
+
+	  case ECONNREFUSED:
+		if (CurHostName == NULL)
+			break;
+		(void) sprintf(buf, "Connection refused by %s", CurHostName);
+		return (buf);
+# endif
+
+	  case EOPENTIMEOUT:
+		return "Timeout on file open";
+
+# if NAMED_BIND
+	  case HOST_NOT_FOUND + E_DNSBASE:
+		dnsmsg = "host not found";
+		break;
+
+	  case TRY_AGAIN + E_DNSBASE:
+		dnsmsg = "host name lookup failure";
+		break;
+
+	  case NO_RECOVERY + E_DNSBASE:
+		dnsmsg = "non-recoverable error";
+		break;
+
+	  case NO_DATA + E_DNSBASE:
+		dnsmsg = "no data known";
+		break;
+# endif
+
+	  case EPERM:
+		/* SunOS gives "Not owner" -- this is the POSIX message */
+		return "Operation not permitted";
+	}
+
+	if (dnsmsg != NULL)
+	{
+		(void) strcpy(buf, "Name server: ");
+		if (CurHostName != NULL)
+		{
+			(void) strcat(buf, CurHostName);
+			(void) strcat(buf, ": ");
+		}
+		(void) strcat(buf, dnsmsg);
+		return buf;
+	}
+
+	if (errnum > 0 && errnum < sys_nerr)
+		return (sys_errlist[errnum]);
+
+	(void) sprintf(buf, "Error %d", errnum);
+	return (buf);
+}
diff --git a/usr.sbin/sendmail/src/headers.c b/usr.sbin/sendmail/src/headers.c
new file mode 100644
index 00000000000..8493e79cf7e
--- /dev/null
+++ b/usr.sbin/sendmail/src/headers.c
@@ -0,0 +1,1192 @@
+/*
+ * Copyright (c) 1983 Eric P. Allman
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)headers.c	8.32 (Berkeley) 4/14/94";
+#endif /* not lint */
+
+# include <errno.h>
+# include "sendmail.h"
+
+/*
+**  CHOMPHEADER -- process and save a header line.
+**
+**	Called by collect and by readcf to deal with header lines.
+**
+**	Parameters:
+**		line -- header as a text line.
+**		def -- if set, this is a default value.
+**		e -- the envelope including this header.
+**
+**	Returns:
+**		flags for this header.
+**
+**	Side Effects:
+**		The header is saved on the header list.
+**		Contents of 'line' are destroyed.
+*/
+
+chompheader(line, def, e)
+	char *line;
+	bool def;
+	register ENVELOPE *e;
+{
+	register char *p;
+	register HDR *h;
+	HDR **hp;
+	char *fname;
+	char *fvalue;
+	struct hdrinfo *hi;
+	bool cond = FALSE;
+	BITMAP mopts;
+	char buf[MAXNAME];
+
+	if (tTd(31, 6))
+		printf("chompheader: %s\n", line);
+
+	/* strip off options */
+	clrbitmap(mopts);
+	p = line;
+	if (*p == '?')
+	{
+		/* have some */
+		register char *q = strchr(p + 1, *p);
+		
+		if (q != NULL)
+		{
+			*q++ = '\0';
+			while (*++p != '\0')
+				setbitn(*p, mopts);
+			p = q;
+		}
+		else
+			usrerr("553 header syntax error, line \"%s\"", line);
+		cond = TRUE;
+	}
+
+	/* find canonical name */
+	fname = p;
+	while (isascii(*p) && isgraph(*p) && *p != ':')
+		p++;
+	fvalue = p;
+	while (isascii(*p) && isspace(*p))
+		p++;
+	if (*p++ != ':' || fname == fvalue)
+	{
+		syserr("553 header syntax error, line \"%s\"", line);
+		return (0);
+	}
+	*fvalue = '\0';
+	fvalue = p;
+
+	/* strip field value on front */
+	if (*fvalue == ' ')
+		fvalue++;
+
+	/* see if it is a known type */
+	for (hi = HdrInfo; hi->hi_field != NULL; hi++)
+	{
+		if (strcasecmp(hi->hi_field, fname) == 0)
+			break;
+	}
+
+	if (tTd(31, 9))
+	{
+		if (hi->hi_field == NULL)
+			printf("no header match\n");
+		else
+			printf("header match, hi_flags=%o\n", hi->hi_flags);
+	}
+
+	/* see if this is a resent message */
+	if (!def && bitset(H_RESENT, hi->hi_flags))
+		e->e_flags |= EF_RESENT;
+
+	/* if this means "end of header" quit now */
+	if (bitset(H_EOH, hi->hi_flags))
+		return (hi->hi_flags);
+
+	/*
+	**  Drop explicit From: if same as what we would generate.
+	**  This is to make MH (which doesn't always give a full name)
+	**  insert the full name information in all circumstances.
+	*/
+
+	p = "resent-from";
+	if (!bitset(EF_RESENT, e->e_flags))
+		p += 7;
+	if (!def && !bitset(EF_QUEUERUN, e->e_flags) && strcasecmp(fname, p) == 0)
+	{
+		if (tTd(31, 2))
+		{
+			printf("comparing header from (%s) against default (%s or %s)\n",
+				fvalue, e->e_from.q_paddr, e->e_from.q_user);
+		}
+		if (e->e_from.q_paddr != NULL &&
+		    (strcmp(fvalue, e->e_from.q_paddr) == 0 ||
+		     strcmp(fvalue, e->e_from.q_user) == 0))
+			return (hi->hi_flags);
+#ifdef MAYBENEXTRELEASE		/* XXX UNTESTED XXX UNTESTED XXX UNTESTED XXX */
+#ifdef USERDB
+		else
+		{
+			auto ADDRESS a;
+			char *fancy;
+			bool oldSuprErrs = SuprErrs;
+			extern char *crackaddr();
+			extern char *udbsender();
+
+			/*
+			**  Try doing USERDB rewriting even on fully commented
+			**  names; this saves the "comment" information (such
+			**  as full name) and rewrites the electronic part.
+			**
+			** XXX	This code doesn't belong here -- parsing should
+			** XXX	not be done during collect() phase because
+			** XXX	error messages can confuse the SMTP phase.
+			** XXX	Setting SuprErrs is a crude hack around this
+			** XXX	problem.
+			*/
+
+			if (OpMode == MD_SMTP || OpMode == MD_ARPAFTP)
+				SuprErrs = TRUE;
+			fancy = crackaddr(fvalue);
+			if (parseaddr(fvalue, &a, RF_COPYNONE, '\0', NULL, e) != NULL &&
+			    a.q_mailer == LocalMailer &&
+			    (p = udbsender(a.q_user)) != NULL)
+			{
+				char *oldg = macvalue('g', e);
+
+				define('g', p, e);
+				expand(fancy, buf, &buf[sizeof buf], e);
+				define('g', oldg, e);
+				fvalue = buf;
+			}
+			SuprErrs = oldSuprErrs;
+		}
+#endif
+#endif
+	}
+
+	/* delete default value for this header */
+	for (hp = &e->e_header; (h = *hp) != NULL; hp = &h->h_link)
+	{
+		if (strcasecmp(fname, h->h_field) == 0 &&
+		    bitset(H_DEFAULT, h->h_flags) &&
+		    !bitset(H_FORCE, h->h_flags))
+			h->h_value = NULL;
+	}
+
+	/* create a new node */
+	h = (HDR *) xalloc(sizeof *h);
+	h->h_field = newstr(fname);
+	h->h_value = newstr(fvalue);
+	h->h_link = NULL;
+	bcopy((char *) mopts, (char *) h->h_mflags, sizeof mopts);
+	*hp = h;
+	h->h_flags = hi->hi_flags;
+	if (def)
+		h->h_flags |= H_DEFAULT;
+	if (cond)
+		h->h_flags |= H_CHECK;
+
+	/* hack to see if this is a new format message */
+	if (!def && bitset(H_RCPT|H_FROM, h->h_flags) &&
+	    (strchr(fvalue, ',') != NULL || strchr(fvalue, '(') != NULL ||
+	     strchr(fvalue, '<') != NULL || strchr(fvalue, ';') != NULL))
+	{
+		e->e_flags &= ~EF_OLDSTYLE;
+	}
+
+	return (h->h_flags);
+}
+/*
+**  ADDHEADER -- add a header entry to the end of the queue.
+**
+**	This bypasses the special checking of chompheader.
+**
+**	Parameters:
+**		field -- the name of the header field.
+**		value -- the value of the field.
+**		e -- the envelope to add them to.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		adds the field on the list of headers for this envelope.
+*/
+
+addheader(field, value, e)
+	char *field;
+	char *value;
+	ENVELOPE *e;
+{
+	register HDR *h;
+	register struct hdrinfo *hi;
+	HDR **hp;
+
+	/* find info struct */
+	for (hi = HdrInfo; hi->hi_field != NULL; hi++)
+	{
+		if (strcasecmp(field, hi->hi_field) == 0)
+			break;
+	}
+
+	/* find current place in list -- keep back pointer? */
+	for (hp = &e->e_header; (h = *hp) != NULL; hp = &h->h_link)
+	{
+		if (strcasecmp(field, h->h_field) == 0)
+			break;
+	}
+
+	/* allocate space for new header */
+	h = (HDR *) xalloc(sizeof *h);
+	h->h_field = field;
+	h->h_value = newstr(value);
+	h->h_link = *hp;
+	h->h_flags = hi->hi_flags | H_DEFAULT;
+	clrbitmap(h->h_mflags);
+	*hp = h;
+}
+/*
+**  HVALUE -- return value of a header.
+**
+**	Only "real" fields (i.e., ones that have not been supplied
+**	as a default) are used.
+**
+**	Parameters:
+**		field -- the field name.
+**		e -- the envelope containing the header.
+**
+**	Returns:
+**		pointer to the value part.
+**		NULL if not found.
+**
+**	Side Effects:
+**		none.
+*/
+
+char *
+hvalue(field, e)
+	char *field;
+	register ENVELOPE *e;
+{
+	register HDR *h;
+
+	for (h = e->e_header; h != NULL; h = h->h_link)
+	{
+		if (!bitset(H_DEFAULT, h->h_flags) &&
+		    strcasecmp(h->h_field, field) == 0)
+			return (h->h_value);
+	}
+	return (NULL);
+}
+/*
+**  ISHEADER -- predicate telling if argument is a header.
+**
+**	A line is a header if it has a single word followed by
+**	optional white space followed by a colon.
+**
+**	Parameters:
+**		s -- string to check for possible headerness.
+**
+**	Returns:
+**		TRUE if s is a header.
+**		FALSE otherwise.
+**
+**	Side Effects:
+**		none.
+*/
+
+bool
+isheader(s)
+	register char *s;
+{
+	while (*s > ' ' && *s != ':' && *s != '\0')
+		s++;
+
+	/* following technically violates RFC822 */
+	while (isascii(*s) && isspace(*s))
+		s++;
+
+	return (*s == ':');
+}
+/*
+**  EATHEADER -- run through the stored header and extract info.
+**
+**	Parameters:
+**		e -- the envelope to process.
+**		full -- if set, do full processing (e.g., compute
+**			message priority).
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		Sets a bunch of global variables from information
+**			in the collected header.
+**		Aborts the message if the hop count is exceeded.
+*/
+
+eatheader(e, full)
+	register ENVELOPE *e;
+	bool full;
+{
+	register HDR *h;
+	register char *p;
+	int hopcnt = 0;
+	char *msgid;
+	char buf[MAXLINE];
+
+	/*
+	**  Set up macros for possible expansion in headers.
+	*/
+
+	define('f', e->e_sender, e);
+	define('g', e->e_sender, e);
+	if (e->e_origrcpt != NULL && *e->e_origrcpt != '\0')
+		define('u', e->e_origrcpt, e);
+	else
+		define('u', NULL, e);
+
+	/* full name of from person */
+	p = hvalue("full-name", e);
+	if (p != NULL)
+		define('x', p, e);
+
+	if (tTd(32, 1))
+		printf("----- collected header -----\n");
+	msgid = "<none>";
+	for (h = e->e_header; h != NULL; h = h->h_link)
+	{
+		if (h->h_value == NULL)
+		{
+			if (tTd(32, 1))
+				printf("%s: <NULL>\n", h->h_field);
+			continue;
+		}
+
+		/* do early binding */
+		if (bitset(H_DEFAULT, h->h_flags))
+		{
+			expand(h->h_value, buf, &buf[sizeof buf], e);
+			if (buf[0] != '\0')
+			{
+				h->h_value = newstr(buf);
+				h->h_flags &= ~H_DEFAULT;
+			}
+		}
+
+		if (tTd(32, 1))
+		{
+			printf("%s: ", h->h_field);
+			xputs(h->h_value);
+			printf("\n");
+		}
+
+		/* count the number of times it has been processed */
+		if (bitset(H_TRACE, h->h_flags))
+			hopcnt++;
+
+		/* send to this person if we so desire */
+		if (GrabTo && bitset(H_RCPT, h->h_flags) &&
+		    !bitset(H_DEFAULT, h->h_flags) &&
+		    (!bitset(EF_RESENT, e->e_flags) || bitset(H_RESENT, h->h_flags)))
+		{
+			int saveflags = e->e_flags;
+
+			(void) sendtolist(h->h_value, NULLADDR,
+					  &e->e_sendqueue, e);
+
+			/* delete fatal errors generated by this address */
+			if (!GrabTo && !bitset(EF_FATALERRS, saveflags))
+				e->e_flags &= ~EF_FATALERRS;
+		}
+
+		/* save the message-id for logging */
+		if (full && strcasecmp(h->h_field, "message-id") == 0)
+		{
+			msgid = h->h_value;
+			while (isascii(*msgid) && isspace(*msgid))
+				msgid++;
+		}
+
+		/* see if this is a return-receipt header */
+		if (bitset(H_RECEIPTTO, h->h_flags))
+			e->e_receiptto = h->h_value;
+
+		/* see if this is an errors-to header */
+		if (UseErrorsTo && bitset(H_ERRORSTO, h->h_flags))
+			(void) sendtolist(h->h_value, NULLADDR,
+					  &e->e_errorqueue, e);
+	}
+	if (tTd(32, 1))
+		printf("----------------------------\n");
+
+	/* if we are just verifying (that is, sendmail -t -bv), drop out now */
+	if (OpMode == MD_VERIFY)
+		return;
+
+	/* store hop count */
+	if (hopcnt > e->e_hopcount)
+		e->e_hopcount = hopcnt;
+
+	/* message priority */
+	p = hvalue("precedence", e);
+	if (p != NULL)
+		e->e_class = priencode(p);
+	if (full)
+		e->e_msgpriority = e->e_msgsize
+				 - e->e_class * WkClassFact
+				 + e->e_nrcpts * WkRecipFact;
+
+	/* date message originated */
+	p = hvalue("posted-date", e);
+	if (p == NULL)
+		p = hvalue("date", e);
+	if (p != NULL)
+		define('a', p, e);
+
+	/*
+	**  From person in antiquated ARPANET mode
+	**	required by UK Grey Book e-mail gateways (sigh)
+	*/
+
+	if (OpMode == MD_ARPAFTP)
+	{
+		register struct hdrinfo *hi;
+
+		for (hi = HdrInfo; hi->hi_field != NULL; hi++)
+		{
+			if (bitset(H_FROM, hi->hi_flags) &&
+			    (!bitset(H_RESENT, hi->hi_flags) ||
+			     bitset(EF_RESENT, e->e_flags)) &&
+			    (p = hvalue(hi->hi_field, e)) != NULL)
+				break;
+		}
+		if (hi->hi_field != NULL)
+		{
+			if (tTd(32, 2))
+				printf("eatheader: setsender(*%s == %s)\n",
+					hi->hi_field, p);
+			setsender(p, e, NULL, TRUE);
+		}
+	}
+
+	/*
+	**  Log collection information.
+	*/
+
+# ifdef LOG
+	if (full && LogLevel > 4)
+		logsender(e, msgid);
+# endif /* LOG */
+	e->e_flags &= ~EF_LOGSENDER;
+}
+/*
+**  LOGSENDER -- log sender information
+**
+**	Parameters:
+**		e -- the envelope to log
+**		msgid -- the message id
+**
+**	Returns:
+**		none
+*/
+
+logsender(e, msgid)
+	register ENVELOPE *e;
+	char *msgid;
+{
+# ifdef LOG
+	char *name;
+	register char *sbp;
+	register char *p;
+	char hbuf[MAXNAME];
+	char sbuf[MAXLINE];
+
+	if (bitset(EF_RESPONSE, e->e_flags))
+		name = "[RESPONSE]";
+	else if ((name = macvalue('_', e)) != NULL)
+		;
+	else if (RealHostName == NULL)
+		name = "localhost";
+	else if (RealHostName[0] == '[')
+		name = RealHostName;
+	else
+	{
+		name = hbuf;
+		(void) sprintf(hbuf, "%.80s", RealHostName);
+		if (RealHostAddr.sa.sa_family != 0)
+		{
+			p = &hbuf[strlen(hbuf)];
+			(void) sprintf(p, " (%s)",
+				anynet_ntoa(&RealHostAddr));
+		}
+	}
+
+	/* some versions of syslog only take 5 printf args */
+#  if (SYSLOG_BUFSIZE) >= 256
+	sbp = sbuf;
+	sprintf(sbp, "from=%.200s, size=%ld, class=%d, pri=%ld, nrcpts=%d",
+	    e->e_from.q_paddr, e->e_msgsize, e->e_class,
+	    e->e_msgpriority, e->e_nrcpts);
+	sbp += strlen(sbp);
+	if (msgid != NULL)
+	{
+		sprintf(sbp, ", msgid=%.100s", msgid);
+		sbp += strlen(sbp);
+	}
+	if (e->e_bodytype != NULL)
+	{
+		(void) sprintf(sbp, ", bodytype=%.20s", e->e_bodytype);
+		sbp += strlen(sbp);
+	}
+	p = macvalue('r', e);
+	if (p != NULL)
+		(void) sprintf(sbp, ", proto=%.20s", p);
+	syslog(LOG_INFO, "%s: %s, relay=%s",
+	    e->e_id, sbuf, name);
+
+#  else			/* short syslog buffer */
+
+	syslog(LOG_INFO, "%s: from=%s",
+		e->e_id, shortenstring(e->e_from.q_paddr, 83));
+	syslog(LOG_INFO, "%s: size=%ld, class=%ld, pri=%ld, nrcpts=%d",
+		e->e_id, e->e_msgsize, e->e_class,
+		e->e_msgpriority, e->e_nrcpts);
+	if (msgid != NULL)
+		syslog(LOG_INFO, "%s: msgid=%s", e->e_id, msgid);
+	sbp = sbuf;
+	sprintf(sbp, "%s:", e->e_id);
+	sbp += strlen(sbp);
+	if (e->e_bodytype != NULL)
+	{
+		sprintf(sbp, " bodytype=%s,", e->e_bodytype);
+		sbp += strlen(sbp);
+	}
+	p = macvalue('r', e);
+	if (p != NULL)
+	{
+		sprintf(sbp, " proto=%s,", p);
+		sbp += strlen(sbp);
+	}
+	syslog(LOG_INFO, "%s relay=%s", sbuf, name);
+#  endif
+# endif
+}
+/*
+**  PRIENCODE -- encode external priority names into internal values.
+**
+**	Parameters:
+**		p -- priority in ascii.
+**
+**	Returns:
+**		priority as a numeric level.
+**
+**	Side Effects:
+**		none.
+*/
+
+priencode(p)
+	char *p;
+{
+	register int i;
+
+	for (i = 0; i < NumPriorities; i++)
+	{
+		if (!strcasecmp(p, Priorities[i].pri_name))
+			return (Priorities[i].pri_val);
+	}
+
+	/* unknown priority */
+	return (0);
+}
+/*
+**  CRACKADDR -- parse an address and turn it into a macro
+**
+**	This doesn't actually parse the address -- it just extracts
+**	it and replaces it with "$g".  The parse is totally ad hoc
+**	and isn't even guaranteed to leave something syntactically
+**	identical to what it started with.  However, it does leave
+**	something semantically identical.
+**
+**	This algorithm has been cleaned up to handle a wider range
+**	of cases -- notably quoted and backslash escaped strings.
+**	This modification makes it substantially better at preserving
+**	the original syntax.
+**
+**	Parameters:
+**		addr -- the address to be cracked.
+**
+**	Returns:
+**		a pointer to the new version.
+**
+**	Side Effects:
+**		none.
+**
+**	Warning:
+**		The return value is saved in local storage and should
+**		be copied if it is to be reused.
+*/
+
+char *
+crackaddr(addr)
+	register char *addr;
+{
+	register char *p;
+	register char c;
+	int cmtlev;
+	int realcmtlev;
+	int anglelev, realanglelev;
+	int copylev;
+	bool qmode;
+	bool realqmode;
+	bool skipping;
+	bool putgmac = FALSE;
+	bool quoteit = FALSE;
+	bool gotangle = FALSE;
+	register char *bp;
+	char *buflim;
+	static char buf[MAXNAME];
+
+	if (tTd(33, 1))
+		printf("crackaddr(%s)\n", addr);
+
+	/* strip leading spaces */
+	while (*addr != '\0' && isascii(*addr) && isspace(*addr))
+		addr++;
+
+	/*
+	**  Start by assuming we have no angle brackets.  This will be
+	**  adjusted later if we find them.
+	*/
+
+	bp = buf;
+	buflim = &buf[sizeof buf - 5];
+	p = addr;
+	copylev = anglelev = realanglelev = cmtlev = realcmtlev = 0;
+	qmode = realqmode = FALSE;
+
+	while ((c = *p++) != '\0')
+	{
+		/*
+		**  If the buffer is overful, go into a special "skipping"
+		**  mode that tries to keep legal syntax but doesn't actually
+		**  output things.
+		*/
+
+		skipping = bp >= buflim;
+
+		if (copylev > 0 && !skipping)
+			*bp++ = c;
+
+		/* check for backslash escapes */
+		if (c == '\\')
+		{
+			/* arrange to quote the address */
+			if (cmtlev <= 0 && !qmode)
+				quoteit = TRUE;
+
+			if ((c = *p++) == '\0')
+			{
+				/* too far */
+				p--;
+				goto putg;
+			}
+			if (copylev > 0 && !skipping)
+				*bp++ = c;
+			goto putg;
+		}
+
+		/* check for quoted strings */
+		if (c == '"' && cmtlev <= 0)
+		{
+			qmode = !qmode;
+			if (copylev > 0 && !skipping)
+				realqmode = !realqmode;
+			continue;
+		}
+		if (qmode)
+			goto putg;
+
+		/* check for comments */
+		if (c == '(')
+		{
+			cmtlev++;
+
+			/* allow space for closing paren */
+			if (!skipping)
+			{
+				buflim--;
+				realcmtlev++;
+				if (copylev++ <= 0)
+				{
+					*bp++ = ' ';
+					*bp++ = c;
+				}
+			}
+		}
+		if (cmtlev > 0)
+		{
+			if (c == ')')
+			{
+				cmtlev--;
+				copylev--;
+				if (!skipping)
+				{
+					realcmtlev--;
+					buflim++;
+				}
+			}
+			continue;
+		}
+		else if (c == ')')
+		{
+			/* syntax error: unmatched ) */
+			if (copylev > 0 && !skipping)
+				bp--;
+		}
+
+		/* check for characters that may have to be quoted */
+		if (strchr(".'@,;:\\()[]", c) != NULL)
+		{
+			/*
+			**  If these occur as the phrase part of a <>
+			**  construct, but are not inside of () or already
+			**  quoted, they will have to be quoted.  Note that
+			**  now (but don't actually do the quoting).
+			*/
+
+			if (cmtlev <= 0 && !qmode)
+				quoteit = TRUE;
+		}
+
+		/* check for angle brackets */
+		if (c == '<')
+		{
+			register char *q;
+
+			/* assume first of two angles is bogus */
+			if (gotangle)
+				quoteit = TRUE;
+			gotangle = TRUE;
+
+			/* oops -- have to change our mind */
+			anglelev = 1;
+			if (!skipping)
+				realanglelev = 1;
+
+			bp = buf;
+			if (quoteit)
+			{
+				*bp++ = '"';
+
+				/* back up over the '<' and any spaces */
+				--p;
+				while (isascii(*--p) && isspace(*p))
+					continue;
+				p++;
+			}
+			for (q = addr; q < p; )
+			{
+				c = *q++;
+				if (bp < buflim)
+				{
+					if (quoteit && c == '"')
+						*bp++ = '\\';
+					*bp++ = c;
+				}
+			}
+			if (quoteit)
+			{
+				if (bp == &buf[1])
+					bp--;
+				else
+					*bp++ = '"';
+				while ((c = *p++) != '<')
+				{
+					if (bp < buflim)
+						*bp++ = c;
+				}
+				*bp++ = c;
+			}
+			copylev = 0;
+			putgmac = quoteit = FALSE;
+			continue;
+		}
+
+		if (c == '>')
+		{
+			if (anglelev > 0)
+			{
+				anglelev--;
+				if (!skipping)
+				{
+					realanglelev--;
+					buflim++;
+				}
+			}
+			else if (!skipping)
+			{
+				/* syntax error: unmatched > */
+				if (copylev > 0)
+					bp--;
+				quoteit = TRUE;
+				continue;
+			}
+			if (copylev++ <= 0)
+				*bp++ = c;
+			continue;
+		}
+
+		/* must be a real address character */
+	putg:
+		if (copylev <= 0 && !putgmac)
+		{
+			*bp++ = MACROEXPAND;
+			*bp++ = 'g';
+			putgmac = TRUE;
+		}
+	}
+
+	/* repair any syntactic damage */
+	if (realqmode)
+		*bp++ = '"';
+	while (realcmtlev-- > 0)
+		*bp++ = ')';
+	while (realanglelev-- > 0)
+		*bp++ = '>';
+	*bp++ = '\0';
+
+	if (tTd(33, 1))
+		printf("crackaddr=>`%s'\n", buf);
+
+	return (buf);
+}
+/*
+**  PUTHEADER -- put the header part of a message from the in-core copy
+**
+**	Parameters:
+**		mci -- the connection information.
+**		e -- envelope to use.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		none.
+*/
+
+/*
+ * Macro for fast max (not available in e.g. DG/UX, 386/ix).
+ */
+#ifndef MAX
+# define MAX(a,b) (((a)>(b))?(a):(b))
+#endif
+
+putheader(mci, e)
+	register MCI *mci;
+	register ENVELOPE *e;
+{
+	char buf[MAX(MAXLINE,BUFSIZ)];
+	register HDR *h;
+	char obuf[MAXLINE];
+
+	if (tTd(34, 1))
+		printf("--- putheader, mailer = %s ---\n",
+			mci->mci_mailer->m_name);
+
+	for (h = e->e_header; h != NULL; h = h->h_link)
+	{
+		register char *p;
+		extern bool bitintersect();
+
+		if (tTd(34, 11))
+		{
+			printf("  %s: ", h->h_field);
+			xputs(h->h_value);
+		}
+
+		if (bitset(H_CHECK|H_ACHECK, h->h_flags) &&
+		    !bitintersect(h->h_mflags, mci->mci_mailer->m_flags))
+		{
+			if (tTd(34, 11))
+				printf(" (skipped)\n");
+			continue;
+		}
+
+		/* handle Resent-... headers specially */
+		if (bitset(H_RESENT, h->h_flags) && !bitset(EF_RESENT, e->e_flags))
+		{
+			if (tTd(34, 11))
+				printf(" (skipped (resent))\n");
+			continue;
+		}
+
+		/* suppress return receipts if requested */
+		if (bitset(H_RECEIPTTO, h->h_flags) &&
+		    bitset(EF_NORECEIPT, e->e_flags))
+		{
+			if (tTd(34, 11))
+				printf(" (skipped (receipt))\n");
+			continue;
+		}
+
+		/* macro expand value if generated internally */
+		p = h->h_value;
+		if (bitset(H_DEFAULT, h->h_flags))
+		{
+			expand(p, buf, &buf[sizeof buf], e);
+			p = buf;
+			if (p == NULL || *p == '\0')
+			{
+				if (tTd(34, 11))
+					printf(" (skipped -- null value)\n");
+				continue;
+			}
+		}
+
+		if (tTd(34, 11))
+			printf("\n");
+
+		if (bitset(H_FROM|H_RCPT, h->h_flags))
+		{
+			/* address field */
+			bool oldstyle = bitset(EF_OLDSTYLE, e->e_flags);
+
+			if (bitset(H_FROM, h->h_flags))
+				oldstyle = FALSE;
+			commaize(h, p, oldstyle, mci, e);
+		}
+		else
+		{
+			/* vanilla header line */
+			register char *nlp;
+
+			(void) sprintf(obuf, "%s: ", h->h_field);
+			while ((nlp = strchr(p, '\n')) != NULL)
+			{
+				*nlp = '\0';
+				(void) strcat(obuf, p);
+				*nlp = '\n';
+				putline(obuf, mci);
+				p = ++nlp;
+				obuf[0] = '\0';
+			}
+			(void) strcat(obuf, p);
+			putline(obuf, mci);
+		}
+	}
+}
+/*
+**  COMMAIZE -- output a header field, making a comma-translated list.
+**
+**	Parameters:
+**		h -- the header field to output.
+**		p -- the value to put in it.
+**		oldstyle -- TRUE if this is an old style header.
+**		mci -- the connection information.
+**		e -- the envelope containing the message.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		outputs "p" to file "fp".
+*/
+
+void
+commaize(h, p, oldstyle, mci, e)
+	register HDR *h;
+	register char *p;
+	bool oldstyle;
+	register MCI *mci;
+	register ENVELOPE *e;
+{
+	register char *obp;
+	int opos;
+	int omax;
+	bool firstone = TRUE;
+	char obuf[MAXLINE + 3];
+
+	/*
+	**  Output the address list translated by the
+	**  mailer and with commas.
+	*/
+
+	if (tTd(14, 2))
+		printf("commaize(%s: %s)\n", h->h_field, p);
+
+	obp = obuf;
+	(void) sprintf(obp, "%s: ", h->h_field);
+	opos = strlen(h->h_field) + 2;
+	obp += opos;
+	omax = mci->mci_mailer->m_linelimit - 2;
+	if (omax < 0 || omax > 78)
+		omax = 78;
+
+	/*
+	**  Run through the list of values.
+	*/
+
+	while (*p != '\0')
+	{
+		register char *name;
+		register int c;
+		char savechar;
+		int flags;
+		auto int stat;
+
+		/*
+		**  Find the end of the name.  New style names
+		**  end with a comma, old style names end with
+		**  a space character.  However, spaces do not
+		**  necessarily delimit an old-style name -- at
+		**  signs mean keep going.
+		*/
+
+		/* find end of name */
+		while ((isascii(*p) && isspace(*p)) || *p == ',')
+			p++;
+		name = p;
+		for (;;)
+		{
+			auto char *oldp;
+			char pvpbuf[PSBUFSIZE];
+
+			(void) prescan(p, oldstyle ? ' ' : ',', pvpbuf,
+				       sizeof pvpbuf, &oldp);
+			p = oldp;
+
+			/* look to see if we have an at sign */
+			while (*p != '\0' && isascii(*p) && isspace(*p))
+				p++;
+
+			if (*p != '@')
+			{
+				p = oldp;
+				break;
+			}
+			p += *p == '@' ? 1 : 2;
+			while (*p != '\0' && isascii(*p) && isspace(*p))
+				p++;
+		}
+		/* at the end of one complete name */
+
+		/* strip off trailing white space */
+		while (p >= name &&
+		       ((isascii(*p) && isspace(*p)) || *p == ',' || *p == '\0'))
+			p--;
+		if (++p == name)
+			continue;
+		savechar = *p;
+		*p = '\0';
+
+		/* translate the name to be relative */
+		flags = RF_HEADERADDR|RF_ADDDOMAIN;
+		if (bitset(H_FROM, h->h_flags))
+			flags |= RF_SENDERADDR;
+		stat = EX_OK;
+		name = remotename(name, mci->mci_mailer, flags, &stat, e);
+		if (*name == '\0')
+		{
+			*p = savechar;
+			continue;
+		}
+
+		/* output the name with nice formatting */
+		opos += strlen(name);
+		if (!firstone)
+			opos += 2;
+		if (opos > omax && !firstone)
+		{
+			(void) strcpy(obp, ",\n");
+			putline(obuf, mci);
+			obp = obuf;
+			(void) strcpy(obp, "        ");
+			opos = strlen(obp);
+			obp += opos;
+			opos += strlen(name);
+		}
+		else if (!firstone)
+		{
+			(void) strcpy(obp, ", ");
+			obp += 2;
+		}
+
+		while ((c = *name++) != '\0' && obp < &obuf[MAXLINE])
+			*obp++ = c;
+		firstone = FALSE;
+		*p = savechar;
+	}
+	(void) strcpy(obp, "\n");
+	putline(obuf, mci);
+}
+/*
+**  COPYHEADER -- copy header list
+**
+**	This routine is the equivalent of newstr for header lists
+**
+**	Parameters:
+**		header -- list of header structures to copy.
+**
+**	Returns:
+**		a copy of 'header'.
+**
+**	Side Effects:
+**		none.
+*/
+
+HDR *
+copyheader(header)
+	register HDR *header;
+{
+	register HDR *newhdr;
+	HDR *ret;
+	register HDR **tail = &ret;
+
+	while (header != NULL)
+	{
+		newhdr = (HDR *) xalloc(sizeof(HDR));
+		STRUCTCOPY(*header, *newhdr);
+		*tail = newhdr;
+		tail = &newhdr->h_link;
+		header = header->h_link;
+	}
+	*tail = NULL;
+	
+	return ret;
+}
diff --git a/usr.sbin/sendmail/src/macro.c b/usr.sbin/sendmail/src/macro.c
new file mode 100644
index 00000000000..8a8a90b4f0f
--- /dev/null
+++ b/usr.sbin/sendmail/src/macro.c
@@ -0,0 +1,279 @@
+/*
+ * Copyright (c) 1983 Eric P. Allman
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)macro.c	8.3 (Berkeley) 2/7/94";
+#endif /* not lint */
+
+# include "sendmail.h"
+
+/*
+**  EXPAND -- macro expand a string using $x escapes.
+**
+**	Parameters:
+**		s -- the string to expand.
+**		buf -- the place to put the expansion.
+**		buflim -- the buffer limit, i.e., the address
+**			of the last usable position in buf.
+**		e -- envelope in which to work.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		none.
+*/
+
+void
+expand(s, buf, buflim, e)
+	register char *s;
+	register char *buf;
+	char *buflim;
+	register ENVELOPE *e;
+{
+	register char *xp;
+	register char *q;
+	bool skipping;		/* set if conditionally skipping output */
+	bool recurse = FALSE;	/* set if recursion required */
+	int i;
+	int iflev;		/* if nesting level */
+	char xbuf[BUFSIZ];
+
+	if (tTd(35, 24))
+	{
+		printf("expand(");
+		xputs(s);
+		printf(")\n");
+	}
+
+	skipping = FALSE;
+	iflev = 0;
+	if (s == NULL)
+		s = "";
+	for (xp = xbuf; *s != '\0'; s++)
+	{
+		int c;
+
+		/*
+		**  Check for non-ordinary (special?) character.
+		**	'q' will be the interpolated quantity.
+		*/
+
+		q = NULL;
+		c = *s;
+		switch (c & 0377)
+		{
+		  case CONDIF:		/* see if var set */
+			c = *++s;
+			if (skipping)
+				iflev++;
+			else
+				skipping = macvalue(c, e) == NULL;
+			continue;
+
+		  case CONDELSE:	/* change state of skipping */
+			if (iflev == 0)
+				skipping = !skipping;
+			continue;
+
+		  case CONDFI:		/* stop skipping */
+			if (iflev == 0)
+				skipping = FALSE;
+			if (skipping)
+				iflev--;
+			continue;
+
+		  case MACROEXPAND:	/* macro interpolation */
+			c = *++s & 0177;
+			if (c != '\0')
+				q = macvalue(c, e);
+			else
+			{
+				s--;
+				q = NULL;
+			}
+			if (q == NULL)
+				continue;
+			break;
+		}
+
+		/*
+		**  Interpolate q or output one character
+		*/
+
+		if (skipping || xp >= &xbuf[sizeof xbuf])
+			continue;
+		if (q == NULL)
+			*xp++ = c;
+		else
+		{
+			/* copy to end of q or max space remaining in buf */
+			while ((c = *q++) != '\0' && xp < &xbuf[sizeof xbuf - 1])
+			{
+				/* check for any sendmail metacharacters */
+				if ((c & 0340) == 0200)
+					recurse = TRUE;
+				*xp++ = c;
+			}
+		}
+	}
+	*xp = '\0';
+
+	if (tTd(35, 24))
+	{
+		printf("expand ==> ");
+		xputs(xbuf);
+		printf("\n");
+	}
+
+	/* recurse as appropriate */
+	if (recurse)
+	{
+		expand(xbuf, buf, buflim, e);
+		return;
+	}
+
+	/* copy results out */
+	i = buflim - buf - 1;
+	if (i > xp - xbuf)
+		i = xp - xbuf;
+	bcopy(xbuf, buf, i);
+	buf[i] = '\0';
+}
+/*
+**  DEFINE -- define a macro.
+**
+**	this would be better done using a #define macro.
+**
+**	Parameters:
+**		n -- the macro name.
+**		v -- the macro value.
+**		e -- the envelope to store the definition in.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		e->e_macro[n] is defined.
+**
+**	Notes:
+**		There is one macro for each ASCII character,
+**		although they are not all used.  The currently
+**		defined macros are:
+**
+**		$a   date in ARPANET format (preferring the Date: line
+**		     of the message)
+**		$b   the current date (as opposed to the date as found
+**		     the message) in ARPANET format
+**		$c   hop count
+**		$d   (current) date in UNIX (ctime) format
+**		$e   the SMTP entry message+
+**		$f   raw from address
+**		$g   translated from address
+**		$h   to host
+**		$i   queue id
+**		$j   official SMTP hostname, used in messages+
+**		$k   UUCP node name
+**		$l   UNIX-style from line+
+**		$m   The domain part of our full name.
+**		$n   name of sendmail ("MAILER-DAEMON" on local
+**		     net typically)+
+**		$o   delimiters ("operators") for address tokens+
+**		$p   my process id in decimal
+**		$q   the string that becomes an address -- this is
+**		     normally used to combine $g & $x.
+**		$r   protocol used to talk to sender
+**		$s   sender's host name
+**		$t   the current time in seconds since 1/1/1970
+**		$u   to user
+**		$v   version number of sendmail
+**		$w   our host name (if it can be determined)
+**		$x   signature (full name) of from person
+**		$y   the tty id of our terminal
+**		$z   home directory of to person
+**		$_   RFC1413 authenticated sender address
+**
+**		Macros marked with + must be defined in the
+**		configuration file and are used internally, but
+**		are not set.
+**
+**		There are also some macros that can be used
+**		arbitrarily to make the configuration file
+**		cleaner.  In general all upper-case letters
+**		are available.
+*/
+
+void
+define(n, v, e)
+	int n;
+	char *v;
+	register ENVELOPE *e;
+{
+	if (tTd(35, 9))
+	{
+		printf("define(%c as ", n);
+		xputs(v);
+		printf(")\n");
+	}
+	e->e_macro[n & 0177] = v;
+}
+/*
+**  MACVALUE -- return uninterpreted value of a macro.
+**
+**	Parameters:
+**		n -- the name of the macro.
+**
+**	Returns:
+**		The value of n.
+**
+**	Side Effects:
+**		none.
+*/
+
+char *
+macvalue(n, e)
+	int n;
+	register ENVELOPE *e;
+{
+	n &= 0177;
+	while (e != NULL)
+	{
+		register char *p = e->e_macro[n];
+
+		if (p != NULL)
+			return (p);
+		e = e->e_parent;
+	}
+	return (NULL);
+}
diff --git a/usr.sbin/sendmail/src/mailq.1 b/usr.sbin/sendmail/src/mailq.1
new file mode 100644
index 00000000000..f7b9da43ed0
--- /dev/null
+++ b/usr.sbin/sendmail/src/mailq.1
@@ -0,0 +1,88 @@
+.\" Copyright (c) 1985, 1990, 1993
+.\"	The Regents of the University of California.  All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 3. All advertising materials mentioning features or use of this software
+.\"    must display the following acknowledgement:
+.\"	This product includes software developed by the University of
+.\"	California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     @(#)mailq.1	8.4 (Berkeley) 2/22/94
+.\"
+.Dd February 22, 1994
+.Dt MAILQ 1
+.Os BSD 4
+.Sh NAME
+.Nm mailq
+.Nd print the mail queue
+.Sh SYNOPSIS
+.Nm mailq
+.Op Fl v
+.Sh DESCRIPTION
+.Nm Mailq
+prints a summary of the mail messages queued for future delivery.
+.Pp
+The first line printed for each message
+shows the internal identifier used on this host
+for the message,
+the size of the message in bytes,
+the date and time the message was accepted into the queue,
+and the envelope sender of the message.
+The second line shows the error message that caused this message
+to be retained in the queue;
+it will not be present if the message is being processed
+for the first time.
+The following lines show message recipients,
+one per line.
+.Pp
+.Nm Mailq
+is identical to
+.Dq Li "sendmail -bp" .
+.Pp
+The options are as follows:
+.Bl -tag -width Ds
+.It Fl v
+Print verbose information.
+This adds the priority of the message and
+a single character indicator (``+'' or blank)
+indicating whether a warning message has been sent
+on the first line of the message.
+Additionally, extra lines may be intermixed with the recipients
+indicating the ``controlling user'' information;
+this shows who will own any programs that are executed
+on behalf of this message
+and the name of the alias this command expanded from, if any.
+.El
+.Pp
+The
+.Nm mailq
+utility exits 0 on success, and >0 if an error occurs.
+.Sh SEE ALSO
+.Xr sendmail 8
+.Sh HISTORY
+The
+.Nm mailq
+command appeared in
+.Bx 4.0 .
diff --git a/usr.sbin/sendmail/src/mailstats.h b/usr.sbin/sendmail/src/mailstats.h
new file mode 100644
index 00000000000..0164d91e144
--- /dev/null
+++ b/usr.sbin/sendmail/src/mailstats.h
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 1983 Eric P. Allman
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)mailstats.h	8.1 (Berkeley) 6/7/93
+ */
+
+/*
+**  Statistics structure.
+*/
+
+struct statistics
+{
+	time_t	stat_itime;		/* file initialization time */
+	short	stat_size;		/* size of this structure */
+	long	stat_nf[MAXMAILERS];	/* # msgs from each mailer */
+	long	stat_bf[MAXMAILERS];	/* kbytes from each mailer */
+	long	stat_nt[MAXMAILERS];	/* # msgs to each mailer */
+	long	stat_bt[MAXMAILERS];	/* kbytes to each mailer */
+};
diff --git a/usr.sbin/sendmail/src/main.c b/usr.sbin/sendmail/src/main.c
new file mode 100644
index 00000000000..a0253a252de
--- /dev/null
+++ b/usr.sbin/sendmail/src/main.c
@@ -0,0 +1,1510 @@
+/*
+ * Copyright (c) 1983 Eric P. Allman
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef lint
+static char copyright[] =
+"@(#) Copyright (c) 1988, 1993\n\
+	The Regents of the University of California.  All rights reserved.\n";
+#endif /* not lint */
+
+#ifndef lint
+static char sccsid[] = "@(#)main.c	8.55.1.7 (Berkeley) 3/5/95";
+#endif /* not lint */
+
+#define	_DEFINE
+
+#include "sendmail.h"
+#if NAMED_BIND
+#include <arpa/nameser.h>
+#include <resolv.h>
+#endif
+#include <pwd.h>
+
+# ifdef lint
+char	edata, end;
+# endif /* lint */
+
+/*
+**  SENDMAIL -- Post mail to a set of destinations.
+**
+**	This is the basic mail router.  All user mail programs should
+**	call this routine to actually deliver mail.  Sendmail in
+**	turn calls a bunch of mail servers that do the real work of
+**	delivering the mail.
+**
+**	Sendmail is driven by tables read in from /usr/lib/sendmail.cf
+**	(read by readcf.c).  Some more static configuration info,
+**	including some code that you may want to tailor for your
+**	installation, is in conf.c.  You may also want to touch
+**	daemon.c (if you have some other IPC mechanism), acct.c
+**	(to change your accounting), names.c (to adjust the name
+**	server mechanism).
+**
+**	Usage:
+**		/usr/lib/sendmail [flags] addr ...
+**
+**		See the associated documentation for details.
+**
+**	Author:
+**		Eric Allman, UCB/INGRES (until 10/81)
+**			     Britton-Lee, Inc., purveyors of fine
+**				database computers (from 11/81)
+**			     Now back at UCB at the Mammoth project.
+**		The support of the INGRES Project and Britton-Lee is
+**			gratefully acknowledged.  Britton-Lee in
+**			particular had absolutely nothing to gain from
+**			my involvement in this project.
+*/
+
+
+int		NextMailer;	/* "free" index into Mailer struct */
+char		*FullName;	/* sender's full name */
+ENVELOPE	BlankEnvelope;	/* a "blank" envelope */
+ENVELOPE	MainEnvelope;	/* the envelope around the basic letter */
+ADDRESS		NullAddress =	/* a null address */
+		{ "", "", NULL, "" };
+char		*UserEnviron[MAXUSERENVIRON + 2];
+				/* saved user environment */
+char		RealUserName[256];	/* the actual user id on this host */
+char		*CommandLineArgs;	/* command line args for pid file */
+bool		Warn_Q_option = FALSE;	/* warn about Q option use */
+
+/*
+**  Pointers for setproctitle.
+**	This allows "ps" listings to give more useful information.
+*/
+
+# ifdef SETPROCTITLE
+char		**Argv = NULL;		/* pointer to argument vector */
+char		*LastArgv = NULL;	/* end of argv */
+# endif /* SETPROCTITLE */
+
+static void	obsolete();
+
+#ifdef DAEMON
+#ifndef SMTP
+ERROR %%%%   Cannot have daemon mode without SMTP   %%%% ERROR
+#endif /* SMTP */
+#endif /* DAEMON */
+
+#define MAXCONFIGLEVEL	5	/* highest config version level known */
+
+main(argc, argv, envp)
+	int argc;
+	char **argv;
+	char **envp;
+{
+	register char *p;
+	char **av;
+	extern int finis();
+	extern char Version[];
+	char *ep, *from;
+	typedef int (*fnptr)();
+	STAB *st;
+	register int i;
+	int j;
+	bool queuemode = FALSE;		/* process queue requests */
+	bool safecf = TRUE;
+	bool warn_C_flag = FALSE;
+	char warn_f_flag = '\0';
+	static bool reenter = FALSE;
+	char *argv0 = argv[0];
+	struct passwd *pw;
+	struct stat stb;
+	char jbuf[MAXHOSTNAMELEN];	/* holds MyHostName */
+	extern int DtableSize;
+	extern int optind;
+	extern time_t convtime();
+	extern putheader(), putbody();
+	extern void intsig();
+	extern char **myhostname();
+	extern char *arpadate();
+	extern char *getauthinfo();
+	extern char *getcfname();
+	extern char *optarg;
+	extern char **environ;
+	extern void sigusr1();
+
+	/*
+	**  Check to see if we reentered.
+	**	This would normally happen if e_putheader or e_putbody
+	**	were NULL when invoked.
+	*/
+
+	if (reenter)
+	{
+		syserr("main: reentered!");
+		abort();
+	}
+	reenter = TRUE;
+
+	/* do machine-dependent initializations */
+	init_md(argc, argv);
+
+	/* arrange to dump state on signal */
+#ifdef SIGUSR1
+	setsignal(SIGUSR1, sigusr1);
+#endif
+
+	/* in 4.4BSD, the table can be huge; impose a reasonable limit */
+	DtableSize = getdtsize();
+	if (DtableSize > 256)
+		DtableSize = 256;
+
+	/*
+	**  Be sure we have enough file descriptors.
+	**	But also be sure that 0, 1, & 2 are open.
+	*/
+
+	i = open("/dev/null", O_RDWR, 0);
+	if (fstat(STDIN_FILENO, &stb) < 0 && errno != EOPNOTSUPP)
+		(void) dup2(i, STDIN_FILENO);
+	if (fstat(STDOUT_FILENO, &stb) < 0 && errno != EOPNOTSUPP)
+		(void) dup2(i, STDOUT_FILENO);
+	if (fstat(STDERR_FILENO, &stb) < 0 && errno != EOPNOTSUPP)
+		(void) dup2(i, STDERR_FILENO);
+	if (i != STDIN_FILENO && i != STDOUT_FILENO && i != STDERR_FILENO)
+		(void) close(i);
+
+	i = DtableSize;
+	while (--i > 0)
+	{
+		if (i != STDIN_FILENO && i != STDOUT_FILENO && i != STDERR_FILENO)
+			(void) close(i);
+	}
+	errno = 0;
+
+#ifdef LOG
+# ifdef LOG_MAIL
+	openlog("sendmail", LOG_PID, LOG_MAIL);
+# else 
+	openlog("sendmail", LOG_PID);
+# endif
+#endif 
+
+	/* set up the blank envelope */
+	BlankEnvelope.e_puthdr = putheader;
+	BlankEnvelope.e_putbody = putbody;
+	BlankEnvelope.e_xfp = NULL;
+	STRUCTCOPY(NullAddress, BlankEnvelope.e_from);
+	CurEnv = &BlankEnvelope;
+	STRUCTCOPY(NullAddress, MainEnvelope.e_from);
+
+	/*
+	**  Set default values for variables.
+	**	These cannot be in initialized data space.
+	*/
+
+	setdefaults(&BlankEnvelope);
+
+	RealUid = getuid();
+	RealGid = getgid();
+
+	pw = getpwuid(RealUid);
+	if (pw != NULL)
+		(void) strcpy(RealUserName, pw->pw_name);
+	else
+		(void) sprintf(RealUserName, "Unknown UID %d", RealUid);
+
+	/* save command line arguments */
+	i = 0;
+	for (av = argv; *av != NULL; )
+		i += strlen(*av++) + 1;
+	CommandLineArgs = xalloc(i);
+	p = CommandLineArgs;
+	for (av = argv; *av != NULL; )
+	{
+		if (av != argv)
+			*p++ = ' ';
+		strcpy(p, *av++);
+		p += strlen(p);
+	}
+
+	/* Handle any non-getoptable constructions. */
+	obsolete(argv);
+
+	/*
+	**  Do a quick prescan of the argument list.
+	*/
+
+#if defined(__osf__) || defined(_AIX3)
+# define OPTIONS	"B:b:C:cd:e:F:f:h:Iimno:p:q:r:sTtvX:x"
+#endif
+#if defined(ultrix)
+# define OPTIONS	"B:b:C:cd:e:F:f:h:IiM:mno:p:q:r:sTtvX:"
+#endif
+#if defined(NeXT)
+# define OPTIONS	"B:b:C:cd:e:F:f:h:IimnOo:p:q:r:sTtvX:"
+#endif
+#ifndef OPTIONS
+# define OPTIONS	"B:b:C:cd:e:F:f:h:Iimno:p:q:r:sTtvX:"
+#endif
+	while ((j = getopt(argc, argv, OPTIONS)) != EOF)
+	{
+		switch (j)
+		{
+		  case 'd':
+			tTsetup(tTdvect, sizeof tTdvect, "0-99.1");
+			tTflag(optarg);
+			setbuf(stdout, (char *) NULL);
+			printf("Version %s\n", Version);
+			break;
+		}
+	}
+
+	InChannel = stdin;
+	OutChannel = stdout;
+
+	/*
+	**  Move the environment so setproctitle can use the space at
+	**  the top of memory.
+	*/
+
+	for (i = j = 0; j < MAXUSERENVIRON && (p = envp[i]) != NULL; i++)
+	{
+		if (strncmp(p, "IFS=", 4) == 0 || strncmp(p, "LD_", 3) == 0)
+			continue;
+		UserEnviron[j++] = newstr(p);
+	}
+	UserEnviron[j] = NULL;
+	environ = UserEnviron;
+
+# ifdef SETPROCTITLE
+	/*
+	**  Save start and extent of argv for setproctitle.
+	*/
+
+	Argv = argv;
+	if (i > 0)
+		LastArgv = envp[i - 1] + strlen(envp[i - 1]);
+	else
+		LastArgv = argv[argc - 1] + strlen(argv[argc - 1]);
+# endif /* SETPROCTITLE */
+
+	if (setsignal(SIGINT, SIG_IGN) != SIG_IGN)
+		(void) setsignal(SIGINT, intsig);
+	if (setsignal(SIGHUP, SIG_IGN) != SIG_IGN)
+		(void) setsignal(SIGHUP, intsig);
+	(void) setsignal(SIGTERM, intsig);
+	(void) setsignal(SIGPIPE, SIG_IGN);
+	OldUmask = umask(022);
+	OpMode = MD_DELIVER;
+	FullName = getenv("NAME");
+
+#if NAMED_BIND
+	if (tTd(8, 8))
+	{
+		res_init();
+		_res.options |= RES_DEBUG;
+	}
+#endif
+
+	errno = 0;
+	from = NULL;
+
+	/* initialize some macros, etc. */
+	initmacros(CurEnv);
+
+	/* version */
+	define('v', Version, CurEnv);
+
+	/* hostname */
+	av = myhostname(jbuf, sizeof jbuf);
+	if (jbuf[0] != '\0')
+	{
+		struct	utsname	utsname;
+
+		if (tTd(0, 4))
+			printf("canonical name: %s\n", jbuf);
+		define('w', newstr(jbuf), CurEnv);	/* must be new string */
+		define('j', newstr(jbuf), CurEnv);
+		setclass('w', jbuf);
+
+		p = strchr(jbuf, '.');
+		if (p != NULL)
+		{
+			if (p[1] != '\0')
+			{
+				define('m', newstr(&p[1]), CurEnv);
+				setclass('m', &p[1]);
+			}
+			while (p != NULL && strchr(&p[1], '.') != NULL)
+			{
+				*p = '\0';
+				setclass('w', jbuf);
+				*p++ = '.';
+				p = strchr(p, '.');
+			}
+		}
+
+		if (uname(&utsname) >= 0)
+			p = utsname.nodename;
+		else
+		{
+			if (tTd(0, 22))
+				printf("uname failed (%s)\n", errstring(errno));
+			makelower(jbuf);
+			p = jbuf;
+		}
+		if (tTd(0, 4))
+			printf("UUCP nodename: %s\n", p);
+		p = newstr(p);
+		define('k', p, CurEnv);
+		setclass('k', p);
+		setclass('w', p);
+	}
+	while (av != NULL && *av != NULL)
+	{
+		if (tTd(0, 4))
+			printf("\ta.k.a.: %s\n", *av);
+		setclass('w', *av++);
+	}
+
+	/* current time */
+	define('b', arpadate((char *) NULL), CurEnv);
+
+	/*
+	**  Find our real host name for future logging.
+	*/
+
+	p = getauthinfo(STDIN_FILENO);
+	define('_', p, CurEnv);
+
+	/*
+	** Crack argv.
+	*/
+
+	av = argv;
+	p = strrchr(*av, '/');
+	if (p++ == NULL)
+		p = *av;
+	if (strcmp(p, "newaliases") == 0)
+		OpMode = MD_INITALIAS;
+	else if (strcmp(p, "mailq") == 0)
+		OpMode = MD_PRINT;
+	else if (strcmp(p, "smtpd") == 0)
+		OpMode = MD_DAEMON;
+
+	optind = 1;
+	while ((j = getopt(argc, argv, OPTIONS)) != EOF)
+	{
+		switch (j)
+		{
+		  case 'b':	/* operations mode */
+			switch (j = *optarg)
+			{
+			  case MD_DAEMON:
+# ifdef DAEMON
+				if (RealUid != 0) {
+					usrerr("Permission denied");
+					exit (EX_USAGE);
+				}
+				(void) unsetenv("HOSTALIASES");
+# else
+				usrerr("Daemon mode not implemented");
+				ExitStat = EX_USAGE;
+				break;
+# endif /* DAEMON */
+			  case MD_SMTP:
+# ifndef SMTP
+				usrerr("I don't speak SMTP");
+				ExitStat = EX_USAGE;
+				break;
+# endif /* SMTP */
+			  case MD_DELIVER:
+			  case MD_VERIFY:
+			  case MD_TEST:
+			  case MD_INITALIAS:
+			  case MD_PRINT:
+#ifdef MAYBE_NEXT_RELEASE
+			  case MD_ARPAFTP:
+#endif
+				OpMode = j;
+				break;
+
+			  case MD_FREEZE:
+				usrerr("Frozen configurations unsupported");
+				ExitStat = EX_USAGE;
+				break;
+
+			  default:
+				usrerr("Invalid operation mode %c", j);
+				ExitStat = EX_USAGE;
+				break;
+			}
+			break;
+
+		  case 'B':	/* body type */
+			if (strcasecmp(optarg, "7bit") == 0 ||
+			    strcasecmp(optarg, "8bitmime") == 0)
+				CurEnv->e_bodytype = newstr(optarg);
+			else
+				usrerr("Illegal body type %s", optarg);
+			break;
+
+		  case 'C':	/* select configuration file (already done) */
+			if (RealUid != 0)
+				warn_C_flag = TRUE;
+			ConfFile = optarg;
+			(void) setgid(RealGid);
+			(void) setuid(RealUid);
+			safecf = FALSE;
+			break;
+
+		  case 'd':	/* debugging -- already done */
+			break;
+
+		  case 'f':	/* from address */
+		  case 'r':	/* obsolete -f flag */
+			if (from != NULL)
+			{
+				usrerr("More than one \"from\" person");
+				ExitStat = EX_USAGE;
+				break;
+			}
+			from = newstr(denlstring(optarg, TRUE, TRUE));
+			if (strcmp(RealUserName, from) != 0)
+				warn_f_flag = j;
+			break;
+
+		  case 'F':	/* set full name */
+			FullName = newstr(optarg);
+			break;
+
+		  case 'h':	/* hop count */
+			CurEnv->e_hopcount = strtol(optarg, &ep, 10);
+			if (*ep)
+			{
+				usrerr("Bad hop count (%s)", optarg);
+				ExitStat = EX_USAGE;
+				break;
+			}
+			break;
+		
+		  case 'n':	/* don't alias */
+			NoAlias = TRUE;
+			break;
+
+		  case 'o':	/* set option */
+			setoption(*optarg, optarg + 1, FALSE, TRUE, CurEnv);
+			break;
+
+		  case 'p':	/* set protocol */
+			p = strchr(optarg, ':');
+			if (p != NULL)
+			{
+				*p++ = '\0';
+				if (*p != '\0')
+				{
+					ep = xalloc(strlen(p) + 1);
+					cleanstrcpy(ep, p, MAXNAME);
+					define('s', ep, CurEnv);
+				}
+			}
+			if (*optarg != '\0')
+			{
+				ep = xalloc(strlen(optarg) + 1);
+				cleanstrcpy(ep, optarg, MAXNAME);
+				define('r', ep, CurEnv);
+			}
+			break;
+
+		  case 'q':	/* run queue files at intervals */
+# ifdef QUEUE
+			(void) unsetenv("HOSTALIASES");
+			FullName = NULL;
+			queuemode = TRUE;
+			switch (optarg[0])
+			{
+			  case 'I':
+				QueueLimitId = newstr(&optarg[1]);
+				break;
+
+			  case 'R':
+				QueueLimitRecipient = newstr(&optarg[1]);
+				break;
+
+			  case 'S':
+				QueueLimitSender = newstr(&optarg[1]);
+				break;
+
+			  default:
+				QueueIntvl = convtime(optarg, 'm');
+				break;
+			}
+# else /* QUEUE */
+			usrerr("I don't know about queues");
+			ExitStat = EX_USAGE;
+# endif /* QUEUE */
+			break;
+
+		  case 't':	/* read recipients from message */
+			GrabTo = TRUE;
+			break;
+
+		  case 'X':	/* traffic log file */
+			setgid(RealGid);
+			setuid(RealUid);
+			TrafficLogFile = fopen(optarg, "a");
+			if (TrafficLogFile == NULL)
+			{
+				syserr("cannot open %s", optarg);
+				break;
+			}
+#ifdef HASSETVBUF
+			setvbuf(TrafficLogFile, NULL, _IOLBF, 0);
+#else
+			setlinebuf(TrafficLogFile);
+#endif
+			break;
+
+			/* compatibility flags */
+		  case 'c':	/* connect to non-local mailers */
+		  case 'i':	/* don't let dot stop me */
+		  case 'm':	/* send to me too */
+		  case 'T':	/* set timeout interval */
+		  case 'v':	/* give blow-by-blow description */
+			setoption(j, "T", FALSE, TRUE, CurEnv);
+			break;
+
+		  case 'e':	/* error message disposition */
+# if defined(ultrix)
+		  case 'M':	/* define macro */
+# endif
+			setoption(j, optarg, FALSE, TRUE, CurEnv);
+			break;
+
+		  case 's':	/* save From lines in headers */
+			setoption('f', "T", FALSE, TRUE, CurEnv);
+			break;
+
+# ifdef DBM
+		  case 'I':	/* initialize alias DBM file */
+			OpMode = MD_INITALIAS;
+			break;
+# endif /* DBM */
+
+# if defined(__osf__) || defined(_AIX3)
+		  case 'x':	/* random flag that OSF/1 & AIX mailx passes */
+			break;
+# endif
+# if defined(NeXT)
+		  case 'O':	/* random flag that NeXT Mail.app passes */
+			break;
+# endif
+
+		  default:
+			ExitStat = EX_USAGE;
+			finis();
+			break;
+		}
+	}
+	av += optind;
+
+	/*
+	**  Do basic initialization.
+	**	Read system control file.
+	**	Extract special fields for local use.
+	*/
+
+#ifdef XDEBUG
+	checkfd012("before readcf");
+#endif
+	readcf(getcfname(), safecf, CurEnv);
+
+	if (tTd(0, 1))
+	{
+		printf("SYSTEM IDENTITY (after readcf):");
+		printf("\n\t    (short domain name) $w = ");
+		xputs(macvalue('w', CurEnv));
+		printf("\n\t(canonical domain name) $j = ");
+		xputs(macvalue('j', CurEnv));
+		printf("\n\t       (subdomain name) $m = ");
+		xputs(macvalue('m', CurEnv));
+		printf("\n\t            (node name) $k = ");
+		xputs(macvalue('k', CurEnv));
+		printf("\n");
+	}
+
+	/*
+	**  Initialize name server if it is going to be used.
+	*/
+
+#if NAMED_BIND
+	if (!bitset(RES_INIT, _res.options))
+		res_init();
+#endif
+
+	/*
+	**  Process authorization warnings from command line.
+	*/
+
+	if (warn_C_flag)
+		auth_warning(CurEnv, "Processed by %s with -C %s",
+			RealUserName, ConfFile);
+/*
+	if (warn_f_flag != '\0')
+		auth_warning(CurEnv, "%s set sender to %s using -%c",
+			RealUserName, from, warn_f_flag);
+*/
+	if (Warn_Q_option)
+		auth_warning(CurEnv, "Processed from queue %s", QueueDir);
+
+	/* Enforce use of local time (null string overrides this) */
+	if (TimeZoneSpec == NULL)
+		unsetenv("TZ");
+	else if (TimeZoneSpec[0] != '\0')
+	{
+		char **evp = UserEnviron;
+		char tzbuf[100];
+
+		strcpy(tzbuf, "TZ=");
+		strcpy(&tzbuf[3], TimeZoneSpec);
+
+		while (*evp != NULL && strncmp(*evp, "TZ=", 3) != 0)
+			evp++;
+		if (*evp == NULL)
+		{
+			*evp++ = newstr(tzbuf);
+			*evp = NULL;
+		}
+		else
+			*evp++ = newstr(tzbuf);
+	}
+
+	if (ConfigLevel > MAXCONFIGLEVEL)
+	{
+		syserr("Warning: .cf version level (%d) exceeds program functionality (%d)",
+			ConfigLevel, MAXCONFIGLEVEL);
+	}
+
+	if (MeToo)
+		BlankEnvelope.e_flags |= EF_METOO;
+
+# ifdef QUEUE
+	if (queuemode && RealUid != 0 && bitset(PRIV_RESTRICTQRUN, PrivacyFlags))
+	{
+		struct stat stbuf;
+
+		/* check to see if we own the queue directory */
+		if (stat(QueueDir, &stbuf) < 0)
+			syserr("main: cannot stat %s", QueueDir);
+		if (stbuf.st_uid != RealUid)
+		{
+			/* nope, really a botch */
+			usrerr("You do not have permission to process the queue");
+			exit (EX_NOPERM);
+		}
+	}
+# endif /* QUEUE */
+
+	switch (OpMode)
+	{
+	  case MD_INITALIAS:
+		Verbose = TRUE;
+		break;
+
+	  case MD_DAEMON:
+		/* remove things that don't make sense in daemon mode */
+		FullName = NULL;
+		break;
+	}
+
+	/* full names can't have newlines */
+	if (FullName != NULL && strchr(FullName, '\n') != NULL)
+		FullName = newstr(denlstring(FullName, TRUE, TRUE));
+
+	/* do heuristic mode adjustment */
+	if (Verbose)
+	{
+		/* turn off noconnect option */
+		setoption('c', "F", TRUE, FALSE, CurEnv);
+
+		/* turn on interactive delivery */
+		setoption('d', "", TRUE, FALSE, CurEnv);
+	}
+
+	if (ConfigLevel < 3)
+	{
+		UseErrorsTo = TRUE;
+	}
+
+	/* our name for SMTP codes */
+	expand("\201j", jbuf, &jbuf[sizeof jbuf - 1], CurEnv);
+	MyHostName = jbuf;
+
+	/* make certain that this name is part of the $=w class */
+	setclass('w', MyHostName);
+
+	/* the indices of built-in mailers */
+	st = stab("local", ST_MAILER, ST_FIND);
+	if (st == NULL)
+		syserr("No local mailer defined");
+	else
+		LocalMailer = st->s_mailer;
+
+	st = stab("prog", ST_MAILER, ST_FIND);
+	if (st == NULL)
+		syserr("No prog mailer defined");
+	else
+		ProgMailer = st->s_mailer;
+
+	st = stab("*file*", ST_MAILER, ST_FIND);
+	if (st == NULL)
+		syserr("No *file* mailer defined");
+	else
+		FileMailer = st->s_mailer;
+
+	st = stab("*include*", ST_MAILER, ST_FIND);
+	if (st == NULL)
+		syserr("No *include* mailer defined");
+	else
+		InclMailer = st->s_mailer;
+
+
+	/* operate in queue directory */
+	if (OpMode != MD_TEST && chdir(QueueDir) < 0)
+	{
+		syserr("cannot chdir(%s)", QueueDir);
+		ExitStat = EX_SOFTWARE;
+	}
+
+	/* if we've had errors so far, exit now */
+	if (ExitStat != EX_OK && OpMode != MD_TEST)
+	{
+		setuid(RealUid);
+		exit(ExitStat);
+	}
+
+#ifdef XDEBUG
+	checkfd012("before main() initmaps");
+#endif
+
+	/*
+	**  Do operation-mode-dependent initialization.
+	*/
+
+	switch (OpMode)
+	{
+	  case MD_PRINT:
+		/* print the queue */
+#ifdef QUEUE
+		dropenvelope(CurEnv);
+		printqueue();
+		setuid(RealUid);
+		exit(EX_OK);
+#else /* QUEUE */
+		usrerr("No queue to print");
+		finis();
+#endif /* QUEUE */
+
+	  case MD_INITALIAS:
+		/* initialize alias database */
+		initmaps(TRUE, CurEnv);
+		setuid(RealUid);
+		exit(EX_OK);
+
+	  case MD_DAEMON:
+		/* don't open alias database -- done in srvrsmtp */
+		break;
+
+	  default:
+		/* open the alias database */
+		initmaps(FALSE, CurEnv);
+		break;
+	}
+
+	if (tTd(0, 15))
+	{
+		/* print configuration table (or at least part of it) */
+		printrules();
+		for (i = 0; i < MAXMAILERS; i++)
+		{
+			register struct mailer *m = Mailer[i];
+			int j;
+
+			if (m == NULL)
+				continue;
+			printf("mailer %d (%s): P=%s S=%d/%d R=%d/%d M=%ld F=", i, m->m_name,
+				m->m_mailer, m->m_se_rwset, m->m_sh_rwset,
+				m->m_re_rwset, m->m_rh_rwset, m->m_maxsize);
+			for (j = '\0'; j <= '\177'; j++)
+				if (bitnset(j, m->m_flags))
+					(void) putchar(j);
+			printf(" E=");
+			xputs(m->m_eol);
+			if (m->m_argv != NULL)
+			{
+				char **a = m->m_argv;
+
+				printf(" A=");
+				while (*a != NULL)
+				{
+					if (a != m->m_argv)
+						printf(" ");
+					xputs(*a++);
+				}
+			}
+			printf("\n");
+		}
+	}
+
+	/*
+	**  Switch to the main envelope.
+	*/
+
+	CurEnv = newenvelope(&MainEnvelope, CurEnv);
+	MainEnvelope.e_flags = BlankEnvelope.e_flags;
+
+	/*
+	**  If test mode, read addresses from stdin and process.
+	*/
+
+	if (OpMode == MD_TEST)
+	{
+		char buf[MAXLINE];
+
+		if (isatty(fileno(stdin)))
+			Verbose = TRUE;
+
+		if (Verbose)
+		{
+			printf("ADDRESS TEST MODE (ruleset 3 NOT automatically invoked)\n");
+			printf("Enter <ruleset> <address>\n");
+		}
+		for (;;)
+		{
+			register char **pvp;
+			char *q;
+			auto char *delimptr;
+			extern bool invalidaddr();
+			extern char *crackaddr();
+
+			if (Verbose)
+				printf("> ");
+			(void) fflush(stdout);
+			if (fgets(buf, sizeof buf, stdin) == NULL)
+				finis();
+			if (!Verbose)
+				printf("> %s", buf);
+			switch (buf[0])
+			{
+			  case '#':
+				continue;
+
+#ifdef MAYBENEXTRELEASE
+			  case 'C':		/* try crackaddr */
+			  	q = crackaddr(&buf[1]);
+			  	xputs(q);
+			  	printf("\n");
+			  	continue;
+#endif
+			}
+
+			for (p = buf; isascii(*p) && isspace(*p); p++)
+				continue;
+			q = p;
+			while (*p != '\0' && !(isascii(*p) && isspace(*p)))
+				p++;
+			if (*p == '\0')
+			{
+				printf("No address!\n");
+				continue;
+			}
+			*p = '\0';
+			if (invalidaddr(p + 1, NULL))
+				continue;
+			do
+			{
+				char pvpbuf[PSBUFSIZE];
+
+				pvp = prescan(++p, ',', pvpbuf, sizeof pvpbuf,
+					      &delimptr);
+				if (pvp == NULL)
+					continue;
+				p = q;
+				while (*p != '\0')
+				{
+					int stat;
+
+					stat = rewrite(pvp, atoi(p), 0, CurEnv);
+					if (stat != EX_OK)
+						printf("== Ruleset %s status %d\n",
+							p, stat);
+					while (*p != '\0' && *p++ != ',')
+						continue;
+				}
+			} while (*(p = delimptr) != '\0');
+		}
+	}
+
+# ifdef QUEUE
+	/*
+	**  If collecting stuff from the queue, go start doing that.
+	*/
+
+	if (queuemode && OpMode != MD_DAEMON && QueueIntvl == 0)
+	{
+		runqueue(FALSE);
+		finis();
+	}
+# endif /* QUEUE */
+
+	/*
+	**  If a daemon, wait for a request.
+	**	getrequests will always return in a child.
+	**	If we should also be processing the queue, start
+	**		doing it in background.
+	**	We check for any errors that might have happened
+	**		during startup.
+	*/
+
+	if (OpMode == MD_DAEMON || QueueIntvl != 0)
+	{
+		char dtype[200];
+
+		if (!tTd(0, 1))
+		{
+			/* put us in background */
+			i = fork();
+			if (i < 0)
+				syserr("daemon: cannot fork");
+			if (i != 0)
+				exit(0);
+
+			/* disconnect from our controlling tty */
+			disconnect(2, CurEnv);
+		}
+
+		dtype[0] = '\0';
+		if (OpMode == MD_DAEMON)
+			strcat(dtype, "+SMTP");
+		if (QueueIntvl != 0)
+		{
+			strcat(dtype, "+queueing@");
+			strcat(dtype, pintvl(QueueIntvl, TRUE));
+		}
+		if (tTd(0, 1))
+			strcat(dtype, "+debugging");
+
+#ifdef LOG
+		syslog(LOG_INFO, "starting daemon (%s): %s", Version, dtype + 1);
+#endif
+#ifdef XLA
+		xla_create_file();
+#endif
+
+# ifdef QUEUE
+		if (queuemode)
+		{
+			runqueue(TRUE);
+			if (OpMode != MD_DAEMON)
+				for (;;)
+					pause();
+		}
+# endif /* QUEUE */
+		dropenvelope(CurEnv);
+
+#ifdef DAEMON
+		getrequests();
+
+		/* at this point we are in a child: reset state */
+		(void) newenvelope(CurEnv, CurEnv);
+
+		/*
+		**  Get authentication data
+		*/
+
+		p = getauthinfo(fileno(InChannel));
+		define('_', p, CurEnv);
+
+#endif /* DAEMON */
+	}
+	
+# ifdef SMTP
+	/*
+	**  If running SMTP protocol, start collecting and executing
+	**  commands.  This will never return.
+	*/
+
+	if (OpMode == MD_SMTP || OpMode == MD_DAEMON)
+		smtp(CurEnv);
+# endif /* SMTP */
+
+	if (OpMode == MD_VERIFY)
+	{
+		CurEnv->e_sendmode = SM_VERIFY;
+		CurEnv->e_errormode = EM_QUIET;
+	}
+	else
+	{
+		/* interactive -- all errors are global */
+		CurEnv->e_flags |= EF_GLOBALERRS;
+	}
+
+	/*
+	**  Do basic system initialization and set the sender
+	*/
+
+	initsys(CurEnv);
+	setsender(from, CurEnv, NULL, FALSE);
+	if (macvalue('s', CurEnv) == NULL)
+		define('s', RealHostName, CurEnv);
+
+	if (*av == NULL && !GrabTo)
+	{
+		CurEnv->e_flags |= EF_GLOBALERRS;
+		usrerr("Recipient names must be specified");
+
+		/* collect body for UUCP return */
+		if (OpMode != MD_VERIFY)
+			collect(FALSE, FALSE, CurEnv);
+		finis();
+	}
+
+	/*
+	**  Scan argv and deliver the message to everyone.
+	*/
+
+	sendtoargv(av, CurEnv);
+
+	/* if we have had errors sofar, arrange a meaningful exit stat */
+	if (Errors > 0 && ExitStat == EX_OK)
+		ExitStat = EX_USAGE;
+
+	/*
+	**  Read the input mail.
+	*/
+
+	CurEnv->e_to = NULL;
+	if (OpMode != MD_VERIFY || GrabTo)
+	{
+		CurEnv->e_flags |= EF_GLOBALERRS;
+		collect(FALSE, FALSE, CurEnv);
+	}
+	errno = 0;
+
+	if (tTd(1, 1))
+		printf("From person = \"%s\"\n", CurEnv->e_from.q_paddr);
+
+	/*
+	**  Actually send everything.
+	**	If verifying, just ack.
+	*/
+
+	CurEnv->e_from.q_flags |= QDONTSEND;
+	if (tTd(1, 5))
+	{
+		printf("main: QDONTSEND ");
+		printaddr(&CurEnv->e_from, FALSE);
+	}
+	CurEnv->e_to = NULL;
+	sendall(CurEnv, SM_DEFAULT);
+
+	/*
+	**  All done.
+	**	Don't send return error message if in VERIFY mode.
+	*/
+
+	finis();
+}
+/*
+**  FINIS -- Clean up and exit.
+**
+**	Parameters:
+**		none
+**
+**	Returns:
+**		never
+**
+**	Side Effects:
+**		exits sendmail
+*/
+
+finis()
+{
+	if (tTd(2, 1))
+		printf("\n====finis: stat %d e_flags %o, e_id=%s\n",
+			ExitStat, CurEnv->e_flags,
+			CurEnv->e_id == NULL ? "NOQUEUE" : CurEnv->e_id);
+	if (tTd(2, 9))
+		printopenfds(FALSE);
+
+	/* clean up temp files */
+	CurEnv->e_to = NULL;
+	dropenvelope(CurEnv);
+
+	/* flush any cached connections */
+	mci_flush(TRUE, NULL);
+
+# ifdef XLA
+	/* clean up extended load average stuff */
+	xla_all_end();
+# endif
+
+	/* and exit */
+# ifdef LOG
+	if (LogLevel > 78)
+		syslog(LOG_DEBUG, "finis, pid=%d", getpid());
+# endif /* LOG */
+	if (ExitStat == EX_TEMPFAIL)
+		ExitStat = EX_OK;
+
+	/* reset uid for process accounting */
+	setuid(RealUid);
+
+	exit(ExitStat);
+}
+/*
+**  INTSIG -- clean up on interrupt
+**
+**	This just arranges to exit.  It pessimises in that it
+**	may resend a message.
+**
+**	Parameters:
+**		none.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		Unlocks the current job.
+*/
+
+void
+intsig()
+{
+	FileName = NULL;
+	unlockqueue(CurEnv);
+#ifdef XLA
+	xla_all_end();
+#endif
+
+	/* reset uid for process accounting */
+	setuid(RealUid);
+
+	exit(EX_OK);
+}
+/*
+**  INITMACROS -- initialize the macro system
+**
+**	This just involves defining some macros that are actually
+**	used internally as metasymbols to be themselves.
+**
+**	Parameters:
+**		none.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		initializes several macros to be themselves.
+*/
+
+struct metamac	MetaMacros[] =
+{
+	/* LHS pattern matching characters */
+	'*', MATCHZANY,		'+', MATCHANY,		'-', MATCHONE,
+	'=', MATCHCLASS,	'~', MATCHNCLASS,
+
+	/* these are RHS metasymbols */
+	'#', CANONNET,		'@', CANONHOST,		':', CANONUSER,
+	'>', CALLSUBR,
+
+	/* the conditional operations */
+	'?', CONDIF,		'|', CONDELSE,		'.', CONDFI,
+
+	/* the hostname lookup characters */
+	'[', HOSTBEGIN,		']', HOSTEND,
+	'(', LOOKUPBEGIN,	')', LOOKUPEND,
+
+	/* miscellaneous control characters */
+	'&', MACRODEXPAND,
+
+	'\0'
+};
+
+initmacros(e)
+	register ENVELOPE *e;
+{
+	register struct metamac *m;
+	char buf[5];
+	register int c;
+
+	for (m = MetaMacros; m->metaname != '\0'; m++)
+	{
+		buf[0] = m->metaval;
+		buf[1] = '\0';
+		define(m->metaname, newstr(buf), e);
+	}
+	buf[0] = MATCHREPL;
+	buf[2] = '\0';
+	for (c = '0'; c <= '9'; c++)
+	{
+		buf[1] = c;
+		define(c, newstr(buf), e);
+	}
+
+	/* set defaults for some macros sendmail will use later */
+	define('e', "\201j Sendmail \201v ready at \201b", e);
+	define('l', "From \201g  \201d", e);
+	define('n', "MAILER-DAEMON", e);
+	define('o', ".:@[]", e);
+	define('q', "<\201g>", e);
+}
+/*
+**  DISCONNECT -- remove our connection with any foreground process
+**
+**	Parameters:
+**		droplev -- how "deeply" we should drop the line.
+**			0 -- ignore signals, mail back errors, make sure
+**			     output goes to stdout.
+**			1 -- also, make stdout go to transcript.
+**			2 -- also, disconnect from controlling terminal
+**			     (only for daemon mode).
+**		e -- the current envelope.
+**
+**	Returns:
+**		none
+**
+**	Side Effects:
+**		Trys to insure that we are immune to vagaries of
+**		the controlling tty.
+*/
+
+disconnect(droplev, e)
+	int droplev;
+	register ENVELOPE *e;
+{
+	int fd;
+
+	if (tTd(52, 1))
+		printf("disconnect: In %d Out %d, e=%x\n",
+			fileno(InChannel), fileno(OutChannel), e);
+	if (tTd(52, 5))
+	{
+		printf("don't\n");
+		return;
+	}
+
+	/* be sure we don't get nasty signals */
+	(void) setsignal(SIGHUP, SIG_IGN);
+	(void) setsignal(SIGINT, SIG_IGN);
+	(void) setsignal(SIGQUIT, SIG_IGN);
+
+	/* we can't communicate with our caller, so.... */
+	HoldErrs = TRUE;
+	CurEnv->e_errormode = EM_MAIL;
+	Verbose = FALSE;
+	DisConnected = TRUE;
+
+	/* all input from /dev/null */
+	if (InChannel != stdin)
+	{
+		(void) fclose(InChannel);
+		InChannel = stdin;
+	}
+	(void) freopen("/dev/null", "r", stdin);
+
+	/* output to the transcript */
+	if (OutChannel != stdout)
+	{
+		(void) fclose(OutChannel);
+		OutChannel = stdout;
+	}
+	if (droplev > 0)
+	{
+		if (e->e_xfp == NULL)
+			fd = open("/dev/null", O_WRONLY, 0666);
+		else
+			fd = fileno(e->e_xfp);
+		(void) fflush(stdout);
+		dup2(fd, STDOUT_FILENO);
+		dup2(fd, STDERR_FILENO);
+		if (e->e_xfp == NULL)
+			close(fd);
+	}
+
+	/* drop our controlling TTY completely if possible */
+	if (droplev > 1)
+	{
+		(void) setsid();
+		errno = 0;
+	}
+
+#ifdef XDEBUG
+	checkfd012("disconnect");
+#endif
+
+# ifdef LOG
+	if (LogLevel > 71)
+		syslog(LOG_DEBUG, "in background, pid=%d", getpid());
+# endif /* LOG */
+
+	errno = 0;
+}
+
+static void
+obsolete(argv)
+	char *argv[];
+{
+	register char *ap;
+	register char *op;
+
+	while ((ap = *++argv) != NULL)
+	{
+		/* Return if "--" or not an option of any form. */
+		if (ap[0] != '-' || ap[1] == '-')
+			return;
+
+		/* skip over options that do have a value */
+		op = strchr(OPTIONS, ap[1]);
+		if (op != NULL && *++op == ':' && ap[2] == '\0' &&
+		    ap[1] != 'd' && argv[1] != NULL && argv[1][0] != '-')
+		{
+			argv++;
+			continue;
+		}
+
+		/* If -C doesn't have an argument, use sendmail.cf. */
+#define	__DEFPATH	"sendmail.cf"
+		if (ap[1] == 'C' && ap[2] == '\0')
+		{
+			*argv = xalloc(sizeof(__DEFPATH) + 2);
+			argv[0][0] = '-';
+			argv[0][1] = 'C';
+			(void)strcpy(&argv[0][2], __DEFPATH);
+		}
+
+		/* If -q doesn't have an argument, run it once. */
+		if (ap[1] == 'q' && ap[2] == '\0')
+			*argv = "-q0";
+
+		/* if -d doesn't have an argument, use 0-99.1 */
+		if (ap[1] == 'd' && ap[2] == '\0')
+			*argv = "-d0-99.1";
+	}
+}
+/*
+**  AUTH_WARNING -- specify authorization warning
+**
+**	Parameters:
+**		e -- the current envelope.
+**		msg -- the text of the message.
+**		args -- arguments to the message.
+**
+**	Returns:
+**		none.
+*/
+
+void
+#ifdef __STDC__
+auth_warning(register ENVELOPE *e, const char *msg, ...)
+#else
+auth_warning(e, msg, va_alist)
+	register ENVELOPE *e;
+	const char *msg;
+	va_dcl
+#endif
+{
+	char buf[MAXLINE];
+	VA_LOCAL_DECL
+
+	if (bitset(PRIV_AUTHWARNINGS, PrivacyFlags))
+	{
+		register char *p;
+		static char hostbuf[48];
+		extern char **myhostname();
+
+		if (hostbuf[0] == '\0')
+			(void) myhostname(hostbuf, sizeof hostbuf);
+
+		(void) sprintf(buf, "%s: ", hostbuf);
+		p = &buf[strlen(buf)];
+		VA_START(msg);
+		vsprintf(p, msg, ap);
+		VA_END;
+		addheader("X-Authentication-Warning", buf, e);
+	}
+}
+/*
+**  DUMPSTATE -- dump state
+**
+**	For debugging.
+*/
+
+void
+dumpstate(when)
+	char *when;
+{
+#ifdef LOG
+	register char *j = macvalue('j', CurEnv);
+	register STAB *s;
+
+	syslog(LOG_DEBUG, "--- dumping state on %s: $j = %s ---",
+		when,
+		j == NULL ? "<NULL>" : j);
+	if (j != NULL)
+	{
+		s = stab(j, ST_CLASS, ST_FIND);
+		if (s == NULL || !bitnset('w', s->s_class))
+			syslog(LOG_DEBUG, "*** $j not in $=w ***");
+	}
+	syslog(LOG_DEBUG, "--- open file descriptors: ---");
+	printopenfds(TRUE);
+	syslog(LOG_DEBUG, "--- connection cache: ---");
+	mci_dump_all(TRUE);
+	if (RewriteRules[89] != NULL)
+	{
+		int stat;
+		register char **pvp;
+		char *pv[MAXATOM + 1];
+
+		pv[0] = NULL;
+		stat = rewrite(pv, 89, 0, CurEnv);
+		syslog(LOG_DEBUG, "--- ruleset 89 returns stat %d, pv: ---",
+			stat);
+		for (pvp = pv; *pvp != NULL; pvp++)
+			syslog(LOG_DEBUG, "%s", *pvp);
+	}
+	syslog(LOG_DEBUG, "--- end of state dump ---");
+#endif
+}
+
+
+void
+sigusr1()
+{
+	dumpstate("user signal");
+}
diff --git a/usr.sbin/sendmail/src/makesendmail b/usr.sbin/sendmail/src/makesendmail
new file mode 100644
index 00000000000..7c13db9fd9f
--- /dev/null
+++ b/usr.sbin/sendmail/src/makesendmail
@@ -0,0 +1,113 @@
+#!/bin/sh
+
+# Copyright (c) 1993 Eric P. Allman
+# Copyright (c) 1993 The Regents of the University of California.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. All advertising materials mentioning features or use of this software
+#    must display the following acknowledgement:
+#	This product includes software developed by the University of
+#	California, Berkeley and its contributors.
+# 4. Neither the name of the University nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+#       @(#)makesendmail	8.5 (Berkeley) 2/27/94
+#
+
+#
+#  A quick-and-dirty script to compile sendmail in the presence of
+#  multiple architectures and Makefiles.
+#
+
+# determine machine architecture
+arch=`uname -m`
+case $arch
+in
+  sun4*)	arch=sun4;;
+
+  9000/*)	arch=`echo $arch | sed -e 's/9000.//' -e 's/..$/xx/'`;;
+esac
+
+# determine operating system type
+os=`uname -s`
+
+# determine operating system release
+rel=`uname -r`
+rbase=`echo $rel | sed 's/\..*//''`
+
+# now try to find a reasonable object directory
+if [ -r obj.$os.$arch.$rel ]; then
+	obj=obj.$os.$arch.$rel
+elif [ -r obj.$os.$arch.$rbase.x ]; then
+	obj=obj.$os.$arch.$rbase.x
+elif [ -r obj.$os.$rel ]; then
+	obj=obj.$os.$rel
+elif [ -r obj.$os.$rbase.x ]; then
+	obj=obj.$os.$rbase.x
+elif [ -r obj.$os.$arch ]; then
+	obj=obj.$os.$arch
+elif [ -r obj.$arch.$rel ]; then
+	obj=obj.$arch.$rel
+elif [ -r obj.$arch.$rbase.x ]; then
+	obj=obj.$arch.$rbase.x
+elif [ -r obj.$os ]; then
+	obj=obj.$os
+elif [ -r obj.$arch ]; then
+	obj=obj.$arch
+elif [ -r obj.$rel ]; then
+	obj=obj.$rel
+else
+	# no existing obj directory -- try to create one if Makefile found
+	obj=obj.$os.$arch.$rel
+	if [ -r Makefile.$os.$arch.$rel ]; then
+		makefile=Makefile.$os.$arch.$rel
+	elif [ -r Makefile.$os.$arch.$rbase.x ]; then
+		makefile=Makefile.$os.$arch.$rbase.x
+	elif [ -r Makefile.$os.$rel ]; then
+		makefile=Makefile.$os.$rel
+	elif [ -r Makefile.$os.$rbase.x ]; then
+		makefile=Makefile.$os.$rbase.x
+	elif [ -r Makefile.$os.$arch ]; then
+		makefile=Makefile.$os.$arch
+	elif [ -r Makefile.$arch.$rel ]; then
+		makefile=Makefile.$arch.$rel
+	elif [ -r Makefile.$arch.$rbase.x ]; then
+		makefile=Makefile.$arch.$rbase.x
+	elif [ -r Makefile.$os ]; then
+		makefile=Makefile.$os
+	elif [ -r Makefile.$arch ]; then
+		makefile=Makefile.$arch
+	elif [ -r Makefile.$rel ]; then
+		makefile=Makefile.$rel
+	else
+		echo "Cannot determine how to support $arch.$os.$rel"
+		exit 1
+	fi
+	echo "Creating $obj using $makefile"
+	mkdir $obj
+	(cd $obj; ln -s ../*.[ch158] ../sendmail.hf .; ln -s ../$makefile Makefile)
+fi
+echo "Making in $obj"
+cd $obj
+exec make -f Makefile $*
diff --git a/usr.sbin/sendmail/src/map.c b/usr.sbin/sendmail/src/map.c
new file mode 100644
index 00000000000..a2b3337bb0f
--- /dev/null
+++ b/usr.sbin/sendmail/src/map.c
@@ -0,0 +1,1329 @@
+/*
+ * Copyright (c) 1992 Eric P. Allman.
+ * Copyright (c) 1992, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)map.c	8.25.1.1 (Berkeley) 2/10/95";
+#endif /* not lint */
+
+#include "sendmail.h"
+
+#ifdef NDBM
+#include <ndbm.h>
+#endif
+#ifdef NEWDB
+#include <db.h>
+#endif
+#ifdef NIS
+#include <rpcsvc/ypclnt.h>
+#endif
+
+/*
+**  MAP.C -- implementations for various map classes.
+**
+**	Each map class implements a series of functions:
+**
+**	bool map_parse(MAP *map, char *args)
+**		Parse the arguments from the config file.  Return TRUE
+**		if they were ok, FALSE otherwise.  Fill in map with the
+**		values.
+**
+**	char *map_lookup(MAP *map, char *key, char **args, int *pstat)
+**		Look up the key in the given map.  If found, do any
+**		rewriting the map wants (including "args" if desired)
+**		and return the value.  Set *pstat to the appropriate status
+**		on error and return NULL.  Args will be NULL if called
+**		from the alias routines, although this should probably
+**		not be relied upon.  It is suggested you call map_rewrite
+**		to return the results -- it takes care of null termination
+**		and uses a dynamically expanded buffer as needed.
+**
+**	void map_store(MAP *map, char *key, char *value)
+**		Store the key:value pair in the map.
+**
+**	bool map_open(MAP *map, int mode)
+**		Open the map for the indicated mode.  Mode should
+**		be either O_RDONLY or O_RDWR.  Return TRUE if it
+**		was opened successfully, FALSE otherwise.  If the open
+**		failed an the MF_OPTIONAL flag is not set, it should
+**		also print an error.  If the MF_ALIAS bit is set
+**		and this map class understands the @:@ convention, it
+**		should call aliaswait() before returning.
+**
+**	void map_close(MAP *map)
+**		Close the map.
+*/
+
+#define DBMMODE		0644
+
+extern bool	aliaswait __P((MAP *, char *, int));
+/*
+**  MAP_PARSEARGS -- parse config line arguments for database lookup
+**
+**	This is a generic version of the map_parse method.
+**
+**	Parameters:
+**		map -- the map being initialized.
+**		ap -- a pointer to the args on the config line.
+**
+**	Returns:
+**		TRUE -- if everything parsed OK.
+**		FALSE -- otherwise.
+**
+**	Side Effects:
+**		null terminates the filename; stores it in map
+*/
+
+bool
+map_parseargs(map, ap)
+	MAP *map;
+	char *ap;
+{
+	register char *p = ap;
+
+	map->map_mflags |= MF_TRY0NULL | MF_TRY1NULL;
+	for (;;)
+	{
+		while (isascii(*p) && isspace(*p))
+			p++;
+		if (*p != '-')
+			break;
+		switch (*++p)
+		{
+		  case 'N':
+			map->map_mflags |= MF_INCLNULL;
+			map->map_mflags &= ~MF_TRY0NULL;
+			break;
+
+		  case 'O':
+			map->map_mflags &= ~MF_TRY1NULL;
+			break;
+
+		  case 'o':
+			map->map_mflags |= MF_OPTIONAL;
+			break;
+
+		  case 'f':
+			map->map_mflags |= MF_NOFOLDCASE;
+			break;
+
+		  case 'm':
+			map->map_mflags |= MF_MATCHONLY;
+			break;
+
+		  case 'a':
+			map->map_app = ++p;
+			break;
+		}
+		while (*p != '\0' && !(isascii(*p) && isspace(*p)))
+			p++;
+		if (*p != '\0')
+			*p++ = '\0';
+	}
+	if (map->map_app != NULL)
+		map->map_app = newstr(map->map_app);
+
+	if (*p != '\0')
+	{
+		map->map_file = p;
+		while (*p != '\0' && !(isascii(*p) && isspace(*p)))
+			p++;
+		if (*p != '\0')
+			*p++ = '\0';
+		map->map_file = newstr(map->map_file);
+	}
+
+	while (*p != '\0' && isascii(*p) && isspace(*p))
+		p++;
+	if (*p != '\0')
+		map->map_rebuild = newstr(p);
+
+	if (map->map_file == NULL)
+	{
+		syserr("No file name for %s map %s",
+			map->map_class->map_cname, map->map_mname);
+		return FALSE;
+	}
+	return TRUE;
+}
+/*
+**  MAP_REWRITE -- rewrite a database key, interpolating %n indications.
+**
+**	It also adds the map_app string.  It can be used as a utility
+**	in the map_lookup method.
+**
+**	Parameters:
+**		map -- the map that causes this.
+**		s -- the string to rewrite, NOT necessarily null terminated.
+**		slen -- the length of s.
+**		av -- arguments to interpolate into buf.
+**
+**	Returns:
+**		Pointer to rewritten result.  This is static data that
+**		should be copied if it is to be saved!
+**
+**	Side Effects:
+**		none.
+*/
+
+char *
+map_rewrite(map, s, slen, av)
+	register MAP *map;
+	register char *s;
+	int slen;
+	char **av;
+{
+	register char *bp;
+	register char c;
+	char **avp;
+	register char *ap;
+	int i;
+	int len;
+	static int buflen = -1;
+	static char *buf = NULL;
+
+	if (tTd(39, 1))
+	{
+		printf("map_rewrite(%.*s), av =", slen, s);
+		if (av == NULL)
+			printf(" (nullv)");
+		else
+		{
+			for (avp = av; *avp != NULL; avp++)
+				printf("\n\t%s", *avp);
+		}
+		printf("\n");
+	}
+
+	/* count expected size of output (can safely overestimate) */
+	i = len = slen;
+	if (av != NULL)
+	{
+		bp = s;
+		for (i = slen; --i >= 0 && (c = *bp++) != 0; )
+		{
+			if (c != '%')
+				continue;
+			if (--i < 0)
+				break;
+			c = *bp++;
+			if (!(isascii(c) && isdigit(c)))
+				continue;
+			for (avp = av; --c >= '0' && *avp != NULL; avp++)
+				continue;
+			if (*avp == NULL)
+				continue;
+			len += strlen(*avp);
+		}
+	}
+	if (map->map_app != NULL)
+		len += strlen(map->map_app);
+	if (buflen < ++len)
+	{
+		/* need to malloc additional space */
+		buflen = len;
+		if (buf != NULL)
+			free(buf);
+		buf = xalloc(buflen);
+	}
+
+	bp = buf;
+	if (av == NULL)
+	{
+		bcopy(s, bp, slen);
+		bp += slen;
+	}
+	else
+	{
+		while (--slen >= 0 && (c = *s++) != '\0')
+		{
+			if (c != '%')
+			{
+  pushc:
+				*bp++ = c;
+				continue;
+			}
+			if (--slen < 0 || (c = *s++) == '\0')
+				c = '%';
+			if (c == '%')
+				goto pushc;
+			if (!(isascii(c) && isdigit(c)))
+			{
+				*bp++ = '%';
+				goto pushc;
+			}
+			for (avp = av; --c >= '0' && *avp != NULL; avp++)
+				continue;
+			if (*avp == NULL)
+				continue;
+
+			/* transliterate argument into output string */
+			for (ap = *avp; (c = *ap++) != '\0'; )
+				*bp++ = c;
+		}
+	}
+	if (map->map_app != NULL)
+		strcpy(bp, map->map_app);
+	else
+		*bp = '\0';
+	if (tTd(39, 1))
+		printf("map_rewrite => %s\n", buf);
+	return buf;
+}
+/*
+**  INITMAPS -- initialize for aliasing
+**
+**	Parameters:
+**		rebuild -- if TRUE, this rebuilds the cached versions.
+**		e -- current envelope.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		initializes aliases:
+**		if NDBM:  opens the database.
+**		if ~NDBM: reads the aliases into the symbol table.
+*/
+
+initmaps(rebuild, e)
+	bool rebuild;
+	register ENVELOPE *e;
+{
+	extern void map_init();
+
+#ifdef XDEBUG
+	checkfd012("entering initmaps");
+#endif
+	CurEnv = e;
+	if (rebuild)
+	{
+		stabapply(map_init, 1);
+		stabapply(map_init, 2);
+	}
+	else
+	{
+		stabapply(map_init, 0);
+	}
+#ifdef XDEBUG
+	checkfd012("exiting initmaps");
+#endif
+}
+
+void
+map_init(s, rebuild)
+	register STAB *s;
+	int rebuild;
+{
+	register MAP *map;
+
+	/* has to be a map */
+	if (s->s_type != ST_MAP)
+		return;
+
+	map = &s->s_map;
+	if (!bitset(MF_VALID, map->map_mflags))
+		return;
+
+	if (tTd(38, 2))
+		printf("map_init(%s:%s, %d)\n",
+			map->map_class->map_cname == NULL ? "NULL" :
+				map->map_class->map_cname,
+			map->map_file == NULL ? "NULL" : map->map_file,
+			rebuild);
+
+	if (rebuild == (bitset(MF_ALIAS, map->map_mflags) &&
+		    bitset(MCF_REBUILDABLE, map->map_class->map_cflags) ? 1 : 2))
+	{
+		if (tTd(38, 3))
+			printf("\twrong pass\n");
+		return;
+	}
+
+	/* if already open, close it (for nested open) */
+	if (bitset(MF_OPEN, map->map_mflags))
+	{
+		map->map_class->map_close(map);
+		map->map_mflags &= ~(MF_OPEN|MF_WRITABLE);
+	}
+
+	if (rebuild == 2)
+	{
+		rebuildaliases(map, FALSE);
+	}
+	else
+	{
+		if (map->map_class->map_open(map, O_RDONLY))
+		{
+			if (tTd(38, 4))
+				printf("\t%s:%s: valid\n",
+					map->map_class->map_cname == NULL ? "NULL" :
+						map->map_class->map_cname,
+					map->map_file == NULL ? "NULL" :
+						map->map_file);
+			map->map_mflags |= MF_OPEN;
+		}
+		else if (tTd(38, 4))
+			printf("\t%s:%s: invalid: %s\n",
+				map->map_class->map_cname == NULL ? "NULL" :
+					map->map_class->map_cname,
+				map->map_file == NULL ? "NULL" :
+					map->map_file,
+				errstring(errno));
+	}
+}
+/*
+**  NDBM modules
+*/
+
+#ifdef NDBM
+
+/*
+**  DBM_MAP_OPEN -- DBM-style map open
+*/
+
+bool
+ndbm_map_open(map, mode)
+	MAP *map;
+	int mode;
+{
+	register DBM *dbm;
+	struct stat st;
+
+	if (tTd(38, 2))
+		printf("ndbm_map_open(%s, %d)\n", map->map_file, mode);
+
+	if (mode == O_RDWR)
+		mode |= O_CREAT|O_TRUNC;
+
+	/* open the database */
+	dbm = dbm_open(map->map_file, mode, DBMMODE);
+	if (dbm == NULL)
+	{
+#ifdef MAYBENEXTRELEASE
+		if (aliaswait(map, ".pag", FALSE))
+			return TRUE;
+#endif
+		if (!bitset(MF_OPTIONAL, map->map_mflags))
+			syserr("Cannot open DBM database %s", map->map_file);
+		return FALSE;
+	}
+	map->map_db1 = (void *) dbm;
+	if (mode == O_RDONLY)
+	{
+		if (bitset(MF_ALIAS, map->map_mflags) &&
+		    !aliaswait(map, ".pag", TRUE))
+			return FALSE;
+	}
+	else
+	{
+		int fd;
+
+		/* exclusive lock for duration of rebuild */
+		fd = dbm_dirfno((DBM *) map->map_db1);
+		if (fd >= 0 && !bitset(MF_LOCKED, map->map_mflags) &&
+		    lockfile(fd, map->map_file, ".dir", LOCK_EX))
+			map->map_mflags |= MF_LOCKED;
+	}
+	if (fstat(dbm_dirfno((DBM *) map->map_db1), &st) >= 0)
+		map->map_mtime = st.st_mtime;
+	return TRUE;
+}
+
+
+/*
+**  DBM_MAP_LOOKUP -- look up a datum in a DBM-type map
+*/
+
+char *
+ndbm_map_lookup(map, name, av, statp)
+	MAP *map;
+	char *name;
+	char **av;
+	int *statp;
+{
+	datum key, val;
+	int fd;
+	char keybuf[MAXNAME + 1];
+
+	if (tTd(38, 20))
+		printf("ndbm_map_lookup(%s)\n", name);
+
+	key.dptr = name;
+	key.dsize = strlen(name);
+	if (!bitset(MF_NOFOLDCASE, map->map_mflags))
+	{
+		if (key.dsize > sizeof keybuf - 1)
+			key.dsize = sizeof keybuf - 1;
+		bcopy(key.dptr, keybuf, key.dsize + 1);
+		makelower(keybuf);
+		key.dptr = keybuf;
+	}
+	fd = dbm_dirfno((DBM *) map->map_db1);
+	if (fd >= 0 && !bitset(MF_LOCKED, map->map_mflags))
+		(void) lockfile(fd, map->map_file, ".dir", LOCK_SH);
+	val.dptr = NULL;
+	if (bitset(MF_TRY0NULL, map->map_mflags))
+	{
+		val = dbm_fetch((DBM *) map->map_db1, key);
+		if (val.dptr != NULL)
+			map->map_mflags &= ~MF_TRY1NULL;
+	}
+	if (val.dptr == NULL && bitset(MF_TRY1NULL, map->map_mflags))
+	{
+		key.dsize++;
+		val = dbm_fetch((DBM *) map->map_db1, key);
+		if (val.dptr != NULL)
+			map->map_mflags &= ~MF_TRY0NULL;
+	}
+	if (fd >= 0 && !bitset(MF_LOCKED, map->map_mflags))
+		(void) lockfile(fd, map->map_file, ".dir", LOCK_UN);
+	if (val.dptr == NULL)
+		return NULL;
+	if (bitset(MF_MATCHONLY, map->map_mflags))
+		return map_rewrite(map, name, strlen(name), NULL);
+	else
+		return map_rewrite(map, val.dptr, val.dsize, av);
+}
+
+
+/*
+**  DBM_MAP_STORE -- store a datum in the database
+*/
+
+void
+ndbm_map_store(map, lhs, rhs)
+	register MAP *map;
+	char *lhs;
+	char *rhs;
+{
+	datum key;
+	datum data;
+	int stat;
+
+	if (tTd(38, 12))
+		printf("ndbm_map_store(%s, %s)\n", lhs, rhs);
+
+	key.dsize = strlen(lhs);
+	key.dptr = lhs;
+
+	data.dsize = strlen(rhs);
+	data.dptr = rhs;
+
+	if (bitset(MF_INCLNULL, map->map_mflags))
+	{
+		key.dsize++;
+		data.dsize++;
+	}
+
+	stat = dbm_store((DBM *) map->map_db1, key, data, DBM_INSERT);
+	if (stat > 0)
+	{
+		usrerr("050 Warning: duplicate alias name %s", lhs);
+		stat = dbm_store((DBM *) map->map_db1, key, data, DBM_REPLACE);
+	}
+	if (stat != 0)
+		syserr("readaliases: dbm put (%s)", lhs);
+}
+
+
+/*
+**  NDBM_MAP_CLOSE -- close the database
+*/
+
+void
+ndbm_map_close(map)
+	register MAP  *map;
+{
+	if (tTd(38, 9))
+		printf("ndbm_map_close(%s, %x)\n", map->map_file, map->map_mflags);
+
+	if (bitset(MF_WRITABLE, map->map_mflags))
+	{
+#ifdef NIS
+		bool inclnull;
+		char buf[200];
+
+		inclnull = bitset(MF_INCLNULL, map->map_mflags);
+		map->map_mflags &= ~MF_INCLNULL;
+
+		(void) sprintf(buf, "%010ld", curtime());
+		ndbm_map_store(map, "YP_LAST_MODIFIED", buf);
+
+		(void) gethostname(buf, sizeof buf);
+		ndbm_map_store(map, "YP_MASTER_NAME", buf);
+
+		if (inclnull)
+			map->map_mflags |= MF_INCLNULL;
+#endif
+
+		/* write out the distinguished alias */
+		ndbm_map_store(map, "@", "@");
+	}
+	dbm_close((DBM *) map->map_db1);
+}
+
+#endif
+/*
+**  NEWDB (Hash and BTree) Modules
+*/
+
+#ifdef NEWDB
+
+/*
+**  BT_MAP_OPEN, HASH_MAP_OPEN -- database open primitives.
+**
+**	These do rather bizarre locking.  If you can lock on open,
+**	do that to avoid the condition of opening a database that
+**	is being rebuilt.  If you don't, we'll try to fake it, but
+**	there will be a race condition.  If opening for read-only,
+**	we immediately release the lock to avoid freezing things up.
+**	We really ought to hold the lock, but guarantee that we won't
+**	be pokey about it.  That's hard to do.
+*/
+
+bool
+bt_map_open(map, mode)
+	MAP *map;
+	int mode;
+{
+	DB *db;
+	int i;
+	int omode;
+	int fd;
+	struct stat st;
+	char buf[MAXNAME];
+
+	if (tTd(38, 2))
+		printf("bt_map_open(%s, %d)\n", map->map_file, mode);
+
+	omode = mode;
+	if (omode == O_RDWR)
+	{
+		omode |= O_CREAT|O_TRUNC;
+#if defined(O_EXLOCK) && HASFLOCK
+		omode |= O_EXLOCK;
+# if !OLD_NEWDB
+	}
+	else
+	{
+		omode |= O_SHLOCK;
+# endif
+#endif
+	}
+
+	(void) strcpy(buf, map->map_file);
+	i = strlen(buf);
+	if (i < 3 || strcmp(&buf[i - 3], ".db") != 0)
+		(void) strcat(buf, ".db");
+	db = dbopen(buf, omode, DBMMODE, DB_BTREE, NULL);
+	if (db == NULL)
+	{
+#ifdef MAYBENEXTRELEASE
+		if (aliaswait(map, ".db", FALSE))
+			return TRUE;
+#endif
+		if (!bitset(MF_OPTIONAL, map->map_mflags))
+			syserr("Cannot open BTREE database %s", map->map_file);
+		return FALSE;
+	}
+#if !OLD_NEWDB && HASFLOCK
+	fd = db->fd(db);
+# if !defined(O_EXLOCK)
+	if (mode == O_RDWR && fd >= 0)
+	{
+		if (lockfile(fd, map->map_file, ".db", LOCK_EX))
+			map->map_mflags |= MF_LOCKED;
+	}
+# else
+	if (mode == O_RDONLY && fd >= 0)
+		(void) lockfile(fd, map->map_file, ".db", LOCK_UN);
+	else
+		map->map_mflags |= MF_LOCKED;
+# endif
+#endif
+
+	/* try to make sure that at least the database header is on disk */
+	if (mode == O_RDWR)
+#if OLD_NEWDB
+		(void) db->sync(db);
+#else
+		(void) db->sync(db, 0);
+
+	if (fd >= 0 && fstat(fd, &st) >= 0)
+		map->map_mtime = st.st_mtime;
+#endif
+
+	map->map_db2 = (void *) db;
+	if (mode == O_RDONLY && bitset(MF_ALIAS, map->map_mflags))
+		if (!aliaswait(map, ".db", TRUE))
+			return FALSE;
+	return TRUE;
+}
+
+
+/*
+**  HASH_MAP_INIT -- HASH-style map initialization
+*/
+
+bool
+hash_map_open(map, mode)
+	MAP *map;
+	int mode;
+{
+	DB *db;
+	int i;
+	int omode;
+	int fd;
+	struct stat st;
+	char buf[MAXNAME];
+
+	if (tTd(38, 2))
+		printf("hash_map_open(%s, %d)\n", map->map_file, mode);
+
+	omode = mode;
+	if (omode == O_RDWR)
+	{
+		omode |= O_CREAT|O_TRUNC;
+#if defined(O_EXLOCK) && HASFLOCK
+		omode |= O_EXLOCK;
+# if !OLD_NEWDB
+	}
+	else
+	{
+		omode |= O_SHLOCK;
+# endif
+#endif
+	}
+
+	(void) strcpy(buf, map->map_file);
+	i = strlen(buf);
+	if (i < 3 || strcmp(&buf[i - 3], ".db") != 0)
+		(void) strcat(buf, ".db");
+	db = dbopen(buf, omode, DBMMODE, DB_HASH, NULL);
+	if (db == NULL)
+	{
+#ifdef MAYBENEXTRELEASE
+		if (aliaswait(map, ".db", FALSE))
+			return TRUE;
+#endif
+		if (!bitset(MF_OPTIONAL, map->map_mflags))
+			syserr("Cannot open HASH database %s", map->map_file);
+		return FALSE;
+	}
+#if !OLD_NEWDB && HASFLOCK
+	fd = db->fd(db);
+# if !defined(O_EXLOCK)
+	if (mode == O_RDWR && fd >= 0)
+	{
+		if (lockfile(fd, map->map_file, ".db", LOCK_EX))
+			map->map_mflags |= MF_LOCKED;
+	}
+# else
+	if (mode == O_RDONLY && fd >= 0)
+		(void) lockfile(fd, map->map_file, ".db", LOCK_UN);
+	else
+		map->map_mflags |= MF_LOCKED;
+# endif
+#endif
+
+	/* try to make sure that at least the database header is on disk */
+	if (mode == O_RDWR)
+#if OLD_NEWDB
+		(void) db->sync(db);
+#else
+		(void) db->sync(db, 0);
+
+	if (fd >= 0 && fstat(fd, &st) >= 0)
+		map->map_mtime = st.st_mtime;
+#endif
+
+	map->map_db2 = (void *) db;
+	if (mode == O_RDONLY && bitset(MF_ALIAS, map->map_mflags))
+		if (!aliaswait(map, ".db", TRUE))
+			return FALSE;
+	return TRUE;
+}
+
+
+/*
+**  DB_MAP_LOOKUP -- look up a datum in a BTREE- or HASH-type map
+*/
+
+char *
+db_map_lookup(map, name, av, statp)
+	MAP *map;
+	char *name;
+	char **av;
+	int *statp;
+{
+	DBT key, val;
+	register DB *db = (DB *) map->map_db2;
+	int st;
+	int saveerrno;
+	int fd;
+	char keybuf[MAXNAME + 1];
+
+	if (tTd(38, 20))
+		printf("db_map_lookup(%s)\n", name);
+
+	key.size = strlen(name);
+	if (key.size > sizeof keybuf - 1)
+		key.size = sizeof keybuf - 1;
+	key.data = keybuf;
+	bcopy(name, keybuf, key.size + 1);
+	if (!bitset(MF_NOFOLDCASE, map->map_mflags))
+		makelower(keybuf);
+#if !OLD_NEWDB
+	fd = db->fd(db);
+	if (fd >= 0 && !bitset(MF_LOCKED, map->map_mflags))
+		(void) lockfile(db->fd(db), map->map_file, ".db", LOCK_SH);
+#endif
+	st = 1;
+	if (bitset(MF_TRY0NULL, map->map_mflags))
+	{
+		st = db->get(db, &key, &val, 0);
+		if (st == 0)
+			map->map_mflags &= ~MF_TRY1NULL;
+	}
+	if (st != 0 && bitset(MF_TRY1NULL, map->map_mflags))
+	{
+		key.size++;
+		st = db->get(db, &key, &val, 0);
+		if (st == 0)
+			map->map_mflags &= ~MF_TRY0NULL;
+	}
+	saveerrno = errno;
+#if !OLD_NEWDB
+	if (fd >= 0 && !bitset(MF_LOCKED, map->map_mflags))
+		(void) lockfile(fd, map->map_file, ".db", LOCK_UN);
+#endif
+	if (st != 0)
+	{
+		errno = saveerrno;
+		if (st < 0)
+			syserr("db_map_lookup: get (%s)", name);
+		return NULL;
+	}
+	if (bitset(MF_MATCHONLY, map->map_mflags))
+		return map_rewrite(map, name, strlen(name), NULL);
+	else
+		return map_rewrite(map, val.data, val.size, av);
+}
+
+
+/*
+**  DB_MAP_STORE -- store a datum in the NEWDB database
+*/
+
+void
+db_map_store(map, lhs, rhs)
+	register MAP *map;
+	char *lhs;
+	char *rhs;
+{
+	int stat;
+	DBT key;
+	DBT data;
+	register DB *db = map->map_db2;
+
+	if (tTd(38, 20))
+		printf("db_map_store(%s, %s)\n", lhs, rhs);
+
+	key.size = strlen(lhs);
+	key.data = lhs;
+
+	data.size = strlen(rhs);
+	data.data = rhs;
+
+	if (bitset(MF_INCLNULL, map->map_mflags))
+	{
+		key.size++;
+		data.size++;
+	}
+
+	stat = db->put(db, &key, &data, R_NOOVERWRITE);
+	if (stat > 0)
+	{
+		usrerr("050 Warning: duplicate alias name %s", lhs);
+		stat = db->put(db, &key, &data, 0);
+	}
+	if (stat != 0)
+		syserr("readaliases: db put (%s)", lhs);
+}
+
+
+/*
+**  DB_MAP_CLOSE -- add distinguished entries and close the database
+*/
+
+void
+db_map_close(map)
+	MAP *map;
+{
+	register DB *db = map->map_db2;
+
+	if (tTd(38, 9))
+		printf("db_map_close(%s, %x)\n", map->map_file, map->map_mflags);
+
+	if (bitset(MF_WRITABLE, map->map_mflags))
+	{
+		/* write out the distinguished alias */
+		db_map_store(map, "@", "@");
+	}
+
+	if (db->close(db) != 0)
+		syserr("readaliases: db close failure");
+}
+
+#endif
+/*
+**  NIS Modules
+*/
+
+# ifdef NIS
+
+# ifndef YPERR_BUSY
+#  define YPERR_BUSY	16
+# endif
+
+/*
+**  NIS_MAP_OPEN -- open DBM map
+*/
+
+bool
+nis_map_open(map, mode)
+	MAP *map;
+	int mode;
+{
+	int yperr;
+	register char *p;
+	auto char *vp;
+	auto int vsize;
+	char *master;
+
+	if (tTd(38, 2))
+		printf("nis_map_open(%s)\n", map->map_file);
+
+	if (mode != O_RDONLY)
+	{
+		/* issue a pseudo-error message */
+#ifdef ENOSYS
+		errno = ENOSYS;
+#else
+# ifdef EFTYPE
+		errno = EFTYPE;
+# else
+		errno = ENXIO;
+# endif
+#endif
+		return FALSE;
+	}
+
+	p = strchr(map->map_file, '@');
+	if (p != NULL)
+	{
+		*p++ = '\0';
+		if (*p != '\0')
+			map->map_domain = p;
+	}
+
+	if (*map->map_file == '\0')
+		map->map_file = "mail.aliases";
+
+	if (map->map_domain == NULL)
+	{
+		yperr = yp_get_default_domain(&map->map_domain);
+		if (yperr != 0)
+		{
+			if (!bitset(MF_OPTIONAL, map->map_mflags))
+				syserr("NIS map %s specified, but NIS not running\n",
+					map->map_file);
+			return FALSE;
+		}
+	}
+
+	/* check to see if this map actually exists */
+	yperr = yp_match(map->map_domain, map->map_file, "@", 1,
+			&vp, &vsize);
+	if (tTd(38, 10))
+		printf("nis_map_open: yp_match(%s, %s) => %s\n",
+			map->map_domain, map->map_file, yperr_string(yperr));
+	if (yperr == 0 || yperr == YPERR_KEY || yperr == YPERR_BUSY)
+		return TRUE;
+
+	if (!bitset(MF_OPTIONAL, map->map_mflags))
+		syserr("Cannot bind to domain %s: %s", map->map_domain,
+			yperr_string(yperr));
+
+	return FALSE;
+}
+
+
+/*
+**  NIS_MAP_LOOKUP -- look up a datum in a NIS map
+*/
+
+char *
+nis_map_lookup(map, name, av, statp)
+	MAP *map;
+	char *name;
+	char **av;
+	int *statp;
+{
+	char *vp;
+	auto int vsize;
+	int buflen;
+	int yperr;
+	char keybuf[MAXNAME + 1];
+
+	if (tTd(38, 20))
+		printf("nis_map_lookup(%s)\n", name);
+
+	buflen = strlen(name);
+	if (buflen > sizeof keybuf - 1)
+		buflen = sizeof keybuf - 1;
+	bcopy(name, keybuf, buflen + 1);
+	if (!bitset(MF_NOFOLDCASE, map->map_mflags))
+		makelower(keybuf);
+	yperr = YPERR_KEY;
+	if (bitset(MF_TRY0NULL, map->map_mflags))
+	{
+		yperr = yp_match(map->map_domain, map->map_file, keybuf, buflen,
+			     &vp, &vsize);
+		if (yperr == 0)
+			map->map_mflags &= ~MF_TRY1NULL;
+	}
+	if (yperr == YPERR_KEY && bitset(MF_TRY1NULL, map->map_mflags))
+	{
+		buflen++;
+		yperr = yp_match(map->map_domain, map->map_file, keybuf, buflen,
+			     &vp, &vsize);
+		if (yperr == 0)
+			map->map_mflags &= ~MF_TRY0NULL;
+	}
+	if (yperr != 0)
+	{
+		if (yperr != YPERR_KEY && yperr != YPERR_BUSY)
+			map->map_mflags &= ~(MF_VALID|MF_OPEN);
+		return NULL;
+	}
+	if (bitset(MF_MATCHONLY, map->map_mflags))
+		return map_rewrite(map, name, strlen(name), NULL);
+	else
+		return map_rewrite(map, vp, vsize, av);
+}
+
+
+/*
+**  NIS_MAP_STORE
+*/
+
+void
+nis_map_store(map, lhs, rhs)
+	MAP *map;
+	char *lhs;
+	char *rhs;
+{
+	/* nothing */
+}
+
+
+/*
+**  NIS_MAP_CLOSE
+*/
+
+void
+nis_map_close(map)
+	MAP *map;
+{
+	/* nothing */
+}
+
+#endif /* NIS */
+/*
+**  STAB (Symbol Table) Modules
+*/
+
+
+/*
+**  STAB_MAP_LOOKUP -- look up alias in symbol table
+*/
+
+char *
+stab_map_lookup(map, name, av, pstat)
+	register MAP *map;
+	char *name;
+	char **av;
+	int *pstat;
+{
+	register STAB *s;
+
+	if (tTd(38, 20))
+		printf("stab_lookup(%s)\n", name);
+
+	s = stab(name, ST_ALIAS, ST_FIND);
+	if (s != NULL)
+		return (s->s_alias);
+	return (NULL);
+}
+
+
+/*
+**  STAB_MAP_STORE -- store in symtab (actually using during init, not rebuild)
+*/
+
+void
+stab_map_store(map, lhs, rhs)
+	register MAP *map;
+	char *lhs;
+	char *rhs;
+{
+	register STAB *s;
+
+	s = stab(lhs, ST_ALIAS, ST_ENTER);
+	s->s_alias = newstr(rhs);
+}
+
+
+/*
+**  STAB_MAP_OPEN -- initialize (reads data file)
+**
+**	This is a wierd case -- it is only intended as a fallback for
+**	aliases.  For this reason, opens for write (only during a
+**	"newaliases") always fails, and opens for read open the
+**	actual underlying text file instead of the database.
+*/
+
+bool
+stab_map_open(map, mode)
+	register MAP *map;
+	int mode;
+{
+	FILE *af;
+	struct stat st;
+
+	if (tTd(38, 2))
+		printf("stab_map_open(%s)\n", map->map_file);
+
+	if (mode != O_RDONLY)
+	{
+		errno = ENODEV;
+		return FALSE;
+	}
+
+	af = fopen(map->map_file, "r");
+	if (af == NULL)
+		return FALSE;
+	readaliases(map, af, TRUE);
+
+	if (fstat(fileno(af), &st) >= 0)
+		map->map_mtime = st.st_mtime;
+	fclose(af);
+
+	return TRUE;
+}
+
+
+/*
+**  STAB_MAP_CLOSE -- close symbol table.
+**
+**	Since this is in memory, there is nothing to do.
+*/
+
+void
+stab_map_close(map)
+	MAP *map;
+{
+	/* ignore it */
+}
+/*
+**  Implicit Modules
+**
+**	Tries several types.  For back compatibility of aliases.
+*/
+
+
+/*
+**  IMPL_MAP_LOOKUP -- lookup in best open database
+*/
+
+char *
+impl_map_lookup(map, name, av, pstat)
+	MAP *map;
+	char *name;
+	char **av;
+	int *pstat;
+{
+	if (tTd(38, 20))
+		printf("impl_map_lookup(%s)\n", name);
+
+#ifdef NEWDB
+	if (bitset(MF_IMPL_HASH, map->map_mflags))
+		return db_map_lookup(map, name, av, pstat);
+#endif
+#ifdef NDBM
+	if (bitset(MF_IMPL_NDBM, map->map_mflags))
+		return ndbm_map_lookup(map, name, av, pstat);
+#endif
+	return stab_map_lookup(map, name, av, pstat);
+}
+
+/*
+**  IMPL_MAP_STORE -- store in open databases
+*/
+
+void
+impl_map_store(map, lhs, rhs)
+	MAP *map;
+	char *lhs;
+	char *rhs;
+{
+#ifdef NEWDB
+	if (bitset(MF_IMPL_HASH, map->map_mflags))
+		db_map_store(map, lhs, rhs);
+#endif
+#ifdef NDBM
+	if (bitset(MF_IMPL_NDBM, map->map_mflags))
+		ndbm_map_store(map, lhs, rhs);
+#endif
+	stab_map_store(map, lhs, rhs);
+}
+
+/*
+**  IMPL_MAP_OPEN -- implicit database open
+*/
+
+bool
+impl_map_open(map, mode)
+	MAP *map;
+	int mode;
+{
+	struct stat stb;
+
+	if (tTd(38, 2))
+		printf("impl_map_open(%s, %d)\n", map->map_file, mode);
+
+	if (stat(map->map_file, &stb) < 0)
+	{
+		/* no alias file at all */
+		if (tTd(38, 3))
+			printf("no map file\n");
+		return FALSE;
+	}
+
+#ifdef NEWDB
+	map->map_mflags |= MF_IMPL_HASH;
+	if (hash_map_open(map, mode))
+	{
+#if defined(NDBM) && defined(NIS)
+		if (mode == O_RDONLY || access("/var/yp/Makefile", R_OK) != 0)
+#endif
+			return TRUE;
+	}
+	else
+		map->map_mflags &= ~MF_IMPL_HASH;
+#endif
+#ifdef NDBM
+	map->map_mflags |= MF_IMPL_NDBM;
+	if (ndbm_map_open(map, mode))
+	{
+		return TRUE;
+	}
+	else
+		map->map_mflags &= ~MF_IMPL_NDBM;
+#endif
+
+#if defined(NEWDB) || defined(NDBM)
+	if (Verbose)
+		message("WARNING: cannot open alias database %s", map->map_file);
+#else
+	if (mode != O_RDONLY)
+		usrerr("Cannot rebuild aliases: no database format defined");
+#endif
+
+	return stab_map_open(map, mode);
+}
+
+
+/*
+**  IMPL_MAP_CLOSE -- close any open database(s)
+*/
+
+void
+impl_map_close(map)
+	MAP *map;
+{
+#ifdef NEWDB
+	if (bitset(MF_IMPL_HASH, map->map_mflags))
+	{
+		db_map_close(map);
+		map->map_mflags &= ~MF_IMPL_HASH;
+	}
+#endif
+
+#ifdef NDBM
+	if (bitset(MF_IMPL_NDBM, map->map_mflags))
+	{
+		ndbm_map_close(map);
+		map->map_mflags &= ~MF_IMPL_NDBM;
+	}
+#endif
+}
+/*
+**  NULL stubs
+*/
+
+bool
+null_map_open(map, mode)
+	MAP *map;
+	int mode;
+{
+	return TRUE;
+}
+
+void
+null_map_close(map)
+	MAP *map;
+{
+	return;
+}
+
+void
+null_map_store(map, key, val)
+	MAP *map;
+	char *key;
+	char *val;
+{
+	return;
+}
diff --git a/usr.sbin/sendmail/src/mci.c b/usr.sbin/sendmail/src/mci.c
new file mode 100644
index 00000000000..8211a6280d0
--- /dev/null
+++ b/usr.sbin/sendmail/src/mci.c
@@ -0,0 +1,404 @@
+/*
+ * Copyright (c) 1983 Eric P. Allman
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)mci.c	8.14 (Berkeley) 5/15/94";
+#endif /* not lint */
+
+#include "sendmail.h"
+
+/*
+**  Mail Connection Information (MCI) Caching Module.
+**
+**	There are actually two separate things cached.  The first is
+**	the set of all open connections -- these are stored in a
+**	(small) list.  The second is stored in the symbol table; it
+**	has the overall status for all hosts, whether or not there
+**	is a connection open currently.
+**
+**	There should never be too many connections open (since this
+**	could flood the socket table), nor should a connection be
+**	allowed to sit idly for too long.
+**
+**	MaxMciCache is the maximum number of open connections that
+**	will be supported.
+**
+**	MciCacheTimeout is the time (in seconds) that a connection
+**	is permitted to survive without activity.
+**
+**	We actually try any cached connections by sending a NOOP
+**	before we use them; if the NOOP fails we close down the
+**	connection and reopen it.  Note that this means that a
+**	server SMTP that doesn't support NOOP will hose the
+**	algorithm -- but that doesn't seem too likely.
+*/
+
+MCI	**MciCache;		/* the open connection cache */
+/*
+**  MCI_CACHE -- enter a connection structure into the open connection cache
+**
+**	This may cause something else to be flushed.
+**
+**	Parameters:
+**		mci -- the connection to cache.
+**
+**	Returns:
+**		none.
+*/
+
+mci_cache(mci)
+	register MCI *mci;
+{
+	register MCI **mcislot;
+	extern MCI **mci_scan();
+
+	/*
+	**  Find the best slot.  This may cause expired connections
+	**  to be closed.
+	*/
+
+	mcislot = mci_scan(mci);
+	if (mcislot == NULL)
+	{
+		/* we don't support caching */
+		return;
+	}
+
+	/* if this is already cached, we are done */
+	if (bitset(MCIF_CACHED, mci->mci_flags))
+		return;
+
+	/* otherwise we may have to clear the slot */
+	if (*mcislot != NULL)
+		mci_uncache(mcislot, TRUE);
+
+	if (tTd(42, 5))
+		printf("mci_cache: caching %x (%s) in slot %d\n",
+			mci, mci->mci_host, mcislot - MciCache);
+#ifdef LOG
+	if (tTd(91, 100))
+		syslog(LOG_DEBUG, "%s: mci_cache: caching %x (%s) in slot %d",
+			CurEnv->e_id ? CurEnv->e_id : "NOQUEUE",
+			mci, mci->mci_host, mcislot - MciCache);
+#endif
+
+	*mcislot = mci;
+	mci->mci_flags |= MCIF_CACHED;
+}
+/*
+**  MCI_SCAN -- scan the cache, flush junk, and return best slot
+**
+**	Parameters:
+**		savemci -- never flush this one.  Can be null.
+**
+**	Returns:
+**		The LRU (or empty) slot.
+*/
+
+MCI **
+mci_scan(savemci)
+	MCI *savemci;
+{
+	time_t now;
+	register MCI **bestmci;
+	register MCI *mci;
+	register int i;
+
+	if (MaxMciCache <= 0)
+	{
+		/* we don't support caching */
+		return NULL;
+	}
+
+	if (MciCache == NULL)
+	{
+		/* first call */
+		MciCache = (MCI **) xalloc(MaxMciCache * sizeof *MciCache);
+		bzero((char *) MciCache, MaxMciCache * sizeof *MciCache);
+		return (&MciCache[0]);
+	}
+
+	now = curtime();
+	bestmci = &MciCache[0];
+	for (i = 0; i < MaxMciCache; i++)
+	{
+		mci = MciCache[i];
+		if (mci == NULL || mci->mci_state == MCIS_CLOSED)
+		{
+			bestmci = &MciCache[i];
+			continue;
+		}
+		if (mci->mci_lastuse + MciCacheTimeout < now && mci != savemci)
+		{
+			/* connection idle too long -- close it */
+			bestmci = &MciCache[i];
+			mci_uncache(bestmci, TRUE);
+			continue;
+		}
+		if (*bestmci == NULL)
+			continue;
+		if (mci->mci_lastuse < (*bestmci)->mci_lastuse)
+			bestmci = &MciCache[i];
+	}
+	return bestmci;
+}
+/*
+**  MCI_UNCACHE -- remove a connection from a slot.
+**
+**	May close a connection.
+**
+**	Parameters:
+**		mcislot -- the slot to empty.
+**		doquit -- if TRUE, send QUIT protocol on this connection.
+**			  if FALSE, we are assumed to be in a forked child;
+**				all we want to do is close the file(s).
+**
+**	Returns:
+**		none.
+*/
+
+mci_uncache(mcislot, doquit)
+	register MCI **mcislot;
+	bool doquit;
+{
+	register MCI *mci;
+	extern ENVELOPE BlankEnvelope;
+
+	mci = *mcislot;
+	if (mci == NULL)
+		return;
+	*mcislot = NULL;
+
+	if (tTd(42, 5))
+		printf("mci_uncache: uncaching %x (%s) from slot %d (%d)\n",
+			mci, mci->mci_host, mcislot - MciCache, doquit);
+#ifdef LOG
+	if (tTd(91, 100))
+		syslog(LOG_DEBUG, "%s: mci_uncache: uncaching %x (%s) from slot %d (%d)",
+			CurEnv->e_id ? CurEnv->e_id : "NOQUEUE",
+			mci, mci->mci_host, mcislot - MciCache, doquit);
+#endif
+
+	if (doquit)
+	{
+		message("Closing connection to %s", mci->mci_host);
+
+		mci->mci_flags &= ~MCIF_CACHED;
+
+		/* only uses the envelope to flush the transcript file */
+		if (mci->mci_state != MCIS_CLOSED)
+			smtpquit(mci->mci_mailer, mci, &BlankEnvelope);
+#ifdef XLA
+		xla_host_end(mci->mci_host);
+#endif
+	}
+	else
+	{
+		if (mci->mci_in != NULL)
+			xfclose(mci->mci_in, "mci_uncache", "mci_in");
+		if (mci->mci_out != NULL)
+			xfclose(mci->mci_out, "mci_uncache", "mci_out");
+		mci->mci_in = mci->mci_out = NULL;
+		mci->mci_state = MCIS_CLOSED;
+		mci->mci_exitstat = EX_OK;
+		mci->mci_errno = 0;
+		mci->mci_flags = 0;
+	}
+}
+/*
+**  MCI_FLUSH -- flush the entire cache
+**
+**	Parameters:
+**		doquit -- if TRUE, send QUIT protocol.
+**			  if FALSE, just close the connection.
+**		allbut -- but leave this one open.
+**
+**	Returns:
+**		none.
+*/
+
+mci_flush(doquit, allbut)
+	bool doquit;
+	MCI *allbut;
+{
+	register int i;
+
+	if (MciCache == NULL)
+		return;
+
+	for (i = 0; i < MaxMciCache; i++)
+		if (allbut != MciCache[i])
+			mci_uncache(&MciCache[i], doquit);
+}
+/*
+**  MCI_GET -- get information about a particular host
+*/
+
+MCI *
+mci_get(host, m)
+	char *host;
+	MAILER *m;
+{
+	register MCI *mci;
+	register STAB *s;
+	extern MCI **mci_scan();
+
+#ifdef DAEMON
+	extern SOCKADDR CurHostAddr;
+
+	/* clear CurHostAddr so we don't get a bogus address with this name */
+	bzero(&CurHostAddr, sizeof CurHostAddr);
+#endif
+
+	/* clear out any expired connections */
+	(void) mci_scan(NULL);
+
+	if (m->m_mno < 0)
+		syserr("negative mno %d (%s)", m->m_mno, m->m_name);
+	s = stab(host, ST_MCI + m->m_mno, ST_ENTER);
+	mci = &s->s_mci;
+	mci->mci_host = s->s_name;
+
+	if (tTd(42, 2))
+	{
+		printf("mci_get(%s %s): mci_state=%d, _flags=%x, _exitstat=%d, _errno=%d\n",
+			host, m->m_name, mci->mci_state, mci->mci_flags,
+			mci->mci_exitstat, mci->mci_errno);
+	}
+
+	if (mci->mci_state == MCIS_OPEN)
+	{
+		/* poke the connection to see if it's still alive */
+		smtpprobe(mci);
+
+		/* reset the stored state in the event of a timeout */
+		if (mci->mci_state != MCIS_OPEN)
+		{
+			mci->mci_errno = 0;
+			mci->mci_exitstat = EX_OK;
+			mci->mci_state = MCIS_CLOSED;
+		}
+		else
+		{
+			/* get peer host address for logging reasons only */
+			/* (this should really be in the mci struct) */
+			int socksize = sizeof CurHostAddr;
+
+			(void) getpeername(fileno(mci->mci_in),
+				(struct sockaddr *) &CurHostAddr, &socksize);
+		}
+	}
+	if (mci->mci_state == MCIS_CLOSED)
+	{
+		/* copy out any mailer flags needed in connection state */
+		if (bitnset(M_7BITS, m->m_flags))
+			mci->mci_flags |= MCIF_7BIT;
+	}
+
+	return mci;
+}
+/*
+**  MCI_DUMP -- dump the contents of an MCI structure.
+**
+**	Parameters:
+**		mci -- the MCI structure to dump.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		none.
+*/
+
+mci_dump(mci, logit)
+	register MCI *mci;
+	bool logit;
+{
+	register char *p;
+	char *sep;
+	char buf[1000];
+	extern char *ctime();
+
+	sep = logit ? " " : "\n\t";
+	p = buf;
+	sprintf(p, "MCI@%x: ", mci);
+	p += strlen(p);
+	if (mci == NULL)
+	{
+		sprintf(p, "NULL");
+		goto printit;
+	}
+	sprintf(p, "flags=%o, errno=%d, herrno=%d, exitstat=%d, state=%d, pid=%d,%s",
+		mci->mci_flags, mci->mci_errno, mci->mci_herrno,
+		mci->mci_exitstat, mci->mci_state, mci->mci_pid, sep);
+	p += strlen(p);
+	sprintf(p, "maxsize=%ld, phase=%s, mailer=%s,%s",
+		mci->mci_maxsize,
+		mci->mci_phase == NULL ? "NULL" : mci->mci_phase,
+		mci->mci_mailer == NULL ? "NULL" : mci->mci_mailer->m_name,
+		sep);
+	p += strlen(p);
+	sprintf(p, "host=%s, lastuse=%s",
+		mci->mci_host == NULL ? "NULL" : mci->mci_host,
+		ctime(&mci->mci_lastuse));
+printit:
+#ifdef LOG
+	if (logit)
+		syslog(LOG_DEBUG, "%s", buf);
+	else
+#endif
+		printf("%s\n", buf);
+}
+/*
+**  MCI_DUMP_ALL -- print the entire MCI cache
+**
+**	Parameters:
+**		logit -- if set, log the result instead of printing
+**			to stdout.
+**
+**	Returns:
+**		none.
+*/
+
+mci_dump_all(logit)
+	bool logit;
+{
+	register int i;
+
+	if (MciCache == NULL)
+		return;
+
+	for (i = 0; i < MaxMciCache; i++)
+		mci_dump(MciCache[i], logit);
+}
diff --git a/usr.sbin/sendmail/src/newaliases.1 b/usr.sbin/sendmail/src/newaliases.1
new file mode 100644
index 00000000000..c611b78b62b
--- /dev/null
+++ b/usr.sbin/sendmail/src/newaliases.1
@@ -0,0 +1,68 @@
+.\" Copyright (c) 1985, 1990, 1993
+.\"	The Regents of the University of California.  All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 3. All advertising materials mentioning features or use of this software
+.\"    must display the following acknowledgement:
+.\"	This product includes software developed by the University of
+.\"	California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     @(#)newaliases.1	8.4 (Berkeley) 2/22/94
+.\"
+.Dd February 22, 1994
+.Dt NEWALIASES 1
+.Os BSD 4
+.Sh NAME
+.Nm newaliases
+.Nd rebuild the data base for the mail aliases file
+.Sh SYNOPSIS
+.Nm newaliases
+.Sh DESCRIPTION
+.Nm Newaliases
+rebuilds the random access data base for the mail aliases file
+.Pa /etc/aliases .
+It must be run each time this file is changed in order
+for the change to take effect.
+.Pp
+.Nm Newaliases
+is identical to
+.Dq Li "sendmail -bi" .
+.Pp
+The
+.Nm newaliases
+utility exits 0 on success, and >0 if an error occurs.
+.Sh FILES
+.Bl -tag -width /etc/aliases -compact
+.It Pa /etc/aliases
+The mail aliases file
+.El
+.Sh SEE ALSO
+.Xr aliases 5 ,
+.Xr sendmail 8
+.Sh HISTORY
+The
+.Nm newaliases
+command appeared in
+.Bx 4.0 .
diff --git a/usr.sbin/sendmail/src/parseaddr.c b/usr.sbin/sendmail/src/parseaddr.c
new file mode 100644
index 00000000000..00621c25345
--- /dev/null
+++ b/usr.sbin/sendmail/src/parseaddr.c
@@ -0,0 +1,1964 @@
+/*
+ * Copyright (c) 1983 Eric P. Allman
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)parseaddr.c	8.31 (Berkeley) 4/15/94";
+#endif /* not lint */
+
+# include "sendmail.h"
+
+/*
+**  PARSEADDR -- Parse an address
+**
+**	Parses an address and breaks it up into three parts: a
+**	net to transmit the message on, the host to transmit it
+**	to, and a user on that host.  These are loaded into an
+**	ADDRESS header with the values squirreled away if necessary.
+**	The "user" part may not be a real user; the process may
+**	just reoccur on that machine.  For example, on a machine
+**	with an arpanet connection, the address
+**		csvax.bill@berkeley
+**	will break up to a "user" of 'csvax.bill' and a host
+**	of 'berkeley' -- to be transmitted over the arpanet.
+**
+**	Parameters:
+**		addr -- the address to parse.
+**		a -- a pointer to the address descriptor buffer.
+**			If NULL, a header will be created.
+**		flags -- describe detail for parsing.  See RF_ definitions
+**			in sendmail.h.
+**		delim -- the character to terminate the address, passed
+**			to prescan.
+**		delimptr -- if non-NULL, set to the location of the
+**			delim character that was found.
+**		e -- the envelope that will contain this address.
+**
+**	Returns:
+**		A pointer to the address descriptor header (`a' if
+**			`a' is non-NULL).
+**		NULL on error.
+**
+**	Side Effects:
+**		none
+*/
+
+/* following delimiters are inherent to the internal algorithms */
+# define DELIMCHARS	"()<>,;\r\n"	/* default word delimiters */
+
+ADDRESS *
+parseaddr(addr, a, flags, delim, delimptr, e)
+	char *addr;
+	register ADDRESS *a;
+	int flags;
+	int delim;
+	char **delimptr;
+	register ENVELOPE *e;
+{
+	register char **pvp;
+	auto char *delimptrbuf;
+	bool queueup;
+	char pvpbuf[PSBUFSIZE];
+	extern ADDRESS *buildaddr();
+	extern bool invalidaddr();
+
+	/*
+	**  Initialize and prescan address.
+	*/
+
+	e->e_to = addr;
+	if (tTd(20, 1))
+		printf("\n--parseaddr(%s)\n", addr);
+
+	if (delimptr == NULL)
+		delimptr = &delimptrbuf;
+
+	pvp = prescan(addr, delim, pvpbuf, sizeof pvpbuf, delimptr);
+	if (pvp == NULL)
+	{
+		if (tTd(20, 1))
+			printf("parseaddr-->NULL\n");
+		return (NULL);
+	}
+
+	if (invalidaddr(addr, delim == '\0' ? NULL : *delimptr))
+	{
+		if (tTd(20, 1))
+			printf("parseaddr-->bad address\n");
+		return NULL;
+	}
+
+	/*
+	**  Save addr if we are going to have to.
+	**
+	**	We have to do this early because there is a chance that
+	**	the map lookups in the rewriting rules could clobber
+	**	static memory somewhere.
+	*/
+
+	if (bitset(RF_COPYPADDR, flags) && addr != NULL)
+	{
+		char savec = **delimptr;
+
+		if (savec != '\0')
+			**delimptr = '\0';
+		e->e_to = addr = newstr(addr);
+		if (savec != '\0')
+			**delimptr = savec;
+	}
+
+	/*
+	**  Apply rewriting rules.
+	**	Ruleset 0 does basic parsing.  It must resolve.
+	*/
+
+	queueup = FALSE;
+	if (rewrite(pvp, 3, 0, e) == EX_TEMPFAIL)
+		queueup = TRUE;
+	if (rewrite(pvp, 0, 0, e) == EX_TEMPFAIL)
+		queueup = TRUE;
+
+
+	/*
+	**  Build canonical address from pvp.
+	*/
+
+	a = buildaddr(pvp, a, flags, e);
+
+	/*
+	**  Make local copies of the host & user and then
+	**  transport them out.
+	*/
+
+	allocaddr(a, flags, addr);
+	if (bitset(QBADADDR, a->q_flags))
+		return a;
+
+	/*
+	**  If there was a parsing failure, mark it for queueing.
+	*/
+
+	if (queueup)
+	{
+		char *msg = "Transient parse error -- message queued for future delivery";
+
+		if (tTd(20, 1))
+			printf("parseaddr: queuing message\n");
+		message(msg);
+		if (e->e_message == NULL)
+			e->e_message = newstr(msg);
+		a->q_flags |= QQUEUEUP;
+	}
+
+	/*
+	**  Compute return value.
+	*/
+
+	if (tTd(20, 1))
+	{
+		printf("parseaddr-->");
+		printaddr(a, FALSE);
+	}
+
+	return (a);
+}
+/*
+**  INVALIDADDR -- check for address containing meta-characters
+**
+**	Parameters:
+**		addr -- the address to check.
+**
+**	Returns:
+**		TRUE -- if the address has any "wierd" characters
+**		FALSE -- otherwise.
+*/
+
+bool
+invalidaddr(addr, delimptr)
+	register char *addr;
+	char *delimptr;
+{
+	char savedelim;
+
+	if (delimptr != NULL)
+	{
+		savedelim = *delimptr;
+		if (savedelim != '\0')
+			*delimptr = '\0';
+	}
+#if 0
+	/* for testing.... */
+	if (strcmp(addr, "INvalidADDR") == 0)
+	{
+		usrerr("553 INvalid ADDRess");
+		goto addrfailure;
+	}
+#endif
+	for (; *addr != '\0'; addr++)
+	{
+		if ((*addr & 0340) == 0200)
+			break;
+	}
+	if (*addr == '\0')
+	{
+		if (savedelim != '\0' && delimptr != NULL)
+			*delimptr = savedelim;
+		return FALSE;
+	}
+	setstat(EX_USAGE);
+	usrerr("553 Address contained invalid control characters");
+  addrfailure:
+	if (savedelim != '\0' && delimptr != NULL)
+		*delimptr = savedelim;
+	return TRUE;
+}
+/*
+**  ALLOCADDR -- do local allocations of address on demand.
+**
+**	Also lowercases the host name if requested.
+**
+**	Parameters:
+**		a -- the address to reallocate.
+**		flags -- the copy flag (see RF_ definitions in sendmail.h
+**			for a description).
+**		paddr -- the printname of the address.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		Copies portions of a into local buffers as requested.
+*/
+
+allocaddr(a, flags, paddr)
+	register ADDRESS *a;
+	int flags;
+	char *paddr;
+{
+	if (tTd(24, 4))
+		printf("allocaddr(flags=%o, paddr=%s)\n", flags, paddr);
+
+	a->q_paddr = paddr;
+
+	if (a->q_user == NULL)
+		a->q_user = "";
+	if (a->q_host == NULL)
+		a->q_host = "";
+
+	if (bitset(RF_COPYPARSE, flags))
+	{
+		a->q_host = newstr(a->q_host);
+		if (a->q_user != a->q_paddr)
+			a->q_user = newstr(a->q_user);
+	}
+
+	if (a->q_paddr == NULL)
+		a->q_paddr = a->q_user;
+}
+/*
+**  PRESCAN -- Prescan name and make it canonical
+**
+**	Scans a name and turns it into a set of tokens.  This process
+**	deletes blanks and comments (in parentheses).
+**
+**	This routine knows about quoted strings and angle brackets.
+**
+**	There are certain subtleties to this routine.  The one that
+**	comes to mind now is that backslashes on the ends of names
+**	are silently stripped off; this is intentional.  The problem
+**	is that some versions of sndmsg (like at LBL) set the kill
+**	character to something other than @ when reading addresses;
+**	so people type "csvax.eric\@berkeley" -- which screws up the
+**	berknet mailer.
+**
+**	Parameters:
+**		addr -- the name to chomp.
+**		delim -- the delimiter for the address, normally
+**			'\0' or ','; \0 is accepted in any case.
+**			If '\t' then we are reading the .cf file.
+**		pvpbuf -- place to put the saved text -- note that
+**			the pointers are static.
+**		pvpbsize -- size of pvpbuf.
+**		delimptr -- if non-NULL, set to the location of the
+**			terminating delimiter.
+**
+**	Returns:
+**		A pointer to a vector of tokens.
+**		NULL on error.
+*/
+
+/* states and character types */
+# define OPR		0	/* operator */
+# define ATM		1	/* atom */
+# define QST		2	/* in quoted string */
+# define SPC		3	/* chewing up spaces */
+# define ONE		4	/* pick up one character */
+
+# define NSTATES	5	/* number of states */
+# define TYPE		017	/* mask to select state type */
+
+/* meta bits for table */
+# define M		020	/* meta character; don't pass through */
+# define B		040	/* cause a break */
+# define MB		M|B	/* meta-break */
+
+static short StateTab[NSTATES][NSTATES] =
+{
+   /*	oldst	chtype>	OPR	ATM	QST	SPC	ONE	*/
+	/*OPR*/		OPR|B,	ATM|B,	QST|B,	SPC|MB,	ONE|B,
+	/*ATM*/		OPR|B,	ATM,	QST|B,	SPC|MB,	ONE|B,
+	/*QST*/		QST,	QST,	OPR,	QST,	QST,
+	/*SPC*/		OPR,	ATM,	QST,	SPC|M,	ONE,
+	/*ONE*/		OPR,	OPR,	OPR,	OPR,	OPR,
+};
+
+/* token type table -- it gets modified with $o characters */
+static TokTypeTab[256] =
+{
+	ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,SPC,SPC,SPC,SPC,SPC,ATM,ATM,
+	ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,
+	SPC,ATM,QST,ATM,ATM,ATM,ATM,ATM,ATM,SPC,ATM,ATM,ATM,ATM,ATM,ATM,
+	ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,
+	ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,
+	ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,
+	ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,
+	ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,
+	OPR,OPR,ONE,OPR,OPR,OPR,OPR,OPR,OPR,OPR,OPR,OPR,OPR,OPR,OPR,OPR,
+	OPR,OPR,OPR,ONE,ONE,ONE,OPR,OPR,OPR,OPR,OPR,OPR,OPR,OPR,OPR,OPR,
+	ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,
+	ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,
+	ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,
+	ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,
+	ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,
+	ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,ATM,
+};
+
+#define toktype(c)	((int) TokTypeTab[(c) & 0xff])
+
+
+# define NOCHAR		-1	/* signal nothing in lookahead token */
+
+char **
+prescan(addr, delim, pvpbuf, pvpbsize, delimptr)
+	char *addr;
+	char delim;
+	char pvpbuf[];
+	char **delimptr;
+{
+	register char *p;
+	register char *q;
+	register int c;
+	char **avp;
+	bool bslashmode;
+	int cmntcnt;
+	int anglecnt;
+	char *tok;
+	int state;
+	int newstate;
+	char *saveto = CurEnv->e_to;
+	static char *av[MAXATOM+1];
+	static char firsttime = TRUE;
+	extern int errno;
+
+	if (firsttime)
+	{
+		/* initialize the token type table */
+		char obuf[50];
+
+		firsttime = FALSE;
+		expand("\201o", obuf, &obuf[sizeof obuf - sizeof DELIMCHARS], CurEnv);
+		strcat(obuf, DELIMCHARS);
+		for (p = obuf; *p != '\0'; p++)
+		{
+			if (TokTypeTab[*p & 0xff] == ATM)
+				TokTypeTab[*p & 0xff] = OPR;
+		}
+	}
+
+	/* make sure error messages don't have garbage on them */
+	errno = 0;
+
+	q = pvpbuf;
+	bslashmode = FALSE;
+	cmntcnt = 0;
+	anglecnt = 0;
+	avp = av;
+	state = ATM;
+	c = NOCHAR;
+	p = addr;
+	CurEnv->e_to = p;
+	if (tTd(22, 11))
+	{
+		printf("prescan: ");
+		xputs(p);
+		(void) putchar('\n');
+	}
+
+	do
+	{
+		/* read a token */
+		tok = q;
+		for (;;)
+		{
+			/* store away any old lookahead character */
+			if (c != NOCHAR && !bslashmode)
+			{
+				/* see if there is room */
+				if (q >= &pvpbuf[pvpbsize - 5])
+				{
+					usrerr("553 Address too long");
+	returnnull:
+					if (delimptr != NULL)
+						*delimptr = p;
+					CurEnv->e_to = saveto;
+					return (NULL);
+				}
+
+				/* squirrel it away */
+				*q++ = c;
+			}
+
+			/* read a new input character */
+			c = *p++;
+			if (c == '\0')
+			{
+				/* diagnose and patch up bad syntax */
+				if (state == QST)
+				{
+					usrerr("653 Unbalanced '\"'");
+					c = '"';
+				}
+				else if (cmntcnt > 0)
+				{
+					usrerr("653 Unbalanced '('");
+					c = ')';
+				}
+				else if (anglecnt > 0)
+				{
+					c = '>';
+					usrerr("653 Unbalanced '<'");
+				}
+				else
+					break;
+
+				p--;
+			}
+			else if (c == delim && anglecnt <= 0 &&
+					cmntcnt <= 0 && state != QST)
+				break;
+
+			if (tTd(22, 101))
+				printf("c=%c, s=%d; ", c, state);
+
+			/* chew up special characters */
+			*q = '\0';
+			if (bslashmode)
+			{
+				bslashmode = FALSE;
+
+				/* kludge \! for naive users */
+				if (cmntcnt > 0)
+				{
+					c = NOCHAR;
+					continue;
+				}
+				else if (c != '!' || state == QST)
+				{
+					*q++ = '\\';
+					continue;
+				}
+			}
+
+			if (c == '\\')
+			{
+				bslashmode = TRUE;
+			}
+			else if (state == QST)
+			{
+				/* do nothing, just avoid next clauses */
+			}
+			else if (c == '(')
+			{
+				cmntcnt++;
+				c = NOCHAR;
+			}
+			else if (c == ')')
+			{
+				if (cmntcnt <= 0)
+				{
+					usrerr("653 Unbalanced ')'");
+					c = NOCHAR;
+				}
+				else
+					cmntcnt--;
+			}
+			else if (cmntcnt > 0)
+				c = NOCHAR;
+			else if (c == '<')
+				anglecnt++;
+			else if (c == '>')
+			{
+				if (anglecnt <= 0)
+				{
+					usrerr("653 Unbalanced '>'");
+					c = NOCHAR;
+				}
+				else
+					anglecnt--;
+			}
+			else if (delim == ' ' && isascii(c) && isspace(c))
+				c = ' ';
+
+			if (c == NOCHAR)
+				continue;
+
+			/* see if this is end of input */
+			if (c == delim && anglecnt <= 0 && state != QST)
+				break;
+
+			newstate = StateTab[state][toktype(c)];
+			if (tTd(22, 101))
+				printf("ns=%02o\n", newstate);
+			state = newstate & TYPE;
+			if (bitset(M, newstate))
+				c = NOCHAR;
+			if (bitset(B, newstate))
+				break;
+		}
+
+		/* new token */
+		if (tok != q)
+		{
+			*q++ = '\0';
+			if (tTd(22, 36))
+			{
+				printf("tok=");
+				xputs(tok);
+				(void) putchar('\n');
+			}
+			if (avp >= &av[MAXATOM])
+			{
+				syserr("553 prescan: too many tokens");
+				goto returnnull;
+			}
+			if (q - tok > MAXNAME)
+			{
+				syserr("553 prescan: token too long");
+				goto returnnull;
+			}
+			*avp++ = tok;
+		}
+	} while (c != '\0' && (c != delim || anglecnt > 0));
+	*avp = NULL;
+	p--;
+	if (delimptr != NULL)
+		*delimptr = p;
+	if (tTd(22, 12))
+	{
+		printf("prescan==>");
+		printav(av);
+	}
+	CurEnv->e_to = saveto;
+	if (av[0] == NULL)
+	{
+		if (tTd(22, 1))
+			printf("prescan: null leading token\n");
+		return (NULL);
+	}
+	return (av);
+}
+/*
+**  REWRITE -- apply rewrite rules to token vector.
+**
+**	This routine is an ordered production system.  Each rewrite
+**	rule has a LHS (called the pattern) and a RHS (called the
+**	rewrite); 'rwr' points the the current rewrite rule.
+**
+**	For each rewrite rule, 'avp' points the address vector we
+**	are trying to match against, and 'pvp' points to the pattern.
+**	If pvp points to a special match value (MATCHZANY, MATCHANY,
+**	MATCHONE, MATCHCLASS, MATCHNCLASS) then the address in avp
+**	matched is saved away in the match vector (pointed to by 'mvp').
+**
+**	When a match between avp & pvp does not match, we try to
+**	back out.  If we back up over MATCHONE, MATCHCLASS, or MATCHNCLASS
+**	we must also back out the match in mvp.  If we reach a
+**	MATCHANY or MATCHZANY we just extend the match and start
+**	over again.
+**
+**	When we finally match, we rewrite the address vector
+**	and try over again.
+**
+**	Parameters:
+**		pvp -- pointer to token vector.
+**		ruleset -- the ruleset to use for rewriting.
+**		reclevel -- recursion level (to catch loops).
+**		e -- the current envelope.
+**
+**	Returns:
+**		A status code.  If EX_TEMPFAIL, higher level code should
+**			attempt recovery.
+**
+**	Side Effects:
+**		pvp is modified.
+*/
+
+struct match
+{
+	char	**first;	/* first token matched */
+	char	**last;		/* last token matched */
+	char	**pattern;	/* pointer to pattern */
+};
+
+# define MAXMATCH	9	/* max params per rewrite */
+
+# ifndef MAXRULERECURSION
+#  define MAXRULERECURSION	50	/* max recursion depth */
+# endif
+
+
+int
+rewrite(pvp, ruleset, reclevel, e)
+	char **pvp;
+	int ruleset;
+	int reclevel;
+	register ENVELOPE *e;
+{
+	register char *ap;		/* address pointer */
+	register char *rp;		/* rewrite pointer */
+	register char **avp;		/* address vector pointer */
+	register char **rvp;		/* rewrite vector pointer */
+	register struct match *mlp;	/* cur ptr into mlist */
+	register struct rewrite *rwr;	/* pointer to current rewrite rule */
+	int ruleno;			/* current rule number */
+	int rstat = EX_OK;		/* return status */
+	int loopcount;
+	struct match mlist[MAXMATCH];	/* stores match on LHS */
+	char *npvp[MAXATOM+1];		/* temporary space for rebuild */
+
+	if (OpMode == MD_TEST || tTd(21, 2))
+	{
+		printf("rewrite: ruleset %2d   input:", ruleset);
+		printav(pvp);
+	}
+	if (ruleset < 0 || ruleset >= MAXRWSETS)
+	{
+		syserr("554 rewrite: illegal ruleset number %d", ruleset);
+		return EX_CONFIG;
+	}
+	if (reclevel++ > MAXRULERECURSION)
+	{
+		syserr("rewrite: infinite recursion, ruleset %d", ruleset);
+		return EX_CONFIG;
+	}
+	if (pvp == NULL)
+		return EX_USAGE;
+
+	/*
+	**  Run through the list of rewrite rules, applying
+	**	any that match.
+	*/
+
+	ruleno = 1;
+	loopcount = 0;
+	for (rwr = RewriteRules[ruleset]; rwr != NULL; )
+	{
+		if (tTd(21, 12))
+		{
+			printf("-----trying rule:");
+			printav(rwr->r_lhs);
+		}
+
+		/* try to match on this rule */
+		mlp = mlist;
+		rvp = rwr->r_lhs;
+		avp = pvp;
+		if (++loopcount > 100)
+		{
+			syserr("554 Infinite loop in ruleset %d, rule %d",
+				ruleset, ruleno);
+			if (tTd(21, 1))
+			{
+				printf("workspace: ");
+				printav(pvp);
+			}
+			break;
+		}
+
+		while ((ap = *avp) != NULL || *rvp != NULL)
+		{
+			rp = *rvp;
+			if (tTd(21, 35))
+			{
+				printf("ADVANCE rp=");
+				xputs(rp);
+				printf(", ap=");
+				xputs(ap);
+				printf("\n");
+			}
+			if (rp == NULL)
+			{
+				/* end-of-pattern before end-of-address */
+				goto backup;
+			}
+			if (ap == NULL && (*rp & 0377) != MATCHZANY &&
+			    (*rp & 0377) != MATCHZERO)
+			{
+				/* end-of-input with patterns left */
+				goto backup;
+			}
+
+			switch (*rp & 0377)
+			{
+				register STAB *s;
+				char buf[MAXLINE];
+
+			  case MATCHCLASS:
+				/* match any phrase in a class */
+				mlp->pattern = rvp;
+				mlp->first = avp;
+	extendclass:
+				ap = *avp;
+				if (ap == NULL)
+					goto backup;
+				mlp->last = avp++;
+				cataddr(mlp->first, mlp->last, buf, sizeof buf, '\0');
+				s = stab(buf, ST_CLASS, ST_FIND);
+				if (s == NULL || !bitnset(rp[1], s->s_class))
+				{
+					if (tTd(21, 36))
+					{
+						printf("EXTEND  rp=");
+						xputs(rp);
+						printf(", ap=");
+						xputs(ap);
+						printf("\n");
+					}
+					goto extendclass;
+				}
+				if (tTd(21, 36))
+					printf("CLMATCH\n");
+				mlp++;
+				break;
+
+			  case MATCHNCLASS:
+				/* match any token not in a class */
+				s = stab(ap, ST_CLASS, ST_FIND);
+				if (s != NULL && bitnset(rp[1], s->s_class))
+					goto backup;
+
+				/* fall through */
+
+			  case MATCHONE:
+			  case MATCHANY:
+				/* match exactly one token */
+				mlp->pattern = rvp;
+				mlp->first = avp;
+				mlp->last = avp++;
+				mlp++;
+				break;
+
+			  case MATCHZANY:
+				/* match zero or more tokens */
+				mlp->pattern = rvp;
+				mlp->first = avp;
+				mlp->last = avp - 1;
+				mlp++;
+				break;
+
+			  case MATCHZERO:
+				/* match zero tokens */
+				break;
+
+			  case MACRODEXPAND:
+				/*
+				**  Match against run-time macro.
+				**  This algorithm is broken for the
+				**  general case (no recursive macros,
+				**  improper tokenization) but should
+				**  work for the usual cases.
+				*/
+
+				ap = macvalue(rp[1], e);
+				mlp->first = avp;
+				if (tTd(21, 2))
+					printf("rewrite: LHS $&%c => \"%s\"\n",
+						rp[1],
+						ap == NULL ? "(NULL)" : ap);
+
+				if (ap == NULL)
+					break;
+				while (*ap != '\0')
+				{
+					if (*avp == NULL ||
+					    strncasecmp(ap, *avp, strlen(*avp)) != 0)
+					{
+						/* no match */
+						avp = mlp->first;
+						goto backup;
+					}
+					ap += strlen(*avp++);
+				}
+
+				/* match */
+				break;
+
+			  default:
+				/* must have exact match */
+				if (strcasecmp(rp, ap))
+					goto backup;
+				avp++;
+				break;
+			}
+
+			/* successful match on this token */
+			rvp++;
+			continue;
+
+	  backup:
+			/* match failed -- back up */
+			while (--mlp >= mlist)
+			{
+				rvp = mlp->pattern;
+				rp = *rvp;
+				avp = mlp->last + 1;
+				ap = *avp;
+
+				if (tTd(21, 36))
+				{
+					printf("BACKUP  rp=");
+					xputs(rp);
+					printf(", ap=");
+					xputs(ap);
+					printf("\n");
+				}
+
+				if (ap == NULL)
+				{
+					/* run off the end -- back up again */
+					continue;
+				}
+				if ((*rp & 0377) == MATCHANY ||
+				    (*rp & 0377) == MATCHZANY)
+				{
+					/* extend binding and continue */
+					mlp->last = avp++;
+					rvp++;
+					mlp++;
+					break;
+				}
+				if ((*rp & 0377) == MATCHCLASS)
+				{
+					/* extend binding and try again */
+					mlp->last = avp;
+					goto extendclass;
+				}
+			}
+
+			if (mlp < mlist)
+			{
+				/* total failure to match */
+				break;
+			}
+		}
+
+		/*
+		**  See if we successfully matched
+		*/
+
+		if (mlp < mlist || *rvp != NULL)
+		{
+			if (tTd(21, 10))
+				printf("----- rule fails\n");
+			rwr = rwr->r_next;
+			ruleno++;
+			loopcount = 0;
+			continue;
+		}
+
+		rvp = rwr->r_rhs;
+		if (tTd(21, 12))
+		{
+			printf("-----rule matches:");
+			printav(rvp);
+		}
+
+		rp = *rvp;
+		if ((*rp & 0377) == CANONUSER)
+		{
+			rvp++;
+			rwr = rwr->r_next;
+			ruleno++;
+			loopcount = 0;
+		}
+		else if ((*rp & 0377) == CANONHOST)
+		{
+			rvp++;
+			rwr = NULL;
+		}
+		else if ((*rp & 0377) == CANONNET)
+			rwr = NULL;
+
+		/* substitute */
+		for (avp = npvp; *rvp != NULL; rvp++)
+		{
+			register struct match *m;
+			register char **pp;
+
+			rp = *rvp;
+			if ((*rp & 0377) == MATCHREPL)
+			{
+				/* substitute from LHS */
+				m = &mlist[rp[1] - '1'];
+				if (m < mlist || m >= mlp)
+				{
+					syserr("554 rewrite: ruleset %d: replacement $%c out of bounds",
+						ruleset, rp[1]);
+					return EX_CONFIG;
+				}
+				if (tTd(21, 15))
+				{
+					printf("$%c:", rp[1]);
+					pp = m->first;
+					while (pp <= m->last)
+					{
+						printf(" %x=\"", *pp);
+						(void) fflush(stdout);
+						printf("%s\"", *pp++);
+					}
+					printf("\n");
+				}
+				pp = m->first;
+				while (pp <= m->last)
+				{
+					if (avp >= &npvp[MAXATOM])
+					{
+						syserr("554 rewrite: expansion too long");
+						return EX_DATAERR;
+					}
+					*avp++ = *pp++;
+				}
+			}
+			else
+			{
+				/* vanilla replacement */
+				if (avp >= &npvp[MAXATOM])
+				{
+	toolong:
+					syserr("554 rewrite: expansion too long");
+					return EX_DATAERR;
+				}
+				if ((*rp & 0377) != MACRODEXPAND)
+					*avp++ = rp;
+				else
+				{
+					*avp = macvalue(rp[1], e);
+					if (tTd(21, 2))
+						printf("rewrite: RHS $&%c => \"%s\"\n",
+							rp[1],
+							*avp == NULL ? "(NULL)" : *avp);
+					if (*avp != NULL)
+						avp++;
+				}
+			}
+		}
+		*avp++ = NULL;
+
+		/*
+		**  Check for any hostname/keyword lookups.
+		*/
+
+		for (rvp = npvp; *rvp != NULL; rvp++)
+		{
+			char **hbrvp;
+			char **xpvp;
+			int trsize;
+			char *replac;
+			int endtoken;
+			STAB *map;
+			char *mapname;
+			char **key_rvp;
+			char **arg_rvp;
+			char **default_rvp;
+			char buf[MAXNAME + 1];
+			char *pvpb1[MAXATOM + 1];
+			char *argvect[10];
+			char pvpbuf[PSBUFSIZE];
+			char *nullpvp[1];
+
+			if ((**rvp & 0377) != HOSTBEGIN &&
+			    (**rvp & 0377) != LOOKUPBEGIN)
+				continue;
+
+			/*
+			**  Got a hostname/keyword lookup.
+			**
+			**	This could be optimized fairly easily.
+			*/
+
+			hbrvp = rvp;
+			if ((**rvp & 0377) == HOSTBEGIN)
+			{
+				endtoken = HOSTEND;
+				mapname = "host";
+			}
+			else
+			{
+				endtoken = LOOKUPEND;
+				mapname = *++rvp;
+			}
+			map = stab(mapname, ST_MAP, ST_FIND);
+			if (map == NULL)
+				syserr("554 rewrite: map %s not found", mapname);
+
+			/* extract the match part */
+			key_rvp = ++rvp;
+			default_rvp = NULL;
+			arg_rvp = argvect;
+			xpvp = NULL;
+			replac = pvpbuf;
+			while (*rvp != NULL && (**rvp & 0377) != endtoken)
+			{
+				int nodetype = **rvp & 0377;
+
+				if (nodetype != CANONHOST && nodetype != CANONUSER)
+				{
+					rvp++;
+					continue;
+				}
+
+				*rvp++ = NULL;
+
+				if (xpvp != NULL)
+				{
+					cataddr(xpvp, NULL, replac,
+						&pvpbuf[sizeof pvpbuf] - replac,
+						'\0');
+					*++arg_rvp = replac;
+					replac += strlen(replac) + 1;
+					xpvp = NULL;
+				}
+				switch (nodetype)
+				{
+				  case CANONHOST:
+					xpvp = rvp;
+					break;
+
+				  case CANONUSER:
+					default_rvp = rvp;
+					break;
+				}
+			}
+			if (*rvp != NULL)
+				*rvp++ = NULL;
+			if (xpvp != NULL)
+			{
+				cataddr(xpvp, NULL, replac,
+					&pvpbuf[sizeof pvpbuf] - replac, 
+					'\0');
+				*++arg_rvp = replac;
+			}
+			*++arg_rvp = NULL;
+
+			/* save the remainder of the input string */
+			trsize = (int) (avp - rvp + 1) * sizeof *rvp;
+			bcopy((char *) rvp, (char *) pvpb1, trsize);
+
+			/* look it up */
+			cataddr(key_rvp, NULL, buf, sizeof buf, '\0');
+			argvect[0] = buf;
+			if (map != NULL && bitset(MF_OPEN, map->s_map.map_mflags))
+			{
+				auto int stat = EX_OK;
+
+				/* XXX should try to auto-open the map here */
+
+				if (tTd(60, 1))
+					printf("map_lookup(%s, %s) => ",
+						mapname, buf);
+				replac = (*map->s_map.map_class->map_lookup)(&map->s_map,
+						buf, argvect, &stat);
+				if (tTd(60, 1))
+					printf("%s (%d)\n",
+						replac ? replac : "NOT FOUND",
+						stat);
+
+				/* should recover if stat == EX_TEMPFAIL */
+				if (stat == EX_TEMPFAIL)
+					rstat = stat;
+			}
+			else
+				replac = NULL;
+
+			/* if no replacement, use default */
+			if (replac == NULL && default_rvp != NULL)
+			{
+				/* create the default */
+				cataddr(default_rvp, NULL, buf, sizeof buf, '\0');
+				replac = buf;
+			}
+
+			if (replac == NULL)
+			{
+				xpvp = key_rvp;
+			}
+			else if (*replac == '\0')
+			{
+				/* null replacement */
+				nullpvp[0] = NULL;
+				xpvp = nullpvp;
+			}
+			else
+			{
+				/* scan the new replacement */
+				xpvp = prescan(replac, '\0', pvpbuf,
+					       sizeof pvpbuf, NULL);
+				if (xpvp == NULL)
+				{
+					/* prescan already printed error */
+					return EX_DATAERR;
+				}
+			}
+
+			/* append it to the token list */
+			for (avp = hbrvp; *xpvp != NULL; xpvp++)
+			{
+				*avp++ = newstr(*xpvp);
+				if (avp >= &npvp[MAXATOM])
+					goto toolong;
+			}
+
+			/* restore the old trailing information */
+			for (xpvp = pvpb1; (*avp++ = *xpvp++) != NULL; )
+				if (avp >= &npvp[MAXATOM])
+					goto toolong;
+
+			break;
+		}
+
+		/*
+		**  Check for subroutine calls.
+		*/
+
+		if (*npvp != NULL && (**npvp & 0377) == CALLSUBR)
+		{
+			int stat;
+
+			if (npvp[1] == NULL)
+			{
+				syserr("parseaddr: NULL subroutine call in ruleset %d, rule %d",
+					ruleset, ruleno);
+				*pvp = NULL;
+			}
+			else
+			{
+				bcopy((char *) &npvp[2], (char *) pvp,
+					(int) (avp - npvp - 2) * sizeof *avp);
+				if (tTd(21, 3))
+					printf("-----callsubr %s\n", npvp[1]);
+				stat = rewrite(pvp, atoi(npvp[1]), reclevel, e);
+				if (rstat == EX_OK || stat == EX_TEMPFAIL)
+					rstat = stat;
+				if (*pvp != NULL && (**pvp & 0377) == CANONNET)
+				rwr = NULL;
+			}
+		}
+		else
+		{
+			bcopy((char *) npvp, (char *) pvp,
+				(int) (avp - npvp) * sizeof *avp);
+		}
+		if (tTd(21, 4))
+		{
+			printf("rewritten as:");
+			printav(pvp);
+		}
+	}
+
+	if (OpMode == MD_TEST || tTd(21, 2))
+	{
+		printf("rewrite: ruleset %2d returns:", ruleset);
+		printav(pvp);
+	}
+
+	return rstat;
+}
+/*
+**  BUILDADDR -- build address from token vector.
+**
+**	Parameters:
+**		tv -- token vector.
+**		a -- pointer to address descriptor to fill.
+**			If NULL, one will be allocated.
+**		flags -- info regarding whether this is a sender or
+**			a recipient.
+**		e -- the current envelope.
+**
+**	Returns:
+**		NULL if there was an error.
+**		'a' otherwise.
+**
+**	Side Effects:
+**		fills in 'a'
+*/
+
+struct errcodes
+{
+	char	*ec_name;		/* name of error code */
+	int	ec_code;		/* numeric code */
+} ErrorCodes[] =
+{
+	"usage",	EX_USAGE,
+	"nouser",	EX_NOUSER,
+	"nohost",	EX_NOHOST,
+	"unavailable",	EX_UNAVAILABLE,
+	"software",	EX_SOFTWARE,
+	"tempfail",	EX_TEMPFAIL,
+	"protocol",	EX_PROTOCOL,
+#ifdef EX_CONFIG
+	"config",	EX_CONFIG,
+#endif
+	NULL,		EX_UNAVAILABLE,
+};
+
+ADDRESS *
+buildaddr(tv, a, flags, e)
+	register char **tv;
+	register ADDRESS *a;
+	int flags;
+	register ENVELOPE *e;
+{
+	struct mailer **mp;
+	register struct mailer *m;
+	char *bp;
+	int spaceleft;
+	static MAILER errormailer;
+	static char *errorargv[] = { "ERROR", NULL };
+	static char buf[MAXNAME];
+
+	if (tTd(24, 5))
+	{
+		printf("buildaddr, flags=%o, tv=", flags);
+		printav(tv);
+	}
+
+	if (a == NULL)
+		a = (ADDRESS *) xalloc(sizeof *a);
+	bzero((char *) a, sizeof *a);
+
+	/* figure out what net/mailer to use */
+	if (*tv == NULL || (**tv & 0377) != CANONNET)
+	{
+		syserr("554 buildaddr: no net");
+badaddr:
+		a->q_flags |= QBADADDR;
+		a->q_mailer = &errormailer;
+		if (errormailer.m_name == NULL)
+		{
+			/* initialize the bogus mailer */
+			errormailer.m_name = "*error*";
+			errormailer.m_mailer = "ERROR";
+			errormailer.m_argv = errorargv;
+		}
+		return a;
+	}
+	tv++;
+	if (strcasecmp(*tv, "error") == 0)
+	{
+		if ((**++tv & 0377) == CANONHOST)
+		{
+			register struct errcodes *ep;
+
+			if (isascii(**++tv) && isdigit(**tv))
+			{
+				setstat(atoi(*tv));
+			}
+			else
+			{
+				for (ep = ErrorCodes; ep->ec_name != NULL; ep++)
+					if (strcasecmp(ep->ec_name, *tv) == 0)
+						break;
+				setstat(ep->ec_code);
+			}
+			tv++;
+		}
+		else
+			setstat(EX_UNAVAILABLE);
+		if ((**tv & 0377) != CANONUSER)
+			syserr("554 buildaddr: error: no user");
+		cataddr(++tv, NULL, buf, sizeof buf, ' ');
+		stripquotes(buf);
+		if (isascii(buf[0]) && isdigit(buf[0]) &&
+		    isascii(buf[1]) && isdigit(buf[1]) &&
+		    isascii(buf[2]) && isdigit(buf[2]) &&
+		    buf[3] == ' ')
+		{
+			char fmt[10];
+
+			strncpy(fmt, buf, 3);
+			strcpy(&fmt[3], " %s");
+			usrerr(fmt, buf + 4);
+		}
+		else
+		{
+			usrerr("553 %s", buf);
+		}
+		goto badaddr;
+	}
+
+	for (mp = Mailer; (m = *mp++) != NULL; )
+	{
+		if (strcasecmp(m->m_name, *tv) == 0)
+			break;
+	}
+	if (m == NULL)
+	{
+		syserr("554 buildaddr: unknown mailer %s", *tv);
+		goto badaddr;
+	}
+	a->q_mailer = m;
+
+	/* figure out what host (if any) */
+	tv++;
+	if ((**tv & 0377) == CANONHOST)
+	{
+		bp = buf;
+		spaceleft = sizeof buf - 1;
+		while (*++tv != NULL && (**tv & 0377) != CANONUSER)
+		{
+			int i = strlen(*tv);
+
+			if (i > spaceleft)
+			{
+				/* out of space for this address */
+				if (spaceleft >= 0)
+					syserr("554 buildaddr: host too long (%.40s...)",
+						buf);
+				i = spaceleft;
+				spaceleft = 0;
+			}
+			if (i <= 0)
+				continue;
+			bcopy(*tv, bp, i);
+			bp += i;
+			spaceleft -= i;
+		}
+		*bp = '\0';
+		a->q_host = newstr(buf);
+	}
+	else
+	{
+		if (!bitnset(M_LOCALMAILER, m->m_flags))
+		{
+			syserr("554 buildaddr: no host");
+			goto badaddr;
+		}
+		a->q_host = NULL;
+	}
+
+	/* figure out the user */
+	if (*tv == NULL || (**tv & 0377) != CANONUSER)
+	{
+		syserr("554 buildaddr: no user");
+		goto badaddr;
+	}
+	tv++;
+
+	/* do special mapping for local mailer */
+	if (m == LocalMailer && *tv != NULL)
+	{
+		register char *p = *tv;
+
+		if (*p == '"')
+			p++;
+		if (*p == '|')
+			a->q_mailer = m = ProgMailer;
+		else if (*p == '/')
+			a->q_mailer = m = FileMailer;
+		else if (*p == ':')
+		{
+			/* may be :include: */
+			cataddr(tv, NULL, buf, sizeof buf, '\0');
+			stripquotes(buf);
+			if (strncasecmp(buf, ":include:", 9) == 0)
+			{
+				/* if :include:, don't need further rewriting */
+				a->q_mailer = m = InclMailer;
+				a->q_user = &buf[9];
+				return (a);
+			}
+		}
+	}
+
+	if (m == LocalMailer && *tv != NULL && strcmp(*tv, "@") == 0)
+	{
+		tv++;
+		a->q_flags |= QNOTREMOTE;
+	}
+
+	/* rewrite according recipient mailer rewriting rules */
+	define('h', a->q_host, e);
+	if (!bitset(RF_SENDERADDR|RF_HEADERADDR, flags))
+	{
+		/* sender addresses done later */
+		(void) rewrite(tv, 2, 0, e);
+		if (m->m_re_rwset > 0)
+		       (void) rewrite(tv, m->m_re_rwset, 0, e);
+	}
+	(void) rewrite(tv, 4, 0, e);
+
+	/* save the result for the command line/RCPT argument */
+	cataddr(tv, NULL, buf, sizeof buf, '\0');
+	a->q_user = buf;
+
+	/*
+	**  Do mapping to lower case as requested by mailer
+	*/
+
+	if (a->q_host != NULL && !bitnset(M_HST_UPPER, m->m_flags))
+		makelower(a->q_host);
+	if (!bitnset(M_USR_UPPER, m->m_flags))
+		makelower(a->q_user);
+
+	return (a);
+}
+/*
+**  CATADDR -- concatenate pieces of addresses (putting in <LWSP> subs)
+**
+**	Parameters:
+**		pvp -- parameter vector to rebuild.
+**		evp -- last parameter to include.  Can be NULL to
+**			use entire pvp.
+**		buf -- buffer to build the string into.
+**		sz -- size of buf.
+**		spacesub -- the space separator character; if null,
+**			use SpaceSub.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		Destroys buf.
+*/
+
+cataddr(pvp, evp, buf, sz, spacesub)
+	char **pvp;
+	char **evp;
+	char *buf;
+	register int sz;
+	char spacesub;
+{
+	bool oatomtok = FALSE;
+	bool natomtok = FALSE;
+	register int i;
+	register char *p;
+
+	if (spacesub == '\0')
+		spacesub = SpaceSub;
+
+	if (pvp == NULL)
+	{
+		(void) strcpy(buf, "");
+		return;
+	}
+	p = buf;
+	sz -= 2;
+	while (*pvp != NULL && (i = strlen(*pvp)) < sz)
+	{
+		natomtok = (toktype(**pvp) == ATM);
+		if (oatomtok && natomtok)
+			*p++ = spacesub;
+		(void) strcpy(p, *pvp);
+		oatomtok = natomtok;
+		p += i;
+		sz -= i + 1;
+		if (pvp++ == evp)
+			break;
+	}
+	*p = '\0';
+}
+/*
+**  SAMEADDR -- Determine if two addresses are the same
+**
+**	This is not just a straight comparison -- if the mailer doesn't
+**	care about the host we just ignore it, etc.
+**
+**	Parameters:
+**		a, b -- pointers to the internal forms to compare.
+**
+**	Returns:
+**		TRUE -- they represent the same mailbox.
+**		FALSE -- they don't.
+**
+**	Side Effects:
+**		none.
+*/
+
+bool
+sameaddr(a, b)
+	register ADDRESS *a;
+	register ADDRESS *b;
+{
+	register ADDRESS *ca, *cb;
+
+	/* if they don't have the same mailer, forget it */
+	if (a->q_mailer != b->q_mailer)
+		return (FALSE);
+
+	/* if the user isn't the same, we can drop out */
+	if (strcmp(a->q_user, b->q_user) != 0)
+		return (FALSE);
+
+	/* if we have good uids for both but they differ, these are different */
+	if (a->q_mailer == ProgMailer)
+	{
+		ca = getctladdr(a);
+		cb = getctladdr(b);
+		if (ca != NULL && cb != NULL &&
+		    bitset(QGOODUID, ca->q_flags & cb->q_flags) &&
+		    ca->q_uid != cb->q_uid)
+			return (FALSE);
+	}
+
+	/* otherwise compare hosts (but be careful for NULL ptrs) */
+	if (a->q_host == b->q_host)
+	{
+		/* probably both null pointers */
+		return (TRUE);
+	}
+	if (a->q_host == NULL || b->q_host == NULL)
+	{
+		/* only one is a null pointer */
+		return (FALSE);
+	}
+	if (strcmp(a->q_host, b->q_host) != 0)
+		return (FALSE);
+
+	return (TRUE);
+}
+/*
+**  PRINTADDR -- print address (for debugging)
+**
+**	Parameters:
+**		a -- the address to print
+**		follow -- follow the q_next chain.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		none.
+*/
+
+printaddr(a, follow)
+	register ADDRESS *a;
+	bool follow;
+{
+	bool first = TRUE;
+	register MAILER *m;
+	MAILER pseudomailer;
+
+	while (a != NULL)
+	{
+		first = FALSE;
+		printf("%x=", a);
+		(void) fflush(stdout);
+
+		/* find the mailer -- carefully */
+		m = a->q_mailer;
+		if (m == NULL)
+		{
+			m = &pseudomailer;
+			m->m_mno = -1;
+			m->m_name = "NULL";
+		}
+
+		printf("%s:\n\tmailer %d (%s), host `%s', user `%s', ruser `%s'\n",
+		       a->q_paddr, m->m_mno, m->m_name,
+		       a->q_host, a->q_user,
+		       a->q_ruser ? a->q_ruser : "<null>");
+		printf("\tnext=%x, flags=%o, alias %x, uid %d, gid %d\n",
+		       a->q_next, a->q_flags, a->q_alias, a->q_uid, a->q_gid);
+		printf("\towner=%s, home=\"%s\", fullname=\"%s\"\n",
+		       a->q_owner == NULL ? "(none)" : a->q_owner,
+		       a->q_home == NULL ? "(none)" : a->q_home,
+		       a->q_fullname == NULL ? "(none)" : a->q_fullname);
+
+		if (!follow)
+			return;
+		a = a->q_next;
+	}
+	if (first)
+		printf("[NULL]\n");
+}
+
+/*
+**  REMOTENAME -- return the name relative to the current mailer
+**
+**	Parameters:
+**		name -- the name to translate.
+**		m -- the mailer that we want to do rewriting relative
+**			to.
+**		flags -- fine tune operations.
+**		pstat -- pointer to status word.
+**		e -- the current envelope.
+**
+**	Returns:
+**		the text string representing this address relative to
+**			the receiving mailer.
+**
+**	Side Effects:
+**		none.
+**
+**	Warnings:
+**		The text string returned is tucked away locally;
+**			copy it if you intend to save it.
+*/
+
+char *
+remotename(name, m, flags, pstat, e)
+	char *name;
+	struct mailer *m;
+	int flags;
+	int *pstat;
+	register ENVELOPE *e;
+{
+	register char **pvp;
+	char *fancy;
+	char *oldg = macvalue('g', e);
+	int rwset;
+	static char buf[MAXNAME];
+	char lbuf[MAXNAME];
+	char pvpbuf[PSBUFSIZE];
+	extern char *crackaddr();
+
+	if (tTd(12, 1))
+		printf("remotename(%s)\n", name);
+
+	/* don't do anything if we are tagging it as special */
+	if (bitset(RF_SENDERADDR, flags))
+		rwset = bitset(RF_HEADERADDR, flags) ? m->m_sh_rwset
+						     : m->m_se_rwset;
+	else
+		rwset = bitset(RF_HEADERADDR, flags) ? m->m_rh_rwset
+						     : m->m_re_rwset;
+	if (rwset < 0)
+		return (name);
+
+	/*
+	**  Do a heuristic crack of this name to extract any comment info.
+	**	This will leave the name as a comment and a $g macro.
+	*/
+
+	if (bitset(RF_CANONICAL, flags) || bitnset(M_NOCOMMENT, m->m_flags))
+		fancy = "\201g";
+	else
+		fancy = crackaddr(name);
+
+	/*
+	**  Turn the name into canonical form.
+	**	Normally this will be RFC 822 style, i.e., "user@domain".
+	**	If this only resolves to "user", and the "C" flag is
+	**	specified in the sending mailer, then the sender's
+	**	domain will be appended.
+	*/
+
+	pvp = prescan(name, '\0', pvpbuf, sizeof pvpbuf, NULL);
+	if (pvp == NULL)
+		return (name);
+	if (rewrite(pvp, 3, 0, e) == EX_TEMPFAIL)
+		*pstat = EX_TEMPFAIL;
+	if (bitset(RF_ADDDOMAIN, flags) && e->e_fromdomain != NULL)
+	{
+		/* append from domain to this address */
+		register char **pxp = pvp;
+
+		/* see if there is an "@domain" in the current name */
+		while (*pxp != NULL && strcmp(*pxp, "@") != 0)
+			pxp++;
+		if (*pxp == NULL)
+		{
+			/* no.... append the "@domain" from the sender */
+			register char **qxq = e->e_fromdomain;
+
+			while ((*pxp++ = *qxq++) != NULL)
+				continue;
+			if (rewrite(pvp, 3, 0, e) == EX_TEMPFAIL)
+				*pstat = EX_TEMPFAIL;
+		}
+	}
+
+	/*
+	**  Do more specific rewriting.
+	**	Rewrite using ruleset 1 or 2 depending on whether this is
+	**		a sender address or not.
+	**	Then run it through any receiving-mailer-specific rulesets.
+	*/
+
+	if (bitset(RF_SENDERADDR, flags))
+	{
+		if (rewrite(pvp, 1, 0, e) == EX_TEMPFAIL)
+			*pstat = EX_TEMPFAIL;
+	}
+	else
+	{
+		if (rewrite(pvp, 2, 0, e) == EX_TEMPFAIL)
+			*pstat = EX_TEMPFAIL;
+	}
+	if (rwset > 0)
+	{
+		if (rewrite(pvp, rwset, 0, e) == EX_TEMPFAIL)
+			*pstat = EX_TEMPFAIL;
+	}
+
+	/*
+	**  Do any final sanitation the address may require.
+	**	This will normally be used to turn internal forms
+	**	(e.g., user@host.LOCAL) into external form.  This
+	**	may be used as a default to the above rules.
+	*/
+
+	if (rewrite(pvp, 4, 0, e) == EX_TEMPFAIL)
+		*pstat = EX_TEMPFAIL;
+
+	/*
+	**  Now restore the comment information we had at the beginning.
+	*/
+
+	cataddr(pvp, NULL, lbuf, sizeof lbuf, '\0');
+	define('g', lbuf, e);
+
+	/* need to make sure route-addrs have <angle brackets> */
+	if (bitset(RF_CANONICAL, flags) && lbuf[0] == '@')
+		expand("<\201g>", buf, &buf[sizeof buf - 1], e);
+	else
+		expand(fancy, buf, &buf[sizeof buf - 1], e);
+
+	define('g', oldg, e);
+
+	if (tTd(12, 1))
+		printf("remotename => `%s'\n", buf);
+	return (buf);
+}
+/*
+**  MAPLOCALUSER -- run local username through ruleset 5 for final redirection
+**
+**	Parameters:
+**		a -- the address to map (but just the user name part).
+**		sendq -- the sendq in which to install any replacement
+**			addresses.
+**
+**	Returns:
+**		none.
+*/
+
+maplocaluser(a, sendq, e)
+	register ADDRESS *a;
+	ADDRESS **sendq;
+	ENVELOPE *e;
+{
+	register char **pvp;
+	register ADDRESS *a1 = NULL;
+	auto char *delimptr;
+	char pvpbuf[PSBUFSIZE];
+
+	if (tTd(29, 1))
+	{
+		printf("maplocaluser: ");
+		printaddr(a, FALSE);
+	}
+	pvp = prescan(a->q_user, '\0', pvpbuf, sizeof pvpbuf, &delimptr);
+	if (pvp == NULL)
+		return;
+
+	(void) rewrite(pvp, 5, 0, e);
+	if (pvp[0] == NULL || (pvp[0][0] & 0377) != CANONNET)
+		return;
+
+	/* if non-null, mailer destination specified -- has it changed? */
+	a1 = buildaddr(pvp, NULL, 0, e);
+	if (a1 == NULL || sameaddr(a, a1))
+		return;
+
+	/* mark old address as dead; insert new address */
+	a->q_flags |= QDONTSEND;
+	if (tTd(29, 5))
+	{
+		printf("maplocaluser: QDONTSEND ");
+		printaddr(a, FALSE);
+	}
+	a1->q_alias = a;
+	allocaddr(a1, RF_COPYALL, NULL);
+	(void) recipient(a1, sendq, e);
+}
+/*
+**  DEQUOTE_INIT -- initialize dequote map
+**
+**	This is a no-op.
+**
+**	Parameters:
+**		map -- the internal map structure.
+**		args -- arguments.
+**
+**	Returns:
+**		TRUE.
+*/
+
+bool
+dequote_init(map, args)
+	MAP *map;
+	char *args;
+{
+	register char *p = args;
+
+	for (;;)
+	{
+		while (isascii(*p) && isspace(*p))
+			p++;
+		if (*p != '-')
+			break;
+		switch (*++p)
+		{
+		  case 'a':
+			map->map_app = ++p;
+			break;
+		}
+		while (*p != '\0' && !(isascii(*p) && isspace(*p)))
+			p++;
+		if (*p != '\0')
+			*p = '\0';
+	}
+	if (map->map_app != NULL)
+		map->map_app = newstr(map->map_app);
+
+	return TRUE;
+}
+/*
+**  DEQUOTE_MAP -- unquote an address
+**
+**	Parameters:
+**		map -- the internal map structure (ignored).
+**		name -- the name to dequote.
+**		av -- arguments (ignored).
+**		statp -- pointer to status out-parameter.
+**
+**	Returns:
+**		NULL -- if there were no quotes, or if the resulting
+**			unquoted buffer would not be acceptable to prescan.
+**		else -- The dequoted buffer.
+*/
+
+char *
+dequote_map(map, name, av, statp)
+	MAP *map;
+	char *name;
+	char **av;
+	int *statp;
+{
+	register char *p;
+	register char *q;
+	register char c;
+	int anglecnt;
+	int cmntcnt;
+	int quotecnt;
+	int spacecnt;
+	bool quotemode;
+	bool bslashmode;
+
+	anglecnt = 0;
+	cmntcnt = 0;
+	quotecnt = 0;
+	spacecnt = 0;
+	quotemode = FALSE;
+	bslashmode = FALSE;
+
+	for (p = q = name; (c = *p++) != '\0'; )
+	{
+		if (bslashmode)
+		{
+			bslashmode = FALSE;
+			*q++ = c;
+			continue;
+		}
+
+		switch (c)
+		{
+		  case '\\':
+			bslashmode = TRUE;
+			break;
+
+		  case '(':
+			cmntcnt++;
+			break;
+
+		  case ')':
+			if (cmntcnt-- <= 0)
+				return NULL;
+			break;
+
+		  case ' ':
+			spacecnt++;
+			break;
+		}
+
+		if (cmntcnt > 0)
+		{
+			*q++ = c;
+			continue;
+		}
+
+		switch (c)
+		{
+		  case '"':
+			quotemode = !quotemode;
+			quotecnt++;
+			continue;
+
+		  case '<':
+			anglecnt++;
+			break;
+
+		  case '>':
+			if (anglecnt-- <= 0)
+				return NULL;
+			break;
+		}
+		*q++ = c;
+	}
+
+	if (anglecnt != 0 || cmntcnt != 0 || bslashmode ||
+	    quotemode || quotecnt <= 0 || spacecnt != 0)
+		return NULL;
+	*q++ = '\0';
+	return name;
+}
diff --git a/usr.sbin/sendmail/src/pathnames.h b/usr.sbin/sendmail/src/pathnames.h
new file mode 100644
index 00000000000..a611c0b0b2b
--- /dev/null
+++ b/usr.sbin/sendmail/src/pathnames.h
@@ -0,0 +1,46 @@
+/*-
+ * Copyright (c) 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)pathnames.h	8.2 (Berkeley) 8/20/93
+ */
+
+#ifndef _PATH_SENDMAILCF
+# define _PATH_SENDMAILCF	"/etc/sendmail.cf"
+#endif
+
+#ifndef _PATH_SENDMAILPID
+# ifdef BSD4_4
+#  define _PATH_SENDMAILPID	"/var/run/sendmail.pid"
+# else
+#  define _PATH_SENDMAILPID	"/etc/sendmail.pid"
+# endif
+#endif
diff --git a/usr.sbin/sendmail/src/queue.c b/usr.sbin/sendmail/src/queue.c
new file mode 100644
index 00000000000..a5324164110
--- /dev/null
+++ b/usr.sbin/sendmail/src/queue.c
@@ -0,0 +1,1571 @@
+/*
+ * Copyright (c) 1983 Eric P. Allman
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+# include "sendmail.h"
+
+#ifndef lint
+#ifdef QUEUE
+static char sccsid[] = "@(#)queue.c	8.41.1.3 (Berkeley) 3/5/95 (with queueing)";
+#else
+static char sccsid[] = "@(#)queue.c	8.41.1.3 (Berkeley) 3/5/95 (without queueing)";
+#endif
+#endif /* not lint */
+
+# include <errno.h>
+# include <pwd.h>
+# include <dirent.h>
+
+# ifdef QUEUE
+
+/*
+**  Work queue.
+*/
+
+struct work
+{
+	char		*w_name;	/* name of control file */
+	long		w_pri;		/* priority of message, see below */
+	time_t		w_ctime;	/* creation time of message */
+	struct work	*w_next;	/* next in queue */
+};
+
+typedef struct work	WORK;
+
+WORK	*WorkQ;			/* queue of things to be done */
+/*
+**  QUEUEUP -- queue a message up for future transmission.
+**
+**	Parameters:
+**		e -- the envelope to queue up.
+**		queueall -- if TRUE, queue all addresses, rather than
+**			just those with the QQUEUEUP flag set.
+**		announce -- if TRUE, tell when you are queueing up.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		The current request are saved in a control file.
+**		The queue file is left locked.
+*/
+
+queueup(e, queueall, announce)
+	register ENVELOPE *e;
+	bool queueall;
+	bool announce;
+{
+	char *qf;
+	register FILE *tfp;
+	register HDR *h;
+	register ADDRESS *q;
+	int fd;
+	int i;
+	bool newid;
+	register char *p;
+	MAILER nullmailer;
+	MCI mcibuf;
+	char buf[MAXLINE], tf[MAXLINE];
+
+	/*
+	**  Create control file.
+	*/
+
+	newid = (e->e_id == NULL) || !bitset(EF_INQUEUE, e->e_flags);
+
+	/* if newid, queuename will create a locked qf file in e->lockfp */
+	strcpy(tf, queuename(e, 't'));
+	tfp = e->e_lockfp;
+	if (tfp == NULL)
+		newid = FALSE;
+
+	/* if newid, just write the qf file directly (instead of tf file) */
+	if (!newid)
+	{
+		/* get a locked tf file */
+		for (i = 0; i < 128; i++)
+		{
+			fd = open(tf, O_CREAT|O_WRONLY|O_EXCL, FileMode);
+			if (fd < 0)
+			{
+				if (errno != EEXIST)
+					break;
+#ifdef LOG
+				if (LogLevel > 0 && (i % 32) == 0)
+					syslog(LOG_ALERT, "queueup: cannot create %s, uid=%d: %s",
+						tf, geteuid(), errstring(errno));
+#endif
+			}
+			else
+			{
+				if (lockfile(fd, tf, NULL, LOCK_EX|LOCK_NB))
+					break;
+#ifdef LOG
+				else if (LogLevel > 0 && (i % 32) == 0)
+					syslog(LOG_ALERT, "queueup: cannot lock %s: %s",
+						tf, errstring(errno));
+#endif
+				close(fd);
+			}
+
+			if ((i % 32) == 31)
+			{
+				/* save the old temp file away */
+				(void) rename(tf, queuename(e, 'T'));
+			}
+			else
+				sleep(i % 32);
+		}
+		if (fd < 0 || (tfp = fdopen(fd, "w")) == NULL)
+		{
+			printopenfds(TRUE);
+			syserr("!queueup: cannot create queue temp file %s, uid=%d",
+				tf, geteuid());
+		}
+	}
+
+	if (tTd(40, 1))
+		printf("\n>>>>> queueing %s%s >>>>>\n", e->e_id,
+			newid ? " (new id)" : "");
+	if (tTd(40, 9))
+	{
+		printf("  tfp=");
+		dumpfd(fileno(tfp), TRUE, FALSE);
+		printf("  lockfp=");
+		if (e->e_lockfp == NULL)
+			printf("NULL\n");
+		else
+			dumpfd(fileno(e->e_lockfp), TRUE, FALSE);
+	}
+
+	/*
+	**  If there is no data file yet, create one.
+	*/
+
+	if (e->e_df == NULL)
+	{
+		register FILE *dfp;
+		extern putbody();
+
+		e->e_df = queuename(e, 'd');
+		e->e_df = newstr(e->e_df);
+		fd = open(e->e_df, O_WRONLY|O_CREAT|O_TRUNC, FileMode);
+		if (fd < 0 || (dfp = fdopen(fd, "w")) == NULL)
+			syserr("!queueup: cannot create data temp file %s, uid=%d",
+				e->e_df, geteuid());
+		bzero(&mcibuf, sizeof mcibuf);
+		mcibuf.mci_out = dfp;
+		mcibuf.mci_mailer = FileMailer;
+		(*e->e_putbody)(&mcibuf, e, NULL);
+		(void) xfclose(dfp, "queueup dfp", e->e_id);
+		e->e_putbody = putbody;
+	}
+
+	/*
+	**  Output future work requests.
+	**	Priority and creation time should be first, since
+	**	they are required by orderq.
+	*/
+
+	/* output message priority */
+	fprintf(tfp, "P%ld\n", e->e_msgpriority);
+
+	/* output creation time */
+	fprintf(tfp, "T%ld\n", e->e_ctime);
+
+	/* output type and name of data file */
+	if (e->e_bodytype != NULL)
+		fprintf(tfp, "B%s\n", e->e_bodytype);
+	fprintf(tfp, "D%s\n", e->e_df);
+
+	/* message from envelope, if it exists */
+	if (e->e_message != NULL)
+		fprintf(tfp, "M%s\n", denlstring(e->e_message, TRUE, FALSE));
+
+	/* send various flag bits through */
+	p = buf;
+	if (bitset(EF_WARNING, e->e_flags))
+		*p++ = 'w';
+	if (bitset(EF_RESPONSE, e->e_flags))
+		*p++ = 'r';
+	*p++ = '\0';
+	if (buf[0] != '\0')
+		fprintf(tfp, "F%s\n", buf);
+
+	/* $r and $s and $_ macro values */
+	if ((p = macvalue('r', e)) != NULL)
+		fprintf(tfp, "$r%s\n", denlstring(p, TRUE, FALSE));
+	if ((p = macvalue('s', e)) != NULL)
+		fprintf(tfp, "$s%s\n", denlstring(p, TRUE, FALSE));
+	if ((p = macvalue('_', e)) != NULL)
+		fprintf(tfp, "$_%s\n", denlstring(p, TRUE, FALSE));
+
+	/* output name of sender */
+	fprintf(tfp, "S%s\n", denlstring(e->e_from.q_paddr, TRUE, FALSE));
+
+	/* output list of error recipients */
+	printctladdr(NULL, NULL);
+	for (q = e->e_errorqueue; q != NULL; q = q->q_next)
+	{
+		if (!bitset(QDONTSEND|QBADADDR, q->q_flags))
+		{
+			printctladdr(q, tfp);
+			fprintf(tfp, "E%s\n", denlstring(q->q_paddr, TRUE, FALSE));
+		}
+	}
+
+	/* output list of recipient addresses */
+	for (q = e->e_sendqueue; q != NULL; q = q->q_next)
+	{
+		if (bitset(QQUEUEUP, q->q_flags) ||
+		    (queueall && !bitset(QDONTSEND|QBADADDR|QSENT, q->q_flags)))
+		{
+			printctladdr(q, tfp);
+			fprintf(tfp, "R%s\n", denlstring(q->q_paddr, TRUE, FALSE));
+			if (announce)
+			{
+				e->e_to = q->q_paddr;
+				message("queued");
+				if (LogLevel > 8)
+					logdelivery(NULL, NULL, "queued", NULL, e);
+				e->e_to = NULL;
+			}
+			if (tTd(40, 1))
+			{
+				printf("queueing ");
+				printaddr(q, FALSE);
+			}
+		}
+	}
+
+	/*
+	**  Output headers for this message.
+	**	Expand macros completely here.  Queue run will deal with
+	**	everything as absolute headers.
+	**		All headers that must be relative to the recipient
+	**		can be cracked later.
+	**	We set up a "null mailer" -- i.e., a mailer that will have
+	**	no effect on the addresses as they are output.
+	*/
+
+	bzero((char *) &nullmailer, sizeof nullmailer);
+	nullmailer.m_re_rwset = nullmailer.m_rh_rwset =
+			nullmailer.m_se_rwset = nullmailer.m_sh_rwset = -1;
+	nullmailer.m_eol = "\n";
+	bzero(&mcibuf, sizeof mcibuf);
+	mcibuf.mci_mailer = &nullmailer;
+	mcibuf.mci_out = tfp;
+
+	define('g', "\201f", e);
+	for (h = e->e_header; h != NULL; h = h->h_link)
+	{
+		extern bool bitzerop();
+
+		/* don't output null headers */
+		if (h->h_value == NULL || h->h_value[0] == '\0')
+			continue;
+
+		/* don't output resent headers on non-resent messages */
+		if (bitset(H_RESENT, h->h_flags) && !bitset(EF_RESENT, e->e_flags))
+			continue;
+
+		/* expand macros; if null, don't output header at all */
+		if (bitset(H_DEFAULT, h->h_flags))
+		{
+			(void) expand(h->h_value, buf, &buf[sizeof buf], e);
+			if (buf[0] == '\0')
+				continue;
+		}
+
+		/* output this header */
+		fprintf(tfp, "H");
+
+		/* if conditional, output the set of conditions */
+		if (!bitzerop(h->h_mflags) && bitset(H_CHECK|H_ACHECK, h->h_flags))
+		{
+			int j;
+
+			(void) putc('?', tfp);
+			for (j = '\0'; j <= '\177'; j++)
+				if (bitnset(j, h->h_mflags))
+					(void) putc(j, tfp);
+			(void) putc('?', tfp);
+		}
+
+		/* output the header: expand macros, convert addresses */
+		if (bitset(H_DEFAULT, h->h_flags))
+		{
+			fprintf(tfp, "%s: %s\n", h->h_field, buf);
+		}
+		else if (bitset(H_FROM|H_RCPT, h->h_flags))
+		{
+			bool oldstyle = bitset(EF_OLDSTYLE, e->e_flags);
+			FILE *savetrace = TrafficLogFile;
+
+			TrafficLogFile = NULL;
+
+			if (bitset(H_FROM, h->h_flags))
+				oldstyle = FALSE;
+
+			commaize(h, h->h_value, oldstyle, &mcibuf, e);
+
+			TrafficLogFile = savetrace;
+		}
+		else
+			fprintf(tfp, "%s: %s\n", h->h_field, h->h_value);
+	}
+
+	/*
+	**  Clean up.
+	*/
+
+	if (fflush(tfp) < 0 || fsync(fileno(tfp)) < 0 || ferror(tfp))
+	{
+		if (newid)
+			syserr("!552 Error writing control file %s", tf);
+		else
+			syserr("!452 Error writing control file %s", tf);
+	}
+
+	if (!newid)
+	{
+		/* rename (locked) tf to be (locked) qf */
+		qf = queuename(e, 'q');
+		if (rename(tf, qf) < 0)
+			syserr("cannot rename(%s, %s), df=%s, uid=%d",
+				tf, qf, e->e_df, geteuid());
+
+		/* close and unlock old (locked) qf */
+		if (e->e_lockfp != NULL)
+			(void) xfclose(e->e_lockfp, "queueup lockfp", e->e_id);
+		e->e_lockfp = tfp;
+	}
+	else
+		qf = tf;
+	errno = 0;
+	e->e_flags |= EF_INQUEUE;
+
+# ifdef LOG
+	/* save log info */
+	if (LogLevel > 79)
+		syslog(LOG_DEBUG, "%s: queueup, qf=%s, df=%s\n", e->e_id, qf, e->e_df);
+# endif /* LOG */
+
+	if (tTd(40, 1))
+		printf("<<<<< done queueing %s <<<<<\n\n", e->e_id);
+	return;
+}
+
+printctladdr(a, tfp)
+	register ADDRESS *a;
+	FILE *tfp;
+{
+	char *uname;
+	register struct passwd *pw;
+	register ADDRESS *q;
+	uid_t uid;
+	static ADDRESS *lastctladdr;
+	static uid_t lastuid;
+
+	/* initialization */
+	if (a == NULL || a->q_alias == NULL || tfp == NULL)
+	{
+		if (lastctladdr != NULL && tfp != NULL)
+			fprintf(tfp, "C\n");
+		lastctladdr = NULL;
+		lastuid = 0;
+		return;
+	}
+
+	/* find the active uid */
+	q = getctladdr(a);
+	if (q == NULL)
+		uid = 0;
+	else
+		uid = q->q_uid;
+	a = a->q_alias;
+
+	/* check to see if this is the same as last time */
+	if (lastctladdr != NULL && uid == lastuid &&
+	    strcmp(lastctladdr->q_paddr, a->q_paddr) == 0)
+		return;
+	lastuid = uid;
+	lastctladdr = a;
+
+	if (uid == 0 || (pw = getpwuid(uid)) == NULL)
+		uname = "";
+	else
+		uname = pw->pw_name;
+
+	fprintf(tfp, "C%s:%s\n", uname, denlstring(a->q_paddr, TRUE, FALSE));
+}
+
+/*
+**  RUNQUEUE -- run the jobs in the queue.
+**
+**	Gets the stuff out of the queue in some presumably logical
+**	order and processes them.
+**
+**	Parameters:
+**		forkflag -- TRUE if the queue scanning should be done in
+**			a child process.  We double-fork so it is not our
+**			child and we don't have to clean up after it.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		runs things in the mail queue.
+*/
+
+ENVELOPE	QueueEnvelope;		/* the queue run envelope */
+
+runqueue(forkflag)
+	bool forkflag;
+{
+	register ENVELOPE *e;
+	extern ENVELOPE BlankEnvelope;
+
+	/*
+	**  If no work will ever be selected, don't even bother reading
+	**  the queue.
+	*/
+
+	CurrentLA = getla();	/* get load average */
+
+	if (shouldqueue(0L, curtime()))
+	{
+		if (Verbose)
+			printf("Skipping queue run -- load average too high\n");
+		if (forkflag && QueueIntvl != 0)
+			(void) setevent(QueueIntvl, runqueue, TRUE);
+		return;
+	}
+
+	/*
+	**  See if we want to go off and do other useful work.
+	*/
+
+	if (forkflag)
+	{
+		int pid;
+#ifdef SIGCHLD
+		extern void reapchild();
+
+		(void) setsignal(SIGCHLD, reapchild);
+#endif
+
+		pid = dofork();
+		if (pid != 0)
+		{
+			/* parent -- pick up intermediate zombie */
+#ifndef SIGCHLD
+			(void) waitfor(pid);
+#endif /* SIGCHLD */
+			if (QueueIntvl != 0)
+				(void) setevent(QueueIntvl, runqueue, TRUE);
+			return;
+		}
+		/* child -- double fork */
+#ifndef SIGCHLD
+		if (fork() != 0)
+			exit(EX_OK);
+#else /* SIGCHLD */
+		(void) setsignal(SIGCHLD, SIG_DFL);
+#endif /* SIGCHLD */
+	}
+
+	setproctitle("running queue: %s", QueueDir);
+
+# ifdef LOG
+	if (LogLevel > 69)
+		syslog(LOG_DEBUG, "runqueue %s, pid=%d, forkflag=%d",
+			QueueDir, getpid(), forkflag);
+# endif /* LOG */
+
+	/*
+	**  Release any resources used by the daemon code.
+	*/
+
+# ifdef DAEMON
+	clrdaemon();
+# endif /* DAEMON */
+
+	/* force it to run expensive jobs */
+	NoConnect = FALSE;
+
+	/*
+	**  Create ourselves an envelope
+	*/
+
+	CurEnv = &QueueEnvelope;
+	e = newenvelope(&QueueEnvelope, CurEnv);
+	e->e_flags = BlankEnvelope.e_flags;
+
+	/*
+	**  Make sure the alias database is open.
+	*/
+
+	initmaps(FALSE, e);
+
+	/*
+	**  Start making passes through the queue.
+	**	First, read and sort the entire queue.
+	**	Then, process the work in that order.
+	**		But if you take too long, start over.
+	*/
+
+	/* order the existing work requests */
+	(void) orderq(FALSE);
+
+	/* process them once at a time */
+	while (WorkQ != NULL)
+	{
+		WORK *w = WorkQ;
+
+		WorkQ = WorkQ->w_next;
+
+		/*
+		**  Ignore jobs that are too expensive for the moment.
+		*/
+
+		if (shouldqueue(w->w_pri, w->w_ctime))
+		{
+			if (Verbose)
+				printf("\nSkipping %s\n", w->w_name + 2);
+		}
+		else
+		{
+			pid_t pid;
+			extern pid_t dowork();
+
+			pid = dowork(w->w_name + 2, ForkQueueRuns, FALSE, e);
+			errno = 0;
+			if (pid != 0)
+				(void) waitfor(pid);
+		}
+		free(w->w_name);
+		free((char *) w);
+	}
+
+	/* exit without the usual cleanup */
+	e->e_id = NULL;
+	finis();
+}
+/*
+**  ORDERQ -- order the work queue.
+**
+**	Parameters:
+**		doall -- if set, include everything in the queue (even
+**			the jobs that cannot be run because the load
+**			average is too high).  Otherwise, exclude those
+**			jobs.
+**
+**	Returns:
+**		The number of request in the queue (not necessarily
+**		the number of requests in WorkQ however).
+**
+**	Side Effects:
+**		Sets WorkQ to the queue of available work, in order.
+*/
+
+# define NEED_P		001
+# define NEED_T		002
+# define NEED_R		004
+# define NEED_S		010
+
+orderq(doall)
+	bool doall;
+{
+	register struct dirent *d;
+	register WORK *w;
+	DIR *f;
+	register int i;
+	WORK wlist[QUEUESIZE+1];
+	int wn = -1;
+	extern workcmpf();
+
+	if (tTd(41, 1))
+	{
+		printf("orderq:\n");
+		if (QueueLimitId != NULL)
+			printf("\tQueueLimitId = %s\n", QueueLimitId);
+		if (QueueLimitSender != NULL)
+			printf("\tQueueLimitSender = %s\n", QueueLimitSender);
+		if (QueueLimitRecipient != NULL)
+			printf("\tQueueLimitRecipient = %s\n", QueueLimitRecipient);
+	}
+
+	/* clear out old WorkQ */
+	for (w = WorkQ; w != NULL; )
+	{
+		register WORK *nw = w->w_next;
+
+		WorkQ = nw;
+		free(w->w_name);
+		free((char *) w);
+		w = nw;
+	}
+
+	/* open the queue directory */
+	f = opendir(".");
+	if (f == NULL)
+	{
+		syserr("orderq: cannot open \"%s\" as \".\"", QueueDir);
+		return (0);
+	}
+
+	/*
+	**  Read the work directory.
+	*/
+
+	while ((d = readdir(f)) != NULL)
+	{
+		FILE *cf;
+		register char *p;
+		char lbuf[MAXNAME];
+		extern bool strcontainedin();
+
+		/* is this an interesting entry? */
+		if (d->d_name[0] != 'q' || d->d_name[1] != 'f')
+			continue;
+
+		if (QueueLimitId != NULL &&
+		    !strcontainedin(QueueLimitId, d->d_name))
+			continue;
+
+		/*
+		**  Check queue name for plausibility.  This handles
+		**  both old and new type ids.
+		*/
+
+		p = d->d_name + 2;
+		if (isupper(p[0]) && isupper(p[2]))
+			p += 3;
+		else if (isupper(p[1]))
+			p += 2;
+		else
+			p = d->d_name;
+		for (i = 0; isdigit(*p); p++)
+			i++;
+		if (i < 5 || *p != '\0')
+		{
+			if (Verbose)
+				printf("orderq: bogus qf name %s\n", d->d_name);
+#ifdef LOG
+			if (LogLevel > 3)
+				syslog(LOG_CRIT, "orderq: bogus qf name %s",
+					d->d_name);
+#endif
+			if (strlen(d->d_name) >= MAXNAME)
+				d->d_name[MAXNAME - 1] = '\0';
+			strcpy(lbuf, d->d_name);
+			lbuf[0] = 'Q';
+			(void) rename(d->d_name, lbuf);
+			continue;
+		}
+
+		/* yes -- open control file (if not too many files) */
+		if (++wn >= QUEUESIZE)
+			continue;
+
+		cf = fopen(d->d_name, "r");
+		if (cf == NULL)
+		{
+			/* this may be some random person sending hir msgs */
+			/* syserr("orderq: cannot open %s", cbuf); */
+			if (tTd(41, 2))
+				printf("orderq: cannot open %s (%d)\n",
+					d->d_name, errno);
+			errno = 0;
+			wn--;
+			continue;
+		}
+		w = &wlist[wn];
+		w->w_name = newstr(d->d_name);
+
+		/* make sure jobs in creation don't clog queue */
+		w->w_pri = 0x7fffffff;
+		w->w_ctime = 0;
+
+		/* extract useful information */
+		i = NEED_P | NEED_T;
+		if (QueueLimitSender != NULL)
+			i |= NEED_S;
+		if (QueueLimitRecipient != NULL)
+			i |= NEED_R;
+		while (i != 0 && fgets(lbuf, sizeof lbuf, cf) != NULL)
+		{
+			extern long atol();
+			extern bool strcontainedin();
+
+			switch (lbuf[0])
+			{
+			  case 'P':
+				w->w_pri = atol(&lbuf[1]);
+				i &= ~NEED_P;
+				break;
+
+			  case 'T':
+				w->w_ctime = atol(&lbuf[1]);
+				i &= ~NEED_T;
+				break;
+
+			  case 'R':
+				if (QueueLimitRecipient != NULL &&
+				    strcontainedin(QueueLimitRecipient, &lbuf[1]))
+					i &= ~NEED_R;
+				break;
+
+			  case 'S':
+				if (QueueLimitSender != NULL &&
+				    strcontainedin(QueueLimitSender, &lbuf[1]))
+					i &= ~NEED_S;
+				break;
+			}
+		}
+		(void) fclose(cf);
+
+		if ((!doall && shouldqueue(w->w_pri, w->w_ctime)) ||
+		    bitset(NEED_R|NEED_S, i))
+		{
+			/* don't even bother sorting this job in */
+			wn--;
+		}
+	}
+	(void) closedir(f);
+	wn++;
+
+	/*
+	**  Sort the work directory.
+	*/
+
+	qsort((char *) wlist, min(wn, QUEUESIZE), sizeof *wlist, workcmpf);
+
+	/*
+	**  Convert the work list into canonical form.
+	**	Should be turning it into a list of envelopes here perhaps.
+	*/
+
+	WorkQ = NULL;
+	for (i = min(wn, QUEUESIZE); --i >= 0; )
+	{
+		w = (WORK *) xalloc(sizeof *w);
+		w->w_name = wlist[i].w_name;
+		w->w_pri = wlist[i].w_pri;
+		w->w_ctime = wlist[i].w_ctime;
+		w->w_next = WorkQ;
+		WorkQ = w;
+	}
+
+	if (tTd(40, 1))
+	{
+		for (w = WorkQ; w != NULL; w = w->w_next)
+			printf("%32s: pri=%ld\n", w->w_name, w->w_pri);
+	}
+
+	return (wn);
+}
+/*
+**  WORKCMPF -- compare function for ordering work.
+**
+**	Parameters:
+**		a -- the first argument.
+**		b -- the second argument.
+**
+**	Returns:
+**		-1 if a < b
+**		 0 if a == b
+**		+1 if a > b
+**
+**	Side Effects:
+**		none.
+*/
+
+workcmpf(a, b)
+	register WORK *a;
+	register WORK *b;
+{
+	long pa = a->w_pri;
+	long pb = b->w_pri;
+
+	if (pa == pb)
+		return (0);
+	else if (pa > pb)
+		return (1);
+	else
+		return (-1);
+}
+/*
+**  DOWORK -- do a work request.
+**
+**	Parameters:
+**		id -- the ID of the job to run.
+**		forkflag -- if set, run this in background.
+**		requeueflag -- if set, reinstantiate the queue quickly.
+**			This is used when expanding aliases in the queue.
+**			If forkflag is also set, it doesn't wait for the
+**			child.
+**		e - the envelope in which to run it.
+**
+**	Returns:
+**		process id of process that is running the queue job.
+**
+**	Side Effects:
+**		The work request is satisfied if possible.
+*/
+
+pid_t
+dowork(id, forkflag, requeueflag, e)
+	char *id;
+	bool forkflag;
+	bool requeueflag;
+	register ENVELOPE *e;
+{
+	register pid_t pid;
+	extern bool readqf();
+
+	if (tTd(40, 1))
+		printf("dowork(%s)\n", id);
+
+	/*
+	**  Fork for work.
+	*/
+
+	if (forkflag)
+	{
+		pid = fork();
+		if (pid < 0)
+		{
+			syserr("dowork: cannot fork");
+			return 0;
+		}
+		else if (pid > 0)
+		{
+			/* parent -- clean out connection cache */
+			mci_flush(FALSE, NULL);
+		}
+	}
+	else
+	{
+		pid = 0;
+	}
+
+	if (pid == 0)
+	{
+		/*
+		**  CHILD
+		**	Lock the control file to avoid duplicate deliveries.
+		**		Then run the file as though we had just read it.
+		**	We save an idea of the temporary name so we
+		**		can recover on interrupt.
+		*/
+
+		/* set basic modes, etc. */
+		(void) alarm(0);
+		clearenvelope(e, FALSE);
+		e->e_flags |= EF_QUEUERUN|EF_GLOBALERRS;
+		e->e_errormode = EM_MAIL;
+		e->e_id = id;
+		GrabTo = UseErrorsTo = FALSE;
+		ExitStat = EX_OK;
+		if (forkflag)
+		{
+			disconnect(1, e);
+			OpMode = MD_DELIVER;
+		}
+# ifdef LOG
+		if (LogLevel > 76)
+			syslog(LOG_DEBUG, "%s: dowork, pid=%d", e->e_id,
+			       getpid());
+# endif /* LOG */
+
+		/* don't use the headers from sendmail.cf... */
+		e->e_header = NULL;
+
+		/* read the queue control file -- return if locked */
+		if (!readqf(e))
+		{
+			if (tTd(40, 4))
+				printf("readqf(%s) failed\n", e->e_id);
+			if (forkflag)
+				exit(EX_OK);
+			else
+				return 0;
+		}
+
+		e->e_flags |= EF_INQUEUE;
+		eatheader(e, requeueflag);
+
+		if (requeueflag)
+			queueup(e, TRUE, FALSE);
+
+		/* do the delivery */
+		sendall(e, SM_DELIVER);
+
+		/* finish up and exit */
+		if (forkflag)
+			finis();
+		else
+			dropenvelope(e);
+	}
+	e->e_id = NULL;
+	return pid;
+}
+/*
+**  READQF -- read queue file and set up environment.
+**
+**	Parameters:
+**		e -- the envelope of the job to run.
+**
+**	Returns:
+**		TRUE if it successfully read the queue file.
+**		FALSE otherwise.
+**
+**	Side Effects:
+**		The queue file is returned locked.
+*/
+
+bool
+readqf(e)
+	register ENVELOPE *e;
+{
+	register FILE *qfp;
+	ADDRESS *ctladdr;
+	struct stat st;
+	char *bp;
+	char qf[20];
+	char buf[MAXLINE];
+	extern long atol();
+	extern ADDRESS *setctluser();
+
+	/*
+	**  Read and process the file.
+	*/
+
+	strcpy(qf, queuename(e, 'q'));
+	qfp = fopen(qf, "r+");
+	if (qfp == NULL)
+	{
+		if (tTd(40, 8))
+			printf("readqf(%s): fopen failure (%s)\n",
+				qf, errstring(errno));
+		if (errno != ENOENT)
+			syserr("readqf: no control file %s", qf);
+		return FALSE;
+	}
+
+	if (!lockfile(fileno(qfp), qf, NULL, LOCK_EX|LOCK_NB))
+	{
+		/* being processed by another queuer */
+		if (tTd(40, 8))
+			printf("readqf(%s): locked\n", qf);
+		if (Verbose)
+			printf("%s: locked\n", e->e_id);
+# ifdef LOG
+		if (LogLevel > 19)
+			syslog(LOG_DEBUG, "%s: locked", e->e_id);
+# endif /* LOG */
+		(void) fclose(qfp);
+		return FALSE;
+	}
+
+	/*
+	**  Check the queue file for plausibility to avoid attacks.
+	*/
+
+	if (fstat(fileno(qfp), &st) < 0)
+	{
+		/* must have been being processed by someone else */
+		if (tTd(40, 8))
+			printf("readqf(%s): fstat failure (%s)\n",
+				qf, errstring(errno));
+		fclose(qfp);
+		return FALSE;
+	}
+
+	if (st.st_uid != geteuid())
+	{
+# ifdef LOG
+		if (LogLevel > 0)
+		{
+			syslog(LOG_ALERT, "%s: bogus queue file, uid=%d, mode=%o",
+				e->e_id, st.st_uid, st.st_mode);
+		}
+# endif /* LOG */
+		if (tTd(40, 8))
+			printf("readqf(%s): bogus file\n", qf);
+		rename(qf, queuename(e, 'Q'));
+		fclose(qfp);
+		return FALSE;
+	}
+
+	if (st.st_size == 0)
+	{
+		/* must be a bogus file -- just remove it */
+		(void) unlink(qf);
+		fclose(qfp);
+		return FALSE;
+	}
+
+	if (st.st_nlink == 0)
+	{
+		/*
+		**  Race condition -- we got a file just as it was being
+		**  unlinked.  Just assume it is zero length.
+		*/
+
+		fclose(qfp);
+		return FALSE;
+	}
+
+	/* good file -- save this lock */
+	e->e_lockfp = qfp;
+
+	/* do basic system initialization */
+	initsys(e);
+	define('i', e->e_id, e);
+
+	LineNumber = 0;
+	e->e_flags |= EF_GLOBALERRS;
+	OpMode = MD_DELIVER;
+	if (Verbose)
+		printf("\nRunning %s\n", e->e_id);
+	ctladdr = NULL;
+	while ((bp = fgetfolded(buf, sizeof buf, qfp)) != NULL)
+	{
+		register char *p;
+		struct stat st;
+
+		if (tTd(40, 4))
+			printf("+++++ %s\n", bp);
+		switch (bp[0])
+		{
+		  case 'C':		/* specify controlling user */
+			ctladdr = setctluser(&bp[1]);
+			break;
+
+		  case 'R':		/* specify recipient */
+			(void) sendtolist(&bp[1], ctladdr, &e->e_sendqueue, e);
+			break;
+
+		  case 'E':		/* specify error recipient */
+			(void) sendtolist(&bp[1], ctladdr, &e->e_errorqueue, e);
+			break;
+
+		  case 'H':		/* header */
+			(void) chompheader(&bp[1], FALSE, e);
+			break;
+
+		  case 'M':		/* message */
+			/* ignore this; we want a new message next time */
+			break;
+
+		  case 'S':		/* sender */
+			setsender(newstr(&bp[1]), e, NULL, TRUE);
+			break;
+
+		  case 'B':		/* body type */
+			e->e_bodytype = newstr(&bp[1]);
+			break;
+
+		  case 'D':		/* data file name */
+			e->e_df = newstr(&bp[1]);
+			e->e_dfp = fopen(e->e_df, "r");
+			if (e->e_dfp == NULL)
+			{
+				syserr("readqf: cannot open %s", e->e_df);
+				e->e_msgsize = -1;
+			}
+			else if (fstat(fileno(e->e_dfp), &st) >= 0)
+				e->e_msgsize = st.st_size;
+			break;
+
+		  case 'T':		/* init time */
+			e->e_ctime = atol(&bp[1]);
+			break;
+
+		  case 'P':		/* message priority */
+			e->e_msgpriority = atol(&bp[1]) + WkTimeFact;
+			break;
+
+		  case 'F':		/* flag bits */
+			for (p = &bp[1]; *p != '\0'; p++)
+			{
+				switch (*p)
+				{
+				  case 'w':	/* warning sent */
+					e->e_flags |= EF_WARNING;
+					break;
+
+				  case 'r':	/* response */
+					e->e_flags |= EF_RESPONSE;
+					break;
+				}
+			}
+			break;
+
+		  case '$':		/* define macro */
+			define(bp[1], newstr(&bp[2]), e);
+			break;
+
+		  case '\0':		/* blank line; ignore */
+			break;
+
+		  default:
+			syserr("readqf: %s: line %d: bad line \"%s\"",
+				qf, LineNumber, bp);
+			fclose(qfp);
+			rename(qf, queuename(e, 'Q'));
+			return FALSE;
+		}
+
+		if (bp != buf)
+			free(bp);
+	}
+
+	/*
+	**  If we haven't read any lines, this queue file is empty.
+	**  Arrange to remove it without referencing any null pointers.
+	*/
+
+	if (LineNumber == 0)
+	{
+		errno = 0;
+		e->e_flags |= EF_CLRQUEUE | EF_FATALERRS | EF_RESPONSE;
+	}
+	return TRUE;
+}
+/*
+**  PRINTQUEUE -- print out a representation of the mail queue
+**
+**	Parameters:
+**		none.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		Prints a listing of the mail queue on the standard output.
+*/
+
+printqueue()
+{
+	register WORK *w;
+	FILE *f;
+	int nrequests;
+	char buf[MAXLINE];
+
+	/*
+	**  Check for permission to print the queue
+	*/
+
+	if (bitset(PRIV_RESTRICTMAILQ, PrivacyFlags) && RealUid != 0)
+	{
+		struct stat st;
+# ifdef NGROUPS
+		int n;
+		GIDSET_T gidset[NGROUPS];
+# endif
+
+		if (stat(QueueDir, &st) < 0)
+		{
+			syserr("Cannot stat %s", QueueDir);
+			return;
+		}
+# ifdef NGROUPS
+		n = getgroups(NGROUPS, gidset);
+		while (--n >= 0)
+		{
+			if (gidset[n] == st.st_gid)
+				break;
+		}
+		if (n < 0 && RealGid != st.st_gid)
+# else
+		if (RealGid != st.st_gid)
+# endif
+		{
+			usrerr("510 You are not permitted to see the queue");
+			setstat(EX_NOPERM);
+			return;
+		}
+	}
+
+	/*
+	**  Read and order the queue.
+	*/
+
+	nrequests = orderq(TRUE);
+
+	/*
+	**  Print the work list that we have read.
+	*/
+
+	/* first see if there is anything */
+	if (nrequests <= 0)
+	{
+		printf("Mail queue is empty\n");
+		return;
+	}
+
+	CurrentLA = getla();	/* get load average */
+
+	printf("\t\tMail Queue (%d request%s", nrequests, nrequests == 1 ? "" : "s");
+	if (nrequests > QUEUESIZE)
+		printf(", only %d printed", QUEUESIZE);
+	if (Verbose)
+		printf(")\n--Q-ID-- --Size-- -Priority- ---Q-Time--- -----------Sender/Recipient-----------\n");
+	else
+		printf(")\n--Q-ID-- --Size-- -----Q-Time----- ------------Sender/Recipient------------\n");
+	for (w = WorkQ; w != NULL; w = w->w_next)
+	{
+		struct stat st;
+		auto time_t submittime = 0;
+		long dfsize = -1;
+		int flags = 0;
+		char message[MAXLINE];
+		char bodytype[MAXNAME];
+
+		printf("%8s", w->w_name + 2);
+		f = fopen(w->w_name, "r");
+		if (f == NULL)
+		{
+			printf(" (job completed)\n");
+			errno = 0;
+			continue;
+		}
+		if (!lockfile(fileno(f), w->w_name, NULL, LOCK_SH|LOCK_NB))
+			printf("*");
+		else if (shouldqueue(w->w_pri, w->w_ctime))
+			printf("X");
+		else
+			printf(" ");
+		errno = 0;
+
+		message[0] = bodytype[0] = '\0';
+		while (fgets(buf, sizeof buf, f) != NULL)
+		{
+			register int i;
+			register char *p;
+
+			fixcrlf(buf, TRUE);
+			switch (buf[0])
+			{
+			  case 'M':	/* error message */
+				if ((i = strlen(&buf[1])) >= sizeof message)
+					i = sizeof message - 1;
+				bcopy(&buf[1], message, i);
+				message[i] = '\0';
+				break;
+
+			  case 'B':	/* body type */
+				if ((i = strlen(&buf[1])) >= sizeof bodytype)
+					i = sizeof bodytype - 1;
+				bcopy(&buf[1], bodytype, i);
+				bodytype[i] = '\0';
+				break;
+
+			  case 'S':	/* sender name */
+				if (Verbose)
+					printf("%8ld %10ld%c%.12s %.38s",
+					    dfsize,
+					    w->w_pri,
+					    bitset(EF_WARNING, flags) ? '+' : ' ',
+					    ctime(&submittime) + 4,
+					    &buf[1]);
+				else
+					printf("%8ld %.16s %.45s", dfsize,
+					    ctime(&submittime), &buf[1]);
+				if (message[0] != '\0' || bodytype[0] != '\0')
+				{
+					printf("\n    %10.10s", bodytype);
+					if (message[0] != '\0')
+						printf("   (%.60s)", message);
+				}
+				break;
+
+			  case 'C':	/* controlling user */
+				if (Verbose)
+					printf("\n\t\t\t\t      (---%.34s---)",
+						&buf[1]);
+				break;
+
+			  case 'R':	/* recipient name */
+				if (Verbose)
+					printf("\n\t\t\t\t\t  %.38s", &buf[1]);
+				else
+					printf("\n\t\t\t\t   %.45s", &buf[1]);
+				break;
+
+			  case 'T':	/* creation time */
+				submittime = atol(&buf[1]);
+				break;
+
+			  case 'D':	/* data file name */
+				if (stat(&buf[1], &st) >= 0)
+					dfsize = st.st_size;
+				break;
+
+			  case 'F':	/* flag bits */
+				for (p = &buf[1]; *p != '\0'; p++)
+				{
+					switch (*p)
+					{
+					  case 'w':
+						flags |= EF_WARNING;
+						break;
+					}
+				}
+			}
+		}
+		if (submittime == (time_t) 0)
+			printf(" (no control file)");
+		printf("\n");
+		(void) fclose(f);
+	}
+}
+
+# endif /* QUEUE */
+/*
+**  QUEUENAME -- build a file name in the queue directory for this envelope.
+**
+**	Assigns an id code if one does not already exist.
+**	This code is very careful to avoid trashing existing files
+**	under any circumstances.
+**
+**	Parameters:
+**		e -- envelope to build it in/from.
+**		type -- the file type, used as the first character
+**			of the file name.
+**
+**	Returns:
+**		a pointer to the new file name (in a static buffer).
+**
+**	Side Effects:
+**		If no id code is already assigned, queuename will
+**		assign an id code, create a qf file, and leave a
+**		locked, open-for-write file pointer in the envelope.
+*/
+
+char *
+queuename(e, type)
+	register ENVELOPE *e;
+	int type;
+{
+	static int pid = -1;
+	static char c0;
+	static char c1;
+	static char c2;
+	time_t now;
+	struct tm *tm;
+	static char buf[MAXNAME];
+
+	if (e->e_id == NULL)
+	{
+		char qf[20];
+
+		/* find a unique id */
+		if (pid != getpid())
+		{
+			/* new process -- start back at "AA" */
+			pid = getpid();
+			now = curtime();
+			tm = localtime(&now);
+			c0 = 'A' + tm->tm_hour;
+			c1 = 'A';
+			c2 = 'A' - 1;
+		}
+		(void) sprintf(qf, "qf%cAA%05d", c0, pid);
+
+		while (c1 < '~' || c2 < 'Z')
+		{
+			int i;
+
+			if (c2 >= 'Z')
+			{
+				c1++;
+				c2 = 'A' - 1;
+			}
+			qf[3] = c1;
+			qf[4] = ++c2;
+			if (tTd(7, 20))
+				printf("queuename: trying \"%s\"\n", qf);
+
+			i = open(qf, O_WRONLY|O_CREAT|O_EXCL, FileMode);
+			if (i < 0)
+			{
+				if (errno == EEXIST)
+					continue;
+				syserr("queuename: Cannot create \"%s\" in \"%s\" (euid=%d)",
+					qf, QueueDir, geteuid());
+				exit(EX_UNAVAILABLE);
+			}
+			if (lockfile(i, qf, NULL, LOCK_EX|LOCK_NB))
+			{
+				e->e_lockfp = fdopen(i, "w");
+				break;
+			}
+
+			/* a reader got the file; abandon it and try again */
+			(void) close(i);
+		}
+		if (c1 >= '~' && c2 >= 'Z')
+		{
+			syserr("queuename: Cannot create \"%s\" in \"%s\" (euid=%d)",
+				qf, QueueDir, geteuid());
+			exit(EX_OSERR);
+		}
+		e->e_id = newstr(&qf[2]);
+		define('i', e->e_id, e);
+		if (tTd(7, 1))
+			printf("queuename: assigned id %s, env=%x\n", e->e_id, e);
+		if (tTd(7, 9))
+		{
+			printf("  lockfd=");
+			dumpfd(fileno(e->e_lockfp), TRUE, FALSE);
+		}
+# ifdef LOG
+		if (LogLevel > 93)
+			syslog(LOG_DEBUG, "%s: assigned id", e->e_id);
+# endif /* LOG */
+	}
+
+	if (type == '\0')
+		return (NULL);
+	(void) sprintf(buf, "%cf%s", type, e->e_id);
+	if (tTd(7, 2))
+		printf("queuename: %s\n", buf);
+	return (buf);
+}
+/*
+**  UNLOCKQUEUE -- unlock the queue entry for a specified envelope
+**
+**	Parameters:
+**		e -- the envelope to unlock.
+**
+**	Returns:
+**		none
+**
+**	Side Effects:
+**		unlocks the queue for `e'.
+*/
+
+unlockqueue(e)
+	ENVELOPE *e;
+{
+	if (tTd(51, 4))
+		printf("unlockqueue(%s)\n", e->e_id);
+
+	/* if there is a lock file in the envelope, close it */
+	if (e->e_lockfp != NULL)
+		xfclose(e->e_lockfp, "unlockqueue", e->e_id);
+	e->e_lockfp = NULL;
+
+	/* don't create a queue id if we don't already have one */
+	if (e->e_id == NULL)
+		return;
+
+	/* remove the transcript */
+# ifdef LOG
+	if (LogLevel > 87)
+		syslog(LOG_DEBUG, "%s: unlock", e->e_id);
+# endif /* LOG */
+	if (!tTd(51, 104))
+		xunlink(queuename(e, 'x'));
+
+}
+/*
+**  SETCTLUSER -- create a controlling address
+**
+**	Create a fake "address" given only a local login name; this is
+**	used as a "controlling user" for future recipient addresses.
+**
+**	Parameters:
+**		user -- the user name of the controlling user.
+**
+**	Returns:
+**		An address descriptor for the controlling user.
+**
+**	Side Effects:
+**		none.
+*/
+
+ADDRESS *
+setctluser(user)
+	char *user;
+{
+	register ADDRESS *a;
+	struct passwd *pw;
+	char *p;
+
+	/*
+	**  See if this clears our concept of controlling user.
+	*/
+
+	if (user == NULL || *user == '\0')
+		return NULL;
+
+	/*
+	**  Set up addr fields for controlling user.
+	*/
+
+	a = (ADDRESS *) xalloc(sizeof *a);
+	bzero((char *) a, sizeof *a);
+
+	p = strchr(user, ':');
+	if (p != NULL)
+		*p++ = '\0';
+	if (*user != '\0' && (pw = getpwnam(user)) != NULL)
+	{
+		if (strcmp(pw->pw_dir, "/") == 0)
+			a->q_home = "";
+		else
+			a->q_home = newstr(pw->pw_dir);
+		a->q_uid = pw->pw_uid;
+		a->q_gid = pw->pw_gid;
+		a->q_user = newstr(user);
+		a->q_flags |= QGOODUID;
+	}
+	else
+	{
+		a->q_user = newstr(DefUser);
+	}
+
+	a->q_flags |= QPRIMARY;		/* flag as a "ctladdr"  */
+	a->q_mailer = LocalMailer;
+	if (p == NULL)
+		a->q_paddr = a->q_user;
+	else
+		a->q_paddr = newstr(p);
+	return a;
+}
diff --git a/usr.sbin/sendmail/src/readcf.c b/usr.sbin/sendmail/src/readcf.c
new file mode 100644
index 00000000000..ad7da2a2f95
--- /dev/null
+++ b/usr.sbin/sendmail/src/readcf.c
@@ -0,0 +1,1685 @@
+/*
+ * Copyright (c) 1983 Eric P. Allman
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)readcf.c	8.23.1.3 (Berkeley) 3/5/95";
+#endif /* not lint */
+
+# include "sendmail.h"
+# include <pwd.h>
+# include <grp.h>
+#if NAMED_BIND
+# include <arpa/nameser.h>
+# include <resolv.h>
+#endif
+
+/*
+**  READCF -- read control file.
+**
+**	This routine reads the control file and builds the internal
+**	form.
+**
+**	The file is formatted as a sequence of lines, each taken
+**	atomically.  The first character of each line describes how
+**	the line is to be interpreted.  The lines are:
+**		Dxval		Define macro x to have value val.
+**		Cxword		Put word into class x.
+**		Fxfile [fmt]	Read file for lines to put into
+**				class x.  Use scanf string 'fmt'
+**				or "%s" if not present.  Fmt should
+**				only produce one string-valued result.
+**		Hname: value	Define header with field-name 'name'
+**				and value as specified; this will be
+**				macro expanded immediately before
+**				use.
+**		Sn		Use rewriting set n.
+**		Rlhs rhs	Rewrite addresses that match lhs to
+**				be rhs.
+**		Mn arg=val...	Define mailer.  n is the internal name.
+**				Args specify mailer parameters.
+**		Oxvalue		Set option x to value.
+**		Pname=value	Set precedence name to value.
+**		Vversioncode[/vendorcode]
+**				Version level/vendor name of
+**				configuration syntax.
+**		Kmapname mapclass arguments....
+**				Define keyed lookup of a given class.
+**				Arguments are class dependent.
+**
+**	Parameters:
+**		cfname -- control file name.
+**		safe -- TRUE if this is the system config file;
+**			FALSE otherwise.
+**		e -- the main envelope.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		Builds several internal tables.
+*/
+
+readcf(cfname, safe, e)
+	char *cfname;
+	bool safe;
+	register ENVELOPE *e;
+{
+	FILE *cf;
+	int ruleset = 0;
+	char *q;
+	struct rewrite *rwp = NULL;
+	char *bp;
+	auto char *ep;
+	int nfuzzy;
+	char *file;
+	bool optional;
+	char buf[MAXLINE];
+	register char *p;
+	extern char **copyplist();
+	struct stat statb;
+	char exbuf[MAXLINE];
+	char pvpbuf[MAXLINE + MAXATOM];
+	extern char *munchstring();
+	extern void makemapentry();
+
+	FileName = cfname;
+	LineNumber = 0;
+
+	cf = fopen(cfname, "r");
+	if (cf == NULL)
+	{
+		syserr("cannot open");
+		exit(EX_OSFILE);
+	}
+
+	if (fstat(fileno(cf), &statb) < 0)
+	{
+		syserr("cannot fstat");
+		exit(EX_OSFILE);
+	}
+
+	if (!S_ISREG(statb.st_mode))
+	{
+		syserr("not a plain file");
+		exit(EX_OSFILE);
+	}
+
+	if (OpMode != MD_TEST && bitset(S_IWGRP|S_IWOTH, statb.st_mode))
+	{
+		if (OpMode == MD_DAEMON || OpMode == MD_FREEZE)
+			fprintf(stderr, "%s: WARNING: dangerous write permissions\n",
+				FileName);
+#ifdef LOG
+		if (LogLevel > 0)
+			syslog(LOG_CRIT, "%s: WARNING: dangerous write permissions",
+				FileName);
+#endif
+	}
+
+#ifdef XLA
+	xla_zero();
+#endif
+
+	while ((bp = fgetfolded(buf, sizeof buf, cf)) != NULL)
+	{
+		if (bp[0] == '#')
+		{
+			if (bp != buf)
+				free(bp);
+			continue;
+		}
+
+		/* map $ into \201 for macro expansion */
+		for (p = bp; *p != '\0'; p++)
+		{
+			if (*p == '#' && p > bp && ConfigLevel >= 3)
+			{
+				/* this is an on-line comment */
+				register char *e;
+
+				switch (*--p & 0377)
+				{
+				  case MACROEXPAND:
+					/* it's from $# -- let it go through */
+					p++;
+					break;
+
+				  case '\\':
+					/* it's backslash escaped */
+					(void) strcpy(p, p + 1);
+					break;
+
+				  default:
+					/* delete preceeding white space */
+					while (isascii(*p) && isspace(*p) && p > bp)
+						p--;
+					if ((e = strchr(++p, '\n')) != NULL)
+						(void) strcpy(p, e);
+					else
+						p[0] = p[1] = '\0';
+					break;
+				}
+				continue;
+			}
+
+			if (*p != '$')
+				continue;
+
+			if (p[1] == '$')
+			{
+				/* actual dollar sign.... */
+				(void) strcpy(p, p + 1);
+				continue;
+			}
+
+			/* convert to macro expansion character */
+			*p = MACROEXPAND;
+		}
+
+		/* interpret this line */
+		errno = 0;
+		switch (bp[0])
+		{
+		  case '\0':
+		  case '#':		/* comment */
+			break;
+
+		  case 'R':		/* rewriting rule */
+			for (p = &bp[1]; *p != '\0' && *p != '\t'; p++)
+				continue;
+
+			if (*p == '\0')
+			{
+				syserr("invalid rewrite line \"%s\" (tab expected)", bp);
+				break;
+			}
+
+			/* allocate space for the rule header */
+			if (rwp == NULL)
+			{
+				RewriteRules[ruleset] = rwp =
+					(struct rewrite *) xalloc(sizeof *rwp);
+			}
+			else
+			{
+				rwp->r_next = (struct rewrite *) xalloc(sizeof *rwp);
+				rwp = rwp->r_next;
+			}
+			rwp->r_next = NULL;
+
+			/* expand and save the LHS */
+			*p = '\0';
+			expand(&bp[1], exbuf, &exbuf[sizeof exbuf], e);
+			rwp->r_lhs = prescan(exbuf, '\t', pvpbuf,
+					     sizeof pvpbuf, NULL);
+			nfuzzy = 0;
+			if (rwp->r_lhs != NULL)
+			{
+				register char **ap;
+
+				rwp->r_lhs = copyplist(rwp->r_lhs, TRUE);
+
+				/* count the number of fuzzy matches in LHS */
+				for (ap = rwp->r_lhs; *ap != NULL; ap++)
+				{
+					char *botch;
+
+					botch = NULL;
+					switch (**ap & 0377)
+					{
+					  case MATCHZANY:
+					  case MATCHANY:
+					  case MATCHONE:
+					  case MATCHCLASS:
+					  case MATCHNCLASS:
+						nfuzzy++;
+						break;
+
+					  case MATCHREPL:
+						botch = "$0-$9";
+						break;
+
+					  case CANONNET:
+						botch = "$#";
+						break;
+
+					  case CANONUSER:
+						botch = "$:";
+						break;
+
+					  case CALLSUBR:
+						botch = "$>";
+						break;
+
+					  case CONDIF:
+						botch = "$?";
+						break;
+
+					  case CONDELSE:
+						botch = "$|";
+						break;
+
+					  case CONDFI:
+						botch = "$.";
+						break;
+
+					  case HOSTBEGIN:
+						botch = "$[";
+						break;
+
+					  case HOSTEND:
+						botch = "$]";
+						break;
+
+					  case LOOKUPBEGIN:
+						botch = "$(";
+						break;
+
+					  case LOOKUPEND:
+						botch = "$)";
+						break;
+					}
+					if (botch != NULL)
+						syserr("Inappropriate use of %s on LHS",
+							botch);
+				}
+			}
+			else
+				syserr("R line: null LHS");
+
+			/* expand and save the RHS */
+			while (*++p == '\t')
+				continue;
+			q = p;
+			while (*p != '\0' && *p != '\t')
+				p++;
+			*p = '\0';
+			expand(q, exbuf, &exbuf[sizeof exbuf], e);
+			rwp->r_rhs = prescan(exbuf, '\t', pvpbuf,
+					     sizeof pvpbuf, NULL);
+			if (rwp->r_rhs != NULL)
+			{
+				register char **ap;
+
+				rwp->r_rhs = copyplist(rwp->r_rhs, TRUE);
+
+				/* check no out-of-bounds replacements */
+				nfuzzy += '0';
+				for (ap = rwp->r_rhs; *ap != NULL; ap++)
+				{
+					char *botch;
+
+					botch = NULL;
+					switch (**ap & 0377)
+					{
+					  case MATCHREPL:
+						if ((*ap)[1] <= '0' || (*ap)[1] > nfuzzy)
+						{
+							syserr("replacement $%c out of bounds",
+								(*ap)[1]);
+						}
+						break;
+
+					  case MATCHZANY:
+						botch = "$*";
+						break;
+
+					  case MATCHANY:
+						botch = "$+";
+						break;
+
+					  case MATCHONE:
+						botch = "$-";
+						break;
+
+					  case MATCHCLASS:
+						botch = "$=";
+						break;
+
+					  case MATCHNCLASS:
+						botch = "$~";
+						break;
+					}
+					if (botch != NULL)
+						syserr("Inappropriate use of %s on RHS",
+							botch);
+				}
+			}
+			else
+				syserr("R line: null RHS");
+			break;
+
+		  case 'S':		/* select rewriting set */
+			for (p = &bp[1]; isascii(*p) && isspace(*p); p++)
+				continue;
+			if (!isascii(*p) || !isdigit(*p))
+			{
+				syserr("invalid argument to S line: \"%.20s\"", 
+					&bp[1]);
+				break;
+			}
+			ruleset = atoi(p);
+			if (ruleset >= MAXRWSETS || ruleset < 0)
+			{
+				syserr("bad ruleset %d (%d max)", ruleset, MAXRWSETS);
+				ruleset = 0;
+			}
+			rwp = NULL;
+			break;
+
+		  case 'D':		/* macro definition */
+			p = munchstring(&bp[2], NULL);
+			define(bp[1], newstr(p), e);
+			break;
+
+		  case 'H':		/* required header line */
+			(void) chompheader(&bp[1], TRUE, e);
+			break;
+
+		  case 'C':		/* word class */
+			/* scan the list of words and set class for all */
+			expand(&bp[2], exbuf, &exbuf[sizeof exbuf], e);
+			for (p = exbuf; *p != '\0'; )
+			{
+				register char *wd;
+				char delim;
+
+				while (*p != '\0' && isascii(*p) && isspace(*p))
+					p++;
+				wd = p;
+				while (*p != '\0' && !(isascii(*p) && isspace(*p)))
+					p++;
+				delim = *p;
+				*p = '\0';
+				if (wd[0] != '\0')
+					setclass(bp[1], wd);
+				*p = delim;
+			}
+			break;
+
+		  case 'F':		/* word class from file */
+			for (p = &bp[2]; isascii(*p) && isspace(*p); )
+				p++;
+			if (p[0] == '-' && p[1] == 'o')
+			{
+				optional = TRUE;
+				while (*p != '\0' && !(isascii(*p) && isspace(*p)))
+					p++;
+				while (isascii(*p) && isspace(*p))
+					*p++;
+			}
+			else
+				optional = FALSE;
+			file = p;
+			while (*p != '\0' && !(isascii(*p) && isspace(*p)))
+				p++;
+			if (*p == '\0')
+				p = "%s";
+			else
+			{
+				*p = '\0';
+				while (isascii(*++p) && isspace(*p))
+					continue;
+			}
+			fileclass(bp[1], file, p, safe, optional);
+			break;
+
+#ifdef XLA
+		  case 'L':		/* extended load average description */
+			xla_init(&bp[1]);
+			break;
+#endif
+
+		  case 'M':		/* define mailer */
+			makemailer(&bp[1]);
+			break;
+
+		  case 'O':		/* set option */
+			setoption(bp[1], &bp[2], safe, FALSE, e);
+			break;
+
+		  case 'P':		/* set precedence */
+			if (NumPriorities >= MAXPRIORITIES)
+			{
+				toomany('P', MAXPRIORITIES);
+				break;
+			}
+			for (p = &bp[1]; *p != '\0' && *p != '=' && *p != '\t'; p++)
+				continue;
+			if (*p == '\0')
+				goto badline;
+			*p = '\0';
+			Priorities[NumPriorities].pri_name = newstr(&bp[1]);
+			Priorities[NumPriorities].pri_val = atoi(++p);
+			NumPriorities++;
+			break;
+
+		  case 'T':		/* trusted user(s) */
+			/* this option is obsolete, but will be ignored */
+			break;
+
+		  case 'V':		/* configuration syntax version */
+			for (p = &bp[1]; isascii(*p) && isspace(*p); p++)
+				continue;
+			if (!isascii(*p) || !isdigit(*p))
+			{
+				syserr("invalid argument to V line: \"%.20s\"", 
+					&bp[1]);
+				break;
+			}
+			ConfigLevel = strtol(p, &ep, 10);
+			if (ConfigLevel >= 5)
+			{
+				/* level 5 configs have short name in $w */
+				p = macvalue('w', e);
+				if (p != NULL && (p = strchr(p, '.')) != NULL)
+					*p = '\0';
+			}
+			if (*ep++ == '/')
+			{
+				/* extract vendor code */
+				for (p = ep; isascii(*p) && isalpha(*p); )
+					p++;
+				*p = '\0';
+
+				if (!setvendor(ep))
+					syserr("invalid V line vendor code: \"%s\"",
+						ep);
+			}
+			break;
+
+		  case 'K':
+			makemapentry(&bp[1]);
+			break;
+
+		  default:
+		  badline:
+			syserr("unknown control line \"%s\"", bp);
+		}
+		if (bp != buf)
+			free(bp);
+	}
+	if (ferror(cf))
+	{
+		syserr("I/O read error", cfname);
+		exit(EX_OSFILE);
+	}
+	fclose(cf);
+	FileName = NULL;
+
+	if (stab("host", ST_MAP, ST_FIND) == NULL)
+	{
+		/* user didn't initialize: set up host map */
+		strcpy(buf, "host host");
+#if NAMED_BIND
+		if (ConfigLevel >= 2)
+			strcat(buf, " -a.");
+#endif
+		makemapentry(buf);
+	}
+}
+/*
+**  TOOMANY -- signal too many of some option
+**
+**	Parameters:
+**		id -- the id of the error line
+**		maxcnt -- the maximum possible values
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		gives a syserr.
+*/
+
+toomany(id, maxcnt)
+	char id;
+	int maxcnt;
+{
+	syserr("too many %c lines, %d max", id, maxcnt);
+}
+/*
+**  FILECLASS -- read members of a class from a file
+**
+**	Parameters:
+**		class -- class to define.
+**		filename -- name of file to read.
+**		fmt -- scanf string to use for match.
+**		safe -- if set, this is a safe read.
+**		optional -- if set, it is not an error for the file to
+**			not exist.
+**
+**	Returns:
+**		none
+**
+**	Side Effects:
+**
+**		puts all lines in filename that match a scanf into
+**			the named class.
+*/
+
+fileclass(class, filename, fmt, safe, optional)
+	int class;
+	char *filename;
+	char *fmt;
+	bool safe;
+	bool optional;
+{
+	FILE *f;
+	struct stat stbuf;
+	char buf[MAXLINE];
+
+	if (tTd(37, 2))
+		printf("fileclass(%s, fmt=%s)\n", filename, fmt);
+
+	if (filename[0] == '|')
+	{
+		syserr("fileclass: pipes (F%c%s) not supported due to security problems",
+			class, filename);
+		return;
+	}
+	if (stat(filename, &stbuf) < 0)
+	{
+		if (tTd(37, 2))
+			printf("  cannot stat (%s)\n", errstring(errno));
+		if (!optional)
+			syserr("fileclass: cannot stat %s", filename);
+		return;
+	}
+	if (!S_ISREG(stbuf.st_mode))
+	{
+		syserr("fileclass: %s not a regular file", filename);
+		return;
+	}
+	if (!safe && access(filename, R_OK) < 0)
+	{
+		syserr("fileclass: access denied on %s", filename);
+		return;
+	}
+	f = fopen(filename, "r");
+	if (f == NULL)
+	{
+		syserr("fileclass: cannot open %s", filename);
+		return;
+	}
+
+	while (fgets(buf, sizeof buf, f) != NULL)
+	{
+		register STAB *s;
+		register char *p;
+# ifdef SCANF
+		char wordbuf[MAXNAME+1];
+
+		if (sscanf(buf, fmt, wordbuf) != 1)
+			continue;
+		p = wordbuf;
+# else /* SCANF */
+		p = buf;
+# endif /* SCANF */
+
+		/*
+		**  Break up the match into words.
+		*/
+
+		while (*p != '\0')
+		{
+			register char *q;
+
+			/* strip leading spaces */
+			while (isascii(*p) && isspace(*p))
+				p++;
+			if (*p == '\0')
+				break;
+
+			/* find the end of the word */
+			q = p;
+			while (*p != '\0' && !(isascii(*p) && isspace(*p)))
+				p++;
+			if (*p != '\0')
+				*p++ = '\0';
+
+			/* enter the word in the symbol table */
+			setclass(class, q);
+		}
+	}
+
+	(void) fclose(f);
+}
+/*
+**  MAKEMAILER -- define a new mailer.
+**
+**	Parameters:
+**		line -- description of mailer.  This is in labeled
+**			fields.  The fields are:
+**			   P -- the path to the mailer
+**			   F -- the flags associated with the mailer
+**			   A -- the argv for this mailer
+**			   S -- the sender rewriting set
+**			   R -- the recipient rewriting set
+**			   E -- the eol string
+**			The first word is the canonical name of the mailer.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		enters the mailer into the mailer table.
+*/
+
+makemailer(line)
+	char *line;
+{
+	register char *p;
+	register struct mailer *m;
+	register STAB *s;
+	int i;
+	char fcode;
+	auto char *endp;
+	extern int NextMailer;
+	extern char **makeargv();
+	extern char *munchstring();
+	extern long atol();
+
+	/* allocate a mailer and set up defaults */
+	m = (struct mailer *) xalloc(sizeof *m);
+	bzero((char *) m, sizeof *m);
+	m->m_eol = "\n";
+
+	/* collect the mailer name */
+	for (p = line; *p != '\0' && *p != ',' && !(isascii(*p) && isspace(*p)); p++)
+		continue;
+	if (*p != '\0')
+		*p++ = '\0';
+	m->m_name = newstr(line);
+
+	/* now scan through and assign info from the fields */
+	while (*p != '\0')
+	{
+		auto char *delimptr;
+
+		while (*p != '\0' && (*p == ',' || (isascii(*p) && isspace(*p))))
+			p++;
+
+		/* p now points to field code */
+		fcode = *p;
+		while (*p != '\0' && *p != '=' && *p != ',')
+			p++;
+		if (*p++ != '=')
+		{
+			syserr("mailer %s: `=' expected", m->m_name);
+			return;
+		}
+		while (isascii(*p) && isspace(*p))
+			p++;
+
+		/* p now points to the field body */
+		p = munchstring(p, &delimptr);
+
+		/* install the field into the mailer struct */
+		switch (fcode)
+		{
+		  case 'P':		/* pathname */
+			m->m_mailer = newstr(p);
+			break;
+
+		  case 'F':		/* flags */
+			for (; *p != '\0'; p++)
+				if (!(isascii(*p) && isspace(*p)))
+					setbitn(*p, m->m_flags);
+			break;
+
+		  case 'S':		/* sender rewriting ruleset */
+		  case 'R':		/* recipient rewriting ruleset */
+			i = strtol(p, &endp, 10);
+			if (i < 0 || i >= MAXRWSETS)
+			{
+				syserr("invalid rewrite set, %d max", MAXRWSETS);
+				return;
+			}
+			if (fcode == 'S')
+				m->m_sh_rwset = m->m_se_rwset = i;
+			else
+				m->m_rh_rwset = m->m_re_rwset = i;
+
+			p = endp;
+			if (*p++ == '/')
+			{
+				i = strtol(p, NULL, 10);
+				if (i < 0 || i >= MAXRWSETS)
+				{
+					syserr("invalid rewrite set, %d max",
+						MAXRWSETS);
+					return;
+				}
+				if (fcode == 'S')
+					m->m_sh_rwset = i;
+				else
+					m->m_rh_rwset = i;
+			}
+			break;
+
+		  case 'E':		/* end of line string */
+			m->m_eol = newstr(p);
+			break;
+
+		  case 'A':		/* argument vector */
+			m->m_argv = makeargv(p);
+			break;
+
+		  case 'M':		/* maximum message size */
+			m->m_maxsize = atol(p);
+			break;
+
+		  case 'L':		/* maximum line length */
+			m->m_linelimit = atoi(p);
+			break;
+
+		  case 'D':		/* working directory */
+			m->m_execdir = newstr(p);
+			break;
+		}
+
+		p = delimptr;
+	}
+
+	/* do some heuristic cleanup for back compatibility */
+	if (bitnset(M_LIMITS, m->m_flags))
+	{
+		if (m->m_linelimit == 0)
+			m->m_linelimit = SMTPLINELIM;
+		if (ConfigLevel < 2)
+			setbitn(M_7BITS, m->m_flags);
+	}
+
+	/* do some rationality checking */
+	if (m->m_argv == NULL)
+	{
+		syserr("M%s: A= argument required", m->m_name);
+		return;
+	}
+	if (m->m_mailer == NULL)
+	{
+		syserr("M%s: P= argument required", m->m_name);
+		return;
+	}
+
+	if (NextMailer >= MAXMAILERS)
+	{
+		syserr("too many mailers defined (%d max)", MAXMAILERS);
+		return;
+	}
+
+	s = stab(m->m_name, ST_MAILER, ST_ENTER);
+	if (s->s_mailer != NULL)
+	{
+		i = s->s_mailer->m_mno;
+		free(s->s_mailer);
+	}
+	else
+	{
+		i = NextMailer++;
+	}
+	Mailer[i] = s->s_mailer = m;
+	m->m_mno = i;
+}
+/*
+**  MUNCHSTRING -- translate a string into internal form.
+**
+**	Parameters:
+**		p -- the string to munch.
+**		delimptr -- if non-NULL, set to the pointer of the
+**			field delimiter character.
+**
+**	Returns:
+**		the munched string.
+*/
+
+char *
+munchstring(p, delimptr)
+	register char *p;
+	char **delimptr;
+{
+	register char *q;
+	bool backslash = FALSE;
+	bool quotemode = FALSE;
+	static char buf[MAXLINE];
+
+	for (q = buf; *p != '\0'; p++)
+	{
+		if (backslash)
+		{
+			/* everything is roughly literal */
+			backslash = FALSE;
+			switch (*p)
+			{
+			  case 'r':		/* carriage return */
+				*q++ = '\r';
+				continue;
+
+			  case 'n':		/* newline */
+				*q++ = '\n';
+				continue;
+
+			  case 'f':		/* form feed */
+				*q++ = '\f';
+				continue;
+
+			  case 'b':		/* backspace */
+				*q++ = '\b';
+				continue;
+			}
+			*q++ = *p;
+		}
+		else
+		{
+			if (*p == '\\')
+				backslash = TRUE;
+			else if (*p == '"')
+				quotemode = !quotemode;
+			else if (quotemode || *p != ',')
+				*q++ = *p;
+			else
+				break;
+		}
+	}
+
+	if (delimptr != NULL)
+		*delimptr = p;
+	*q++ = '\0';
+	return (buf);
+}
+/*
+**  MAKEARGV -- break up a string into words
+**
+**	Parameters:
+**		p -- the string to break up.
+**
+**	Returns:
+**		a char **argv (dynamically allocated)
+**
+**	Side Effects:
+**		munges p.
+*/
+
+char **
+makeargv(p)
+	register char *p;
+{
+	char *q;
+	int i;
+	char **avp;
+	char *argv[MAXPV + 1];
+
+	/* take apart the words */
+	i = 0;
+	while (*p != '\0' && i < MAXPV)
+	{
+		q = p;
+		while (*p != '\0' && !(isascii(*p) && isspace(*p)))
+			p++;
+		while (isascii(*p) && isspace(*p))
+			*p++ = '\0';
+		argv[i++] = newstr(q);
+	}
+	argv[i++] = NULL;
+
+	/* now make a copy of the argv */
+	avp = (char **) xalloc(sizeof *avp * i);
+	bcopy((char *) argv, (char *) avp, sizeof *avp * i);
+
+	return (avp);
+}
+/*
+**  PRINTRULES -- print rewrite rules (for debugging)
+**
+**	Parameters:
+**		none.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		prints rewrite rules.
+*/
+
+printrules()
+{
+	register struct rewrite *rwp;
+	register int ruleset;
+
+	for (ruleset = 0; ruleset < 10; ruleset++)
+	{
+		if (RewriteRules[ruleset] == NULL)
+			continue;
+		printf("\n----Rule Set %d:", ruleset);
+
+		for (rwp = RewriteRules[ruleset]; rwp != NULL; rwp = rwp->r_next)
+		{
+			printf("\nLHS:");
+			printav(rwp->r_lhs);
+			printf("RHS:");
+			printav(rwp->r_rhs);
+		}
+	}
+}
+
+/*
+**  SETOPTION -- set global processing option
+**
+**	Parameters:
+**		opt -- option name.
+**		val -- option value (as a text string).
+**		safe -- set if this came from a configuration file.
+**			Some options (if set from the command line) will
+**			reset the user id to avoid security problems.
+**		sticky -- if set, don't let other setoptions override
+**			this value.
+**		e -- the main envelope.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		Sets options as implied by the arguments.
+*/
+
+static BITMAP	StickyOpt;		/* set if option is stuck */
+
+
+#if NAMED_BIND
+
+struct resolverflags
+{
+	char	*rf_name;	/* name of the flag */
+	long	rf_bits;	/* bits to set/clear */
+} ResolverFlags[] =
+{
+	"debug",	RES_DEBUG,
+	"aaonly",	RES_AAONLY,
+	"usevc",	RES_USEVC,
+	"primary",	RES_PRIMARY,
+	"igntc",	RES_IGNTC,
+	"recurse",	RES_RECURSE,
+	"defnames",	RES_DEFNAMES,
+	"stayopen",	RES_STAYOPEN,
+	"dnsrch",	RES_DNSRCH,
+	"true",		0,		/* to avoid error on old syntax */
+	NULL,		0
+};
+
+#endif
+
+setoption(opt, val, safe, sticky, e)
+	char opt;
+	char *val;
+	bool safe;
+	bool sticky;
+	register ENVELOPE *e;
+{
+	register char *p;
+	extern bool atobool();
+	extern time_t convtime();
+	extern int QueueLA;
+	extern int RefuseLA;
+	extern bool Warn_Q_option;
+	extern bool trusteduser();
+
+	if (tTd(37, 1))
+		printf("setoption %c=%s", opt, val);
+
+	/*
+	**  See if this option is preset for us.
+	*/
+
+	if (!sticky && bitnset(opt, StickyOpt))
+	{
+		if (tTd(37, 1))
+			printf(" (ignored)\n");
+		return;
+	}
+
+	/*
+	**  Check to see if this option can be specified by this user.
+	*/
+
+	if (!safe && RealUid == 0)
+		safe = TRUE;
+	if (!safe && strchr("bCdeijLmoprsvw7", opt) == NULL)
+	{
+		if (opt != 'M' || (val[0] != 'r' && val[0] != 's'))
+		{
+			if (tTd(37, 1))
+				printf(" (unsafe)");
+			if (RealUid != geteuid())
+			{
+				if (tTd(37, 1))
+					printf("(Resetting uid)");
+				(void) setgid(RealGid);
+				(void) setuid(RealUid);
+			}
+		}
+	}
+	if (tTd(37, 1))
+		printf("\n");
+
+	switch (opt)
+	{
+	  case '7':		/* force seven-bit input */
+		SevenBit = atobool(val);
+		break;
+
+	  case 'A':		/* set default alias file */
+		if (val[0] == '\0')
+			setalias("aliases");
+		else
+			setalias(val);
+		break;
+
+	  case 'a':		/* look N minutes for "@:@" in alias file */
+		if (val[0] == '\0')
+			SafeAlias = 5 * 60;		/* five minutes */
+		else
+			SafeAlias = convtime(val, 'm');
+		break;
+
+	  case 'B':		/* substitution for blank character */
+		SpaceSub = val[0];
+		if (SpaceSub == '\0')
+			SpaceSub = ' ';
+		break;
+
+	  case 'b':		/* min blocks free on queue fs/max msg size */
+		p = strchr(val, '/');
+		if (p != NULL)
+		{
+			*p++ = '\0';
+			MaxMessageSize = atol(p);
+		}
+		MinBlocksFree = atol(val);
+		break;
+
+	  case 'c':		/* don't connect to "expensive" mailers */
+		NoConnect = atobool(val);
+		break;
+
+	  case 'C':		/* checkpoint every N addresses */
+		CheckpointInterval = atoi(val);
+		break;
+
+	  case 'd':		/* delivery mode */
+		switch (*val)
+		{
+		  case '\0':
+			e->e_sendmode = SM_DELIVER;
+			break;
+
+		  case SM_QUEUE:	/* queue only */
+#ifndef QUEUE
+			syserr("need QUEUE to set -odqueue");
+#endif /* QUEUE */
+			/* fall through..... */
+
+		  case SM_DELIVER:	/* do everything */
+		  case SM_FORK:		/* fork after verification */
+			e->e_sendmode = *val;
+			break;
+
+		  default:
+			syserr("Unknown delivery mode %c", *val);
+			exit(EX_USAGE);
+		}
+		break;
+
+	  case 'D':		/* rebuild alias database as needed */
+		AutoRebuild = atobool(val);
+		break;
+
+	  case 'E':		/* error message header/header file */
+		if (*val != '\0')
+			ErrMsgFile = newstr(val);
+		break;
+
+	  case 'e':		/* set error processing mode */
+		switch (*val)
+		{
+		  case EM_QUIET:	/* be silent about it */
+		  case EM_MAIL:		/* mail back */
+		  case EM_BERKNET:	/* do berknet error processing */
+		  case EM_WRITE:	/* write back (or mail) */
+			HoldErrs = TRUE;
+			/* fall through... */
+
+		  case EM_PRINT:	/* print errors normally (default) */
+			e->e_errormode = *val;
+			break;
+		}
+		break;
+
+	  case 'F':		/* file mode */
+		FileMode = atooct(val) & 0777;
+		break;
+
+	  case 'f':		/* save Unix-style From lines on front */
+		SaveFrom = atobool(val);
+		break;
+
+	  case 'G':		/* match recipients against GECOS field */
+		MatchGecos = atobool(val);
+		break;
+
+	  case 'g':		/* default gid */
+		if (isascii(*val) && isdigit(*val))
+			DefGid = atoi(val);
+		else
+		{
+			register struct group *gr;
+
+			DefGid = -1;
+			gr = getgrnam(val);
+			if (gr == NULL)
+				syserr("readcf: option g: unknown group %s", val);
+			else
+				DefGid = gr->gr_gid;
+		}
+		break;
+
+	  case 'H':		/* help file */
+		if (val[0] == '\0')
+			HelpFile = "sendmail.hf";
+		else
+			HelpFile = newstr(val);
+		break;
+
+	  case 'h':		/* maximum hop count */
+		MaxHopCount = atoi(val);
+		break;
+
+	  case 'I':		/* use internet domain name server */
+#if NAMED_BIND
+		UseNameServer = TRUE;
+		for (p = val; *p != 0; )
+		{
+			bool clearmode;
+			char *q;
+			struct resolverflags *rfp;
+
+			while (*p == ' ')
+				p++;
+			if (*p == '\0')
+				break;
+			clearmode = FALSE;
+			if (*p == '-')
+				clearmode = TRUE;
+			else if (*p != '+')
+				p--;
+			p++;
+			q = p;
+			while (*p != '\0' && !(isascii(*p) && isspace(*p)))
+				p++;
+			if (*p != '\0')
+				*p++ = '\0';
+			for (rfp = ResolverFlags; rfp->rf_name != NULL; rfp++)
+			{
+				if (strcasecmp(q, rfp->rf_name) == 0)
+					break;
+			}
+			if (rfp->rf_name == NULL)
+				syserr("readcf: I option value %s unrecognized", q);
+			else if (clearmode)
+				_res.options &= ~rfp->rf_bits;
+			else
+				_res.options |= rfp->rf_bits;
+		}
+		if (tTd(8, 2))
+			printf("_res.options = %x\n", _res.options);
+#else
+		usrerr("name server (I option) specified but BIND not compiled in");
+#endif
+		break;
+
+	  case 'i':		/* ignore dot lines in message */
+		IgnrDot = atobool(val);
+		break;
+
+	  case 'j':		/* send errors in MIME (RFC 1341) format */
+		SendMIMEErrors = atobool(val);
+		break;
+
+	  case 'J':		/* .forward search path */
+		ForwardPath = newstr(val);
+		break;
+
+	  case 'k':		/* connection cache size */
+		MaxMciCache = atoi(val);
+		if (MaxMciCache < 0)
+			MaxMciCache = 0;
+		break;
+
+	  case 'K':		/* connection cache timeout */
+		MciCacheTimeout = convtime(val, 'm');
+		break;
+
+	  case 'l':		/* use Errors-To: header */
+		UseErrorsTo = atobool(val);
+		break;
+
+	  case 'L':		/* log level */
+		if (safe || LogLevel < atoi(val))
+			LogLevel = atoi(val);
+		break;
+
+	  case 'M':		/* define macro */
+		p = newstr(&val[1]);
+		if (!safe)
+			cleanstrcpy(p, p, MAXNAME);
+		define(val[0], p, CurEnv);
+		sticky = FALSE;
+		break;
+
+	  case 'm':		/* send to me too */
+		MeToo = atobool(val);
+		break;
+
+	  case 'n':		/* validate RHS in newaliases */
+		CheckAliases = atobool(val);
+		break;
+
+	    /* 'N' available -- was "net name" */
+
+	  case 'O':		/* daemon options */
+		setdaemonoptions(val);
+		break;
+
+	  case 'o':		/* assume old style headers */
+		if (atobool(val))
+			CurEnv->e_flags |= EF_OLDSTYLE;
+		else
+			CurEnv->e_flags &= ~EF_OLDSTYLE;
+		break;
+
+	  case 'p':		/* select privacy level */
+		p = val;
+		for (;;)
+		{
+			register struct prival *pv;
+			extern struct prival PrivacyValues[];
+
+			while (isascii(*p) && (isspace(*p) || ispunct(*p)))
+				p++;
+			if (*p == '\0')
+				break;
+			val = p;
+			while (isascii(*p) && isalnum(*p))
+				p++;
+			if (*p != '\0')
+				*p++ = '\0';
+
+			for (pv = PrivacyValues; pv->pv_name != NULL; pv++)
+			{
+				if (strcasecmp(val, pv->pv_name) == 0)
+					break;
+			}
+			if (pv->pv_name == NULL)
+				syserr("readcf: Op line: %s unrecognized", val);
+			PrivacyFlags |= pv->pv_flag;
+		}
+		sticky = FALSE;
+		break;
+
+	  case 'P':		/* postmaster copy address for returned mail */
+		PostMasterCopy = newstr(val);
+		break;
+
+	  case 'q':		/* slope of queue only function */
+		QueueFactor = atoi(val);
+		break;
+
+	  case 'Q':		/* queue directory */
+		if (val[0] == '\0')
+			QueueDir = "mqueue";
+		else
+			QueueDir = newstr(val);
+		if (RealUid != 0 && !safe)
+			Warn_Q_option = TRUE;
+		break;
+
+	  case 'R':		/* don't prune routes */
+		DontPruneRoutes = atobool(val);
+		break;
+
+	  case 'r':		/* read timeout */
+		settimeouts(val);
+		break;
+
+	  case 'S':		/* status file */
+		if (val[0] == '\0')
+			StatFile = "sendmail.st";
+		else
+			StatFile = newstr(val);
+		break;
+
+	  case 's':		/* be super safe, even if expensive */
+		SuperSafe = atobool(val);
+		break;
+
+	  case 'T':		/* queue timeout */
+		p = strchr(val, '/');
+		if (p != NULL)
+		{
+			*p++ = '\0';
+			TimeOuts.to_q_warning = convtime(p, 'd');
+		}
+		TimeOuts.to_q_return = convtime(val, 'h');
+		break;
+
+	  case 't':		/* time zone name */
+		TimeZoneSpec = newstr(val);
+		break;
+
+	  case 'U':		/* location of user database */
+		UdbSpec = newstr(val);
+		break;
+
+	  case 'u':		/* set default uid */
+		if (isascii(*val) && isdigit(*val))
+			DefUid = atoi(val);
+		else
+		{
+			register struct passwd *pw;
+
+			DefUid = -1;
+			pw = getpwnam(val);
+			if (pw == NULL)
+				syserr("readcf: option u: unknown user %s", val);
+			else
+				DefUid = pw->pw_uid;
+		}
+		setdefuser();
+		break;
+
+	  case 'V':		/* fallback MX host */
+		FallBackMX = newstr(val);
+		break;
+
+	  case 'v':		/* run in verbose mode */
+		Verbose = atobool(val);
+		break;
+
+	  case 'w':		/* if we are best MX, try host directly */
+		TryNullMXList = atobool(val);
+		break;
+
+	    /* 'W' available -- was wizard password */
+
+	  case 'x':		/* load avg at which to auto-queue msgs */
+		QueueLA = atoi(val);
+		break;
+
+	  case 'X':		/* load avg at which to auto-reject connections */
+		RefuseLA = atoi(val);
+		break;
+
+	  case 'y':		/* work recipient factor */
+		WkRecipFact = atoi(val);
+		break;
+
+	  case 'Y':		/* fork jobs during queue runs */
+		ForkQueueRuns = atobool(val);
+		break;
+
+	  case 'z':		/* work message class factor */
+		WkClassFact = atoi(val);
+		break;
+
+	  case 'Z':		/* work time factor */
+		WkTimeFact = atoi(val);
+		break;
+
+	  default:
+		break;
+	}
+	if (sticky)
+		setbitn(opt, StickyOpt);
+	return;
+}
+/*
+**  SETCLASS -- set a word into a class
+**
+**	Parameters:
+**		class -- the class to put the word in.
+**		word -- the word to enter
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		puts the word into the symbol table.
+*/
+
+setclass(class, word)
+	int class;
+	char *word;
+{
+	register STAB *s;
+
+	if (tTd(37, 8))
+		printf("setclass(%c, %s)\n", class, word);
+	s = stab(word, ST_CLASS, ST_ENTER);
+	setbitn(class, s->s_class);
+}
+/*
+**  MAKEMAPENTRY -- create a map entry
+**
+**	Parameters:
+**		line -- the config file line
+**
+**	Returns:
+**		TRUE if it successfully entered the map entry.
+**		FALSE otherwise (usually syntax error).
+**
+**	Side Effects:
+**		Enters the map into the dictionary.
+*/
+
+void
+makemapentry(line)
+	char *line;
+{
+	register char *p;
+	char *mapname;
+	char *classname;
+	register STAB *s;
+	STAB *class;
+
+	for (p = line; isascii(*p) && isspace(*p); p++)
+		continue;
+	if (!(isascii(*p) && isalnum(*p)))
+	{
+		syserr("readcf: config K line: no map name");
+		return;
+	}
+
+	mapname = p;
+	while (isascii(*++p) && isalnum(*p))
+		continue;
+	if (*p != '\0')
+		*p++ = '\0';
+	while (isascii(*p) && isspace(*p))
+		p++;
+	if (!(isascii(*p) && isalnum(*p)))
+	{
+		syserr("readcf: config K line, map %s: no map class", mapname);
+		return;
+	}
+	classname = p;
+	while (isascii(*++p) && isalnum(*p))
+		continue;
+	if (*p != '\0')
+		*p++ = '\0';
+	while (isascii(*p) && isspace(*p))
+		p++;
+
+	/* look up the class */
+	class = stab(classname, ST_MAPCLASS, ST_FIND);
+	if (class == NULL)
+	{
+		syserr("readcf: map %s: class %s not available", mapname, classname);
+		return;
+	}
+
+	/* enter the map */
+	s = stab(mapname, ST_MAP, ST_ENTER);
+	s->s_map.map_class = &class->s_mapclass;
+	s->s_map.map_mname = newstr(mapname);
+
+	if (class->s_mapclass.map_parse(&s->s_map, p))
+		s->s_map.map_mflags |= MF_VALID;
+
+	if (tTd(37, 5))
+	{
+		printf("map %s, class %s, flags %x, file %s,\n",
+			s->s_map.map_mname, s->s_map.map_class->map_cname,
+			s->s_map.map_mflags,
+			s->s_map.map_file == NULL ? "(null)" : s->s_map.map_file);
+		printf("\tapp %s, domain %s, rebuild %s\n",
+			s->s_map.map_app == NULL ? "(null)" : s->s_map.map_app,
+			s->s_map.map_domain == NULL ? "(null)" : s->s_map.map_domain,
+			s->s_map.map_rebuild == NULL ? "(null)" : s->s_map.map_rebuild);
+	}
+}
+/*
+**  SETTIMEOUTS -- parse and set timeout values
+**
+**	Parameters:
+**		val -- a pointer to the values.  If NULL, do initial
+**			settings.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		Initializes the TimeOuts structure
+*/
+
+#define SECONDS
+#define MINUTES	* 60
+#define HOUR	* 3600
+
+settimeouts(val)
+	register char *val;
+{
+	register char *p;
+	extern time_t convtime();
+
+	if (val == NULL)
+	{
+		TimeOuts.to_initial = (time_t) 5 MINUTES;
+		TimeOuts.to_helo = (time_t) 5 MINUTES;
+		TimeOuts.to_mail = (time_t) 10 MINUTES;
+		TimeOuts.to_rcpt = (time_t) 1 HOUR;
+		TimeOuts.to_datainit = (time_t) 5 MINUTES;
+		TimeOuts.to_datablock = (time_t) 1 HOUR;
+		TimeOuts.to_datafinal = (time_t) 1 HOUR;
+		TimeOuts.to_rset = (time_t) 5 MINUTES;
+		TimeOuts.to_quit = (time_t) 2 MINUTES;
+		TimeOuts.to_nextcommand = (time_t) 1 HOUR;
+		TimeOuts.to_miscshort = (time_t) 2 MINUTES;
+		TimeOuts.to_ident = (time_t) 30 SECONDS;
+		return;
+	}
+
+	for (;; val = p)
+	{
+		while (isascii(*val) && isspace(*val))
+			val++;
+		if (*val == '\0')
+			break;
+		for (p = val; *p != '\0' && *p != ','; p++)
+			continue;
+		if (*p != '\0')
+			*p++ = '\0';
+
+		if (isascii(*val) && isdigit(*val))
+		{
+			/* old syntax -- set everything */
+			TimeOuts.to_mail = convtime(val, 'm');
+			TimeOuts.to_rcpt = TimeOuts.to_mail;
+			TimeOuts.to_datainit = TimeOuts.to_mail;
+			TimeOuts.to_datablock = TimeOuts.to_mail;
+			TimeOuts.to_datafinal = TimeOuts.to_mail;
+			TimeOuts.to_nextcommand = TimeOuts.to_mail;
+			continue;
+		}
+		else
+		{
+			register char *q = strchr(val, '=');
+			time_t to;
+
+			if (q == NULL)
+			{
+				/* syntax error */
+				continue;
+			}
+			*q++ = '\0';
+			to = convtime(q, 'm');
+
+			if (strcasecmp(val, "initial") == 0)
+				TimeOuts.to_initial = to;
+			else if (strcasecmp(val, "mail") == 0)
+				TimeOuts.to_mail = to;
+			else if (strcasecmp(val, "rcpt") == 0)
+				TimeOuts.to_rcpt = to;
+			else if (strcasecmp(val, "datainit") == 0)
+				TimeOuts.to_datainit = to;
+			else if (strcasecmp(val, "datablock") == 0)
+				TimeOuts.to_datablock = to;
+			else if (strcasecmp(val, "datafinal") == 0)
+				TimeOuts.to_datafinal = to;
+			else if (strcasecmp(val, "command") == 0)
+				TimeOuts.to_nextcommand = to;
+			else if (strcasecmp(val, "rset") == 0)
+				TimeOuts.to_rset = to;
+			else if (strcasecmp(val, "helo") == 0)
+				TimeOuts.to_helo = to;
+			else if (strcasecmp(val, "quit") == 0)
+				TimeOuts.to_quit = to;
+			else if (strcasecmp(val, "misc") == 0)
+				TimeOuts.to_miscshort = to;
+			else if (strcasecmp(val, "ident") == 0)
+				TimeOuts.to_ident = to;
+			else
+				syserr("settimeouts: invalid timeout %s", val);
+		}
+	}
+}
diff --git a/usr.sbin/sendmail/src/recipient.c b/usr.sbin/sendmail/src/recipient.c
new file mode 100644
index 00000000000..a43cf5c93df
--- /dev/null
+++ b/usr.sbin/sendmail/src/recipient.c
@@ -0,0 +1,1072 @@
+/*
+ * Copyright (c) 1983 Eric P. Allman
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)recipient.c	8.44.1.6 (Berkeley) 3/5/95";
+#endif /* not lint */
+
+# include "sendmail.h"
+# include <pwd.h>
+
+/*
+**  SENDTOLIST -- Designate a send list.
+**
+**	The parameter is a comma-separated list of people to send to.
+**	This routine arranges to send to all of them.
+**
+**	Parameters:
+**		list -- the send list.
+**		ctladdr -- the address template for the person to
+**			send to -- effective uid/gid are important.
+**			This is typically the alias that caused this
+**			expansion.
+**		sendq -- a pointer to the head of a queue to put
+**			these people into.
+**		e -- the envelope in which to add these recipients.
+**
+**	Returns:
+**		The number of addresses actually on the list.
+**
+**	Side Effects:
+**		none.
+*/
+
+# define MAXRCRSN	10
+
+sendtolist(list, ctladdr, sendq, e)
+	char *list;
+	ADDRESS *ctladdr;
+	ADDRESS **sendq;
+	register ENVELOPE *e;
+{
+	register char *p;
+	register ADDRESS *al;	/* list of addresses to send to */
+	bool firstone;		/* set on first address sent */
+	char delimiter;		/* the address delimiter */
+	int naddrs;
+	int i;
+	char *oldto = e->e_to;
+	char *bufp;
+	char buf[MAXNAME + 1];
+
+	if (list == NULL)
+	{
+		syserr("sendtolist: null list");
+		return 0;
+	}
+
+	if (tTd(25, 1))
+	{
+		printf("sendto: %s\n   ctladdr=", list);
+		printaddr(ctladdr, FALSE);
+	}
+
+	/* heuristic to determine old versus new style addresses */
+	if (ctladdr == NULL &&
+	    (strchr(list, ',') != NULL || strchr(list, ';') != NULL ||
+	     strchr(list, '<') != NULL || strchr(list, '(') != NULL))
+		e->e_flags &= ~EF_OLDSTYLE;
+	delimiter = ' ';
+	if (!bitset(EF_OLDSTYLE, e->e_flags) || ctladdr != NULL)
+		delimiter = ',';
+
+	firstone = TRUE;
+	al = NULL;
+	naddrs = 0;
+
+	/* make sure we have enough space to copy the string */
+	i = strlen(list) + 1;
+	if (i <= sizeof buf)
+		bufp = buf;
+	else
+		bufp = xalloc(i);
+	strcpy(bufp, denlstring(list, FALSE, TRUE));
+
+	for (p = bufp; *p != '\0'; )
+	{
+		auto char *delimptr;
+		register ADDRESS *a;
+
+		/* parse the address */
+		while ((isascii(*p) && isspace(*p)) || *p == ',')
+			p++;
+		a = parseaddr(p, NULLADDR, RF_COPYALL, delimiter, &delimptr, e);
+		p = delimptr;
+		if (a == NULL)
+			continue;
+		a->q_next = al;
+		a->q_alias = ctladdr;
+
+		/* see if this should be marked as a primary address */
+		if (ctladdr == NULL ||
+		    (firstone && *p == '\0' && bitset(QPRIMARY, ctladdr->q_flags)))
+			a->q_flags |= QPRIMARY;
+
+		if (ctladdr != NULL && sameaddr(ctladdr, a))
+			ctladdr->q_flags |= QSELFREF;
+		al = a;
+		firstone = FALSE;
+	}
+
+	/* arrange to send to everyone on the local send list */
+	while (al != NULL)
+	{
+		register ADDRESS *a = al;
+
+		al = a->q_next;
+		a = recipient(a, sendq, e);
+
+		/* arrange to inherit full name */
+		if (a->q_fullname == NULL && ctladdr != NULL)
+			a->q_fullname = ctladdr->q_fullname;
+		naddrs++;
+	}
+
+	e->e_to = oldto;
+	if (bufp != buf)
+		free(bufp);
+	return (naddrs);
+}
+/*
+**  RECIPIENT -- Designate a message recipient
+**
+**	Saves the named person for future mailing.
+**
+**	Parameters:
+**		a -- the (preparsed) address header for the recipient.
+**		sendq -- a pointer to the head of a queue to put the
+**			recipient in.  Duplicate supression is done
+**			in this queue.
+**		e -- the current envelope.
+**
+**	Returns:
+**		The actual address in the queue.  This will be "a" if
+**		the address is not a duplicate, else the original address.
+**
+**	Side Effects:
+**		none.
+*/
+
+ADDRESS *
+recipient(a, sendq, e)
+	register ADDRESS *a;
+	register ADDRESS **sendq;
+	register ENVELOPE *e;
+{
+	register ADDRESS *q;
+	ADDRESS **pq;
+	register struct mailer *m;
+	register char *p;
+	bool quoted = FALSE;		/* set if the addr has a quote bit */
+	int findusercount = 0;
+	char buf[MAXNAME];		/* unquoted image of the user name */
+	extern int safefile();
+
+	e->e_to = a->q_paddr;
+	m = a->q_mailer;
+	errno = 0;
+	if (tTd(26, 1))
+	{
+		printf("\nrecipient: ");
+		printaddr(a, FALSE);
+	}
+
+	/* if this is primary, add it to the original recipient list */
+	if (a->q_alias == NULL)
+	{
+		if (e->e_origrcpt == NULL)
+			e->e_origrcpt = a->q_paddr;
+		else if (e->e_origrcpt != a->q_paddr)
+			e->e_origrcpt = "";
+	}
+
+	/* break aliasing loops */
+	if (AliasLevel > MAXRCRSN)
+	{
+		usrerr("554 aliasing/forwarding loop broken");
+		return (a);
+	}
+
+	/*
+	**  Finish setting up address structure.
+	*/
+
+	/* set the queue timeout */
+	a->q_timeout = TimeOuts.to_q_return;
+
+	/* get unquoted user for file, program or user.name check */
+	(void) strcpy(buf, a->q_user);
+	for (p = buf; *p != '\0' && !quoted; p++)
+	{
+		if (*p == '\\')
+			quoted = TRUE;
+	}
+	stripquotes(buf);
+
+	/* check for direct mailing to restricted mailers */
+	if (m == ProgMailer)
+	{
+		if (a->q_alias == NULL)
+		{
+			a->q_flags |= QBADADDR;
+			usrerr("550 Cannot mail directly to programs");
+		}
+		else if (bitset(QBOGUSSHELL, a->q_alias->q_flags))
+		{
+			a->q_flags |= QBADADDR;
+			usrerr("550 User %s@%s doesn't have a valid shell for mailing to programs",
+				a->q_alias->q_ruser, MyHostName);
+		}
+		else if (bitset(QUNSAFEADDR, a->q_alias->q_flags))
+		{
+			a->q_flags |= QBADADDR;
+			usrerr("550 Address %s is unsafe for mailing to programs",
+				a->q_alias->q_paddr);
+		}
+	}
+
+	/*
+	**  Look up this person in the recipient list.
+	**	If they are there already, return, otherwise continue.
+	**	If the list is empty, just add it.  Notice the cute
+	**	hack to make from addresses suppress things correctly:
+	**	the QDONTSEND bit will be set in the send list.
+	**	[Please note: the emphasis is on "hack."]
+	*/
+
+	for (pq = sendq; (q = *pq) != NULL; pq = &q->q_next)
+	{
+		if (sameaddr(q, a))
+		{
+			if (tTd(26, 1))
+			{
+				printf("%s in sendq: ", a->q_paddr);
+				printaddr(q, FALSE);
+			}
+			if (!bitset(QPRIMARY, q->q_flags))
+			{
+				if (!bitset(QDONTSEND, a->q_flags))
+					message("duplicate suppressed");
+				q->q_flags |= a->q_flags;
+			}
+			else if (bitset(QSELFREF, q->q_flags))
+				q->q_flags |= a->q_flags & ~QDONTSEND;
+			a = q;
+			goto testselfdestruct;
+		}
+	}
+
+	/* add address on list */
+	*pq = a;
+	a->q_next = NULL;
+
+	/*
+	**  Alias the name and handle special mailer types.
+	*/
+
+  trylocaluser:
+	if (tTd(29, 7))
+		printf("at trylocaluser %s\n", a->q_user);
+
+	if (bitset(QDONTSEND|QBADADDR|QVERIFIED, a->q_flags))
+		goto testselfdestruct;
+
+	if (m == InclMailer)
+	{
+		a->q_flags |= QDONTSEND;
+		if (a->q_alias == NULL)
+		{
+			a->q_flags |= QBADADDR;
+			usrerr("550 Cannot mail directly to :include:s");
+		}
+		else
+		{
+			int ret;
+
+			message("including file %s", a->q_user);
+			ret = include(a->q_user, FALSE, a, sendq, e);
+			if (transienterror(ret))
+			{
+#ifdef LOG
+				if (LogLevel > 2)
+					syslog(LOG_ERR, "%s: include %s: transient error: %s",
+						e->e_id == NULL ? "NOQUEUE" : e->e_id,
+						a->q_user, errstring(ret));
+#endif
+				a->q_flags |= QQUEUEUP;
+				a->q_flags &= ~QDONTSEND;
+				usrerr("451 Cannot open %s: %s",
+					a->q_user, errstring(ret));
+			}
+			else if (ret != 0)
+			{
+				a->q_flags |= QBADADDR;
+				usrerr("550 Cannot open %s: %s",
+					a->q_user, errstring(ret));
+			}
+		}
+	}
+	else if (m == FileMailer)
+	{
+		extern bool writable();
+
+		/* check if writable or creatable */
+		if (a->q_alias == NULL)
+		{
+			a->q_flags |= QBADADDR;
+			usrerr("550 Cannot mail directly to files");
+		}
+		else if (bitset(QBOGUSSHELL, a->q_alias->q_flags))
+		{
+			a->q_flags |= QBADADDR;
+			usrerr("550 User %s@%s doesn't have a valid shell for mailing to files",
+				a->q_alias->q_ruser, MyHostName);
+		}
+		else if (bitset(QUNSAFEADDR, a->q_alias->q_flags))
+		{
+			a->q_flags |= QBADADDR;
+			usrerr("550 Address %s is unsafe for mailing to files",
+				a->q_alias->q_paddr);
+		}
+		else if (!writable(buf, getctladdr(a), SFF_ANYFILE))
+		{
+			a->q_flags |= QBADADDR;
+			giveresponse(EX_CANTCREAT, m, NULL, a->q_alias, e);
+		}
+	}
+
+	if (m != LocalMailer)
+	{
+		if (!bitset(QDONTSEND, a->q_flags))
+			e->e_nrcpts++;
+		goto testselfdestruct;
+	}
+
+	/* try aliasing */
+	alias(a, sendq, e);
+
+# ifdef USERDB
+	/* if not aliased, look it up in the user database */
+	if (!bitset(QDONTSEND|QNOTREMOTE|QVERIFIED, a->q_flags))
+	{
+		extern int udbexpand();
+
+		if (udbexpand(a, sendq, e) == EX_TEMPFAIL)
+		{
+			a->q_flags |= QQUEUEUP;
+			if (e->e_message == NULL)
+				e->e_message = newstr("Deferred: user database error");
+# ifdef LOG
+			if (LogLevel > 8)
+				syslog(LOG_INFO, "%s: deferred: udbexpand: %s",
+					e->e_id == NULL ? "NOQUEUE" : e->e_id,
+					errstring(errno));
+# endif
+			message("queued (user database error): %s",
+				errstring(errno));
+			e->e_nrcpts++;
+			goto testselfdestruct;
+		}
+	}
+# endif
+
+	/* if it was an alias or a UDB expansion, just return now */
+	if (bitset(QDONTSEND|QQUEUEUP|QVERIFIED, a->q_flags))
+		goto testselfdestruct;
+
+	/*
+	**  If we have a level two config file, then pass the name through
+	**  Ruleset 5 before sending it off.  Ruleset 5 has the right
+	**  to send rewrite it to another mailer.  This gives us a hook
+	**  after local aliasing has been done.
+	*/
+
+	if (tTd(29, 5))
+	{
+		printf("recipient: testing local?  cl=%d, rr5=%x\n\t",
+			ConfigLevel, RewriteRules[5]);
+		printaddr(a, FALSE);
+	}
+	if (!bitset(QNOTREMOTE, a->q_flags) && ConfigLevel >= 2 &&
+	    RewriteRules[5] != NULL)
+	{
+		maplocaluser(a, sendq, e);
+	}
+
+	/*
+	**  If it didn't get rewritten to another mailer, go ahead
+	**  and deliver it.
+	*/
+
+	if (!bitset(QDONTSEND|QQUEUEUP, a->q_flags))
+	{
+		auto bool fuzzy;
+		register struct passwd *pw;
+		extern struct passwd *finduser();
+
+		/* warning -- finduser may trash buf */
+		pw = finduser(buf, &fuzzy);
+		if (pw == NULL)
+		{
+			a->q_flags |= QBADADDR;
+			giveresponse(EX_NOUSER, m, NULL, a->q_alias, e);
+		}
+		else
+		{
+			char nbuf[MAXNAME];
+
+			if (fuzzy)
+			{
+				/* name was a fuzzy match */
+				a->q_user = newstr(pw->pw_name);
+				if (findusercount++ > 3)
+				{
+					a->q_flags |= QBADADDR;
+					usrerr("554 aliasing/forwarding loop for %s broken",
+						pw->pw_name);
+					return (a);
+				}
+
+				/* see if it aliases */
+				(void) strcpy(buf, pw->pw_name);
+				goto trylocaluser;
+			}
+			if (strcmp(pw->pw_dir, "/") == 0)
+				a->q_home = "";
+			else
+				a->q_home = newstr(pw->pw_dir);
+			a->q_uid = pw->pw_uid;
+			a->q_gid = pw->pw_gid;
+			a->q_ruser = newstr(pw->pw_name);
+			a->q_flags |= QGOODUID;
+			buildfname(pw->pw_gecos, pw->pw_name, nbuf);
+			if (nbuf[0] != '\0')
+				a->q_fullname = newstr(nbuf);
+			if (pw->pw_shell != NULL && pw->pw_shell[0] != '\0' &&
+			    !usershellok(pw->pw_shell))
+			{
+				a->q_flags |= QBOGUSSHELL;
+			}
+			if (!quoted)
+				forward(a, sendq, e);
+		}
+	}
+	if (!bitset(QDONTSEND, a->q_flags))
+		e->e_nrcpts++;
+
+  testselfdestruct:
+	if (tTd(26, 8))
+	{
+		printf("testselfdestruct: ");
+		printaddr(a, TRUE);
+	}
+	if (a->q_alias == NULL && a != &e->e_from &&
+	    bitset(QDONTSEND, a->q_flags))
+	{
+		q = *sendq;
+		while (q != NULL && bitset(QDONTSEND, q->q_flags))
+			q = q->q_next;
+		if (q == NULL)
+		{
+			a->q_flags |= QBADADDR;
+			usrerr("554 aliasing/forwarding loop broken");
+		}
+	}
+	return (a);
+}
+/*
+**  FINDUSER -- find the password entry for a user.
+**
+**	This looks a lot like getpwnam, except that it may want to
+**	do some fancier pattern matching in /etc/passwd.
+**
+**	This routine contains most of the time of many sendmail runs.
+**	It deserves to be optimized.
+**
+**	Parameters:
+**		name -- the name to match against.
+**		fuzzyp -- an outarg that is set to TRUE if this entry
+**			was found using the fuzzy matching algorithm;
+**			set to FALSE otherwise.
+**
+**	Returns:
+**		A pointer to a pw struct.
+**		NULL if name is unknown or ambiguous.
+**
+**	Side Effects:
+**		may modify name.
+*/
+
+struct passwd *
+finduser(name, fuzzyp)
+	char *name;
+	bool *fuzzyp;
+{
+	register struct passwd *pw;
+	register char *p;
+	extern struct passwd *getpwent();
+	extern struct passwd *getpwnam();
+
+	if (tTd(29, 4))
+		printf("finduser(%s): ", name);
+
+	*fuzzyp = FALSE;
+
+	/* DEC Hesiod getpwnam accepts numeric strings -- short circuit it */
+	for (p = name; *p != '\0'; p++)
+		if (!isascii(*p) || !isdigit(*p))
+			break;
+	if (*p == '\0')
+	{
+		if (tTd(29, 4))
+			printf("failed (numeric input)\n");
+		return NULL;
+	}
+
+	/* look up this login name using fast path */
+	if ((pw = getpwnam(name)) != NULL)
+	{
+		if (tTd(29, 4))
+			printf("found (non-fuzzy)\n");
+		return (pw);
+	}
+
+#ifdef MATCHGECOS
+	/* see if fuzzy matching allowed */
+	if (!MatchGecos)
+	{
+		if (tTd(29, 4))
+			printf("not found (fuzzy disabled)\n");
+		return NULL;
+	}
+
+	/* search for a matching full name instead */
+	for (p = name; *p != '\0'; p++)
+	{
+		if (*p == (SpaceSub & 0177) || *p == '_')
+			*p = ' ';
+	}
+	(void) setpwent();
+	while ((pw = getpwent()) != NULL)
+	{
+		char buf[MAXNAME];
+
+		buildfname(pw->pw_gecos, pw->pw_name, buf);
+		if (strchr(buf, ' ') != NULL && !strcasecmp(buf, name))
+		{
+			if (tTd(29, 4))
+				printf("fuzzy matches %s\n", pw->pw_name);
+			message("sending to login name %s", pw->pw_name);
+			*fuzzyp = TRUE;
+			return (pw);
+		}
+	}
+	if (tTd(29, 4))
+		printf("no fuzzy match found\n");
+#else
+	if (tTd(29, 4))
+		printf("not found (fuzzy disabled)\n");
+#endif
+	return (NULL);
+}
+/*
+**  WRITABLE -- predicate returning if the file is writable.
+**
+**	This routine must duplicate the algorithm in sys/fio.c.
+**	Unfortunately, we cannot use the access call since we
+**	won't necessarily be the real uid when we try to
+**	actually open the file.
+**
+**	Notice that ANY file with ANY execute bit is automatically
+**	not writable.  This is also enforced by mailfile.
+**
+**	Parameters:
+**		filename -- the file name to check.
+**		ctladdr -- the controlling address for this file.
+**		flags -- SFF_* flags to control the function.
+**
+**	Returns:
+**		TRUE -- if we will be able to write this file.
+**		FALSE -- if we cannot write this file.
+**
+**	Side Effects:
+**		none.
+*/
+
+bool
+writable(filename, ctladdr, flags)
+	char *filename;
+	ADDRESS *ctladdr;
+	int flags;
+{
+	uid_t euid;
+	gid_t egid;
+	int bits;
+	register char *p;
+	char *uname;
+	struct stat stb;
+	extern char RealUserName[];
+
+	if (tTd(29, 5))
+		printf("writable(%s, %x)\n", filename, flags);
+
+#ifdef HASLSTAT
+	if ((bitset(SFF_NOSLINK, flags) ? lstat(filename, &stb)
+					: stat(filename, &stb)) < 0)
+#else
+	if (stat(filename, &stb) < 0)
+#endif
+	{
+		/* file does not exist -- see if directory is safe */
+		p = strrchr(filename, '/');
+		if (p == NULL)
+		{
+			errno = ENOTDIR;
+			return FALSE;
+		}
+		*p = '\0';
+		errno = safefile(filename, RealUid, RealGid, RealUserName,
+				 SFF_MUSTOWN, S_IWRITE|S_IEXEC);
+		*p = '/';
+		return errno == 0;
+	}
+
+#ifdef SUID_ROOT_FILES_OK
+	/* really ought to be passed down -- and not a good idea */
+	flags |= SFF_ROOTOK;
+#endif
+
+	/*
+	**  File does exist -- check that it is writable.
+	*/
+
+	if (bitset(0111, stb.st_mode))
+	{
+		if (tTd(29, 5))
+			printf("failed (mode %o: x bits)\n", stb.st_mode);
+		errno = EPERM;
+		return (FALSE);
+	}
+
+	if (ctladdr != NULL && geteuid() == 0)
+	{
+		euid = ctladdr->q_uid;
+		egid = ctladdr->q_gid;
+		uname = ctladdr->q_user;
+	}
+	else
+	{
+		euid = RealUid;
+		egid = RealGid;
+		uname = RealUserName;
+	}
+	if (euid == 0)
+	{
+		euid = DefUid;
+		uname = DefUser;
+	}
+	if (egid == 0)
+		egid = DefGid;
+	if (geteuid() == 0)
+	{
+		if (bitset(S_ISUID, stb.st_mode) &&
+		    (stb.st_uid != 0 || bitset(SFF_ROOTOK, flags)))
+		{
+			euid = stb.st_uid;
+			uname = NULL;
+		}
+		if (bitset(S_ISGID, stb.st_mode) &&
+		    (stb.st_gid != 0 || bitset(SFF_ROOTOK, flags)))
+			egid = stb.st_gid;
+	}
+
+	if (tTd(29, 5))
+		printf("\teu/gid=%d/%d, st_u/gid=%d/%d\n",
+			euid, egid, stb.st_uid, stb.st_gid);
+
+	errno = safefile(filename, euid, egid, uname, flags, S_IWRITE);
+	return errno == 0;
+}
+/*
+**  INCLUDE -- handle :include: specification.
+**
+**	Parameters:
+**		fname -- filename to include.
+**		forwarding -- if TRUE, we are reading a .forward file.
+**			if FALSE, it's a :include: file.
+**		ctladdr -- address template to use to fill in these
+**			addresses -- effective user/group id are
+**			the important things.
+**		sendq -- a pointer to the head of the send queue
+**			to put these addresses in.
+**
+**	Returns:
+**		open error status
+**
+**	Side Effects:
+**		reads the :include: file and sends to everyone
+**		listed in that file.
+**
+**	Security Note:
+**		If you have restricted chown (that is, you can't
+**		give a file away), it is reasonable to allow programs
+**		and files called from this :include: file to be to be
+**		run as the owner of the :include: file.  This is bogus
+**		if there is any chance of someone giving away a file.
+**		We assume that pre-POSIX systems can give away files.
+**
+**		There is an additional restriction that if you
+**		forward to a :include: file, it will not take on
+**		the ownership of the :include: file.  This may not
+**		be necessary, but shouldn't hurt.
+*/
+
+static jmp_buf	CtxIncludeTimeout;
+static int	includetimeout();
+
+#ifndef S_IWOTH
+# define S_IWOTH	(S_IWRITE >> 6)
+#endif
+
+int
+include(fname, forwarding, ctladdr, sendq, e)
+	char *fname;
+	bool forwarding;
+	ADDRESS *ctladdr;
+	ADDRESS **sendq;
+	ENVELOPE *e;
+{
+	register FILE *fp = NULL;
+	char *oldto = e->e_to;
+	char *oldfilename = FileName;
+	int oldlinenumber = LineNumber;
+	register EVENT *ev = NULL;
+	int nincludes;
+	register ADDRESS *ca;
+	uid_t saveduid, uid;
+	gid_t savedgid, gid;
+	char *uname;
+	int rval = 0;
+	int sfflags = forwarding ? SFF_MUSTOWN : SFF_ANYFILE;
+	struct stat st;
+	char buf[MAXLINE];
+#ifdef _POSIX_CHOWN_RESTRICTED
+# if _POSIX_CHOWN_RESTRICTED == -1
+#  define safechown	FALSE
+# else
+#  define safechown	TRUE
+# endif
+#else
+# ifdef _PC_CHOWN_RESTRICTED
+	bool safechown;
+# else
+#  ifdef BSD
+#   define safechown	TRUE
+#  else
+#   define safechown	FALSE
+#  endif
+# endif
+#endif
+	extern bool chownsafe();
+
+	if (tTd(27, 2))
+		printf("include(%s)\n", fname);
+	if (tTd(27, 4))
+		printf("   ruid=%d euid=%d\n", getuid(), geteuid());
+	if (tTd(27, 14))
+	{
+		printf("ctladdr ");
+		printaddr(ctladdr, FALSE);
+	}
+
+	if (tTd(27, 9))
+		printf("include: old uid = %d/%d\n", getuid(), geteuid());
+
+	ca = getctladdr(ctladdr);
+	if (ca == NULL)
+	{
+		uid = DefUid;
+		gid = DefGid;
+		uname = DefUser;
+		saveduid = -1;
+	}
+	else
+	{
+		uid = ca->q_uid;
+		gid = ca->q_gid;
+		uname = ca->q_user;
+#ifdef HASSETREUID
+		saveduid = geteuid();
+		savedgid = getegid();
+		if (saveduid == 0)
+		{
+			initgroups(uname, gid);
+			if (uid != 0)
+				(void) setreuid(0, uid);
+		}
+#endif                   
+	}
+
+	if (tTd(27, 9))
+		printf("include: new uid = %d/%d\n", getuid(), geteuid());
+
+	/*
+	**  If home directory is remote mounted but server is down,
+	**  this can hang or give errors; use a timeout to avoid this
+	*/
+
+	if (setjmp(CtxIncludeTimeout) != 0)
+	{
+		ctladdr->q_flags |= QQUEUEUP;
+		errno = 0;
+
+		/* return pseudo-error code */
+		rval = EOPENTIMEOUT;
+		goto resetuid;
+	}
+	ev = setevent((time_t) 60, includetimeout, 0);
+
+	/* the input file must be marked safe */
+	rval = safefile(fname, uid, gid, uname, sfflags, S_IREAD);
+	if (rval != 0)
+	{
+		/* don't use this :include: file */
+		if (tTd(27, 4))
+			printf("include: not safe (uid=%d): %s\n",
+				uid, errstring(rval));
+	}
+	else
+	{
+		fp = fopen(fname, "r");
+		if (fp == NULL)
+		{
+			rval = errno;
+			if (tTd(27, 4))
+				printf("include: open: %s\n", errstring(rval));
+		}
+	}
+	clrevent(ev);
+
+resetuid:
+
+#ifdef HASSETREUID
+	if (saveduid == 0)
+	{
+		if (uid != 0)
+			if (setreuid(-1, 0) < 0 || setreuid(RealUid, 0) < 0)
+				syserr("setreuid(%d, 0) failure (real=%d, eff=%d)",
+					RealUid, getuid(), geteuid());
+		setgid(savedgid);
+	}
+#endif
+
+	if (tTd(27, 9))
+		printf("include: reset uid = %d/%d\n", getuid(), geteuid());
+
+	if (rval == EOPENTIMEOUT)
+		usrerr("451 open timeout on %s", fname);
+
+	if (fp == NULL)
+		return rval;
+
+	if (fstat(fileno(fp), &st) < 0)
+	{
+		rval = errno;
+		syserr("Cannot fstat %s!", fname);
+		return rval;
+	}
+
+#ifndef safechown
+	safechown = chownsafe(fileno(fp));
+#endif
+	if (ca == NULL && safechown)
+	{
+		ctladdr->q_uid = st.st_uid;
+		ctladdr->q_gid = st.st_gid;
+		ctladdr->q_flags |= QGOODUID;
+	}
+	if (ca != NULL && ca->q_uid == st.st_uid)
+	{
+		/* optimization -- avoid getpwuid if we already have info */
+		ctladdr->q_flags |= ca->q_flags & QBOGUSSHELL;
+		ctladdr->q_ruser = ca->q_ruser;
+	}
+	else
+	{
+		char *sh;
+		register struct passwd *pw;
+
+		sh = "/SENDMAIL/ANY/SHELL/";
+		pw = getpwuid(st.st_uid);
+		if (pw != NULL)
+		{
+			ctladdr->q_ruser = newstr(pw->pw_name);
+			if (safechown)
+				sh = pw->pw_shell;
+		}
+		if (pw == NULL)
+			ctladdr->q_flags |= QBOGUSSHELL;
+		else if(!usershellok(sh))
+		{
+			if (safechown)
+				ctladdr->q_flags |= QBOGUSSHELL;
+			else
+				ctladdr->q_flags |= QUNSAFEADDR;
+		}
+	}
+
+	if (bitset(EF_VRFYONLY, e->e_flags))
+	{
+		/* don't do any more now */
+		ctladdr->q_flags |= QVERIFIED;
+		e->e_nrcpts++;
+		xfclose(fp, "include", fname);
+		return rval;
+	}
+
+	/*
+	** Check to see if some bad guy can write this file
+	**
+	**	This should really do something clever with group
+	**	permissions; currently we just view world writable
+	**	as unsafe.  Also, we don't check for writable
+	**	directories in the path.  We've got to leave
+	**	something for the local sysad to do.
+	*/
+
+	if (bitset(S_IWOTH, st.st_mode))
+		ctladdr->q_flags |= QUNSAFEADDR;
+
+	/* read the file -- each line is a comma-separated list. */
+	FileName = fname;
+	LineNumber = 0;
+	ctladdr->q_flags &= ~QSELFREF;
+	nincludes = 0;
+	while (fgets(buf, sizeof buf, fp) != NULL)
+	{
+		register char *p = strchr(buf, '\n');
+
+		LineNumber++;
+		if (p != NULL)
+			*p = '\0';
+		if (buf[0] == '#' || buf[0] == '\0')
+			continue;
+		e->e_to = NULL;
+		message("%s to %s",
+			forwarding ? "forwarding" : "sending", buf);
+#ifdef LOG
+		if (forwarding && LogLevel > 9)
+			syslog(LOG_INFO, "%s: forward %s => %s",
+				e->e_id == NULL ? "NOQUEUE" : e->e_id,
+				oldto, buf);
+#endif
+
+		AliasLevel++;
+		nincludes += sendtolist(buf, ctladdr, sendq, e);
+		AliasLevel--;
+	}
+
+	if (ferror(fp) && tTd(27, 3))
+		printf("include: read error: %s\n", errstring(errno));
+	if (nincludes > 0 && !bitset(QSELFREF, ctladdr->q_flags))
+	{
+		if (tTd(27, 5))
+		{
+			printf("include: QDONTSEND ");
+			printaddr(ctladdr, FALSE);
+		}
+		ctladdr->q_flags |= QDONTSEND;
+	}
+
+	(void) xfclose(fp, "include", fname);
+	FileName = oldfilename;
+	LineNumber = oldlinenumber;
+	e->e_to = oldto;
+	return rval;
+}
+
+static
+includetimeout()
+{
+	longjmp(CtxIncludeTimeout, 1);
+}
+/*
+**  SENDTOARGV -- send to an argument vector.
+**
+**	Parameters:
+**		argv -- argument vector to send to.
+**		e -- the current envelope.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		puts all addresses on the argument vector onto the
+**			send queue.
+*/
+
+sendtoargv(argv, e)
+	register char **argv;
+	register ENVELOPE *e;
+{
+	register char *p;
+
+	while ((p = *argv++) != NULL)
+	{
+		(void) sendtolist(p, NULLADDR, &e->e_sendqueue, e);
+	}
+}
+/*
+**  GETCTLADDR -- get controlling address from an address header.
+**
+**	If none, get one corresponding to the effective userid.
+**
+**	Parameters:
+**		a -- the address to find the controller of.
+**
+**	Returns:
+**		the controlling address.
+**
+**	Side Effects:
+**		none.
+*/
+
+ADDRESS *
+getctladdr(a)
+	register ADDRESS *a;
+{
+	while (a != NULL && !bitset(QGOODUID, a->q_flags))
+		a = a->q_alias;
+	return (a);
+}
diff --git a/usr.sbin/sendmail/src/savemail.c b/usr.sbin/sendmail/src/savemail.c
new file mode 100644
index 00000000000..214dca5c96f
--- /dev/null
+++ b/usr.sbin/sendmail/src/savemail.c
@@ -0,0 +1,833 @@
+/*
+ * Copyright (c) 1983 Eric P. Allman
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)savemail.c	8.29 (Berkeley) 5/10/94";
+#endif /* not lint */
+
+# include "sendmail.h"
+# include <pwd.h>
+
+/*
+**  SAVEMAIL -- Save mail on error
+**
+**	If mailing back errors, mail it back to the originator
+**	together with an error message; otherwise, just put it in
+**	dead.letter in the user's home directory (if he exists on
+**	this machine).
+**
+**	Parameters:
+**		e -- the envelope containing the message in error.
+**
+**	Returns:
+**		none
+**
+**	Side Effects:
+**		Saves the letter, by writing or mailing it back to the
+**		sender, or by putting it in dead.letter in her home
+**		directory.
+*/
+
+/* defines for state machine */
+# define ESM_REPORT	0	/* report to sender's terminal */
+# define ESM_MAIL	1	/* mail back to sender */
+# define ESM_QUIET	2	/* messages have already been returned */
+# define ESM_DEADLETTER	3	/* save in ~/dead.letter */
+# define ESM_POSTMASTER	4	/* return to postmaster */
+# define ESM_USRTMP	5	/* save in /usr/tmp/dead.letter */
+# define ESM_PANIC	6	/* leave the locked queue/transcript files */
+# define ESM_DONE	7	/* the message is successfully delivered */
+
+# ifndef _PATH_VARTMP
+#  define _PATH_VARTMP	"/usr/tmp/"
+# endif
+
+
+savemail(e)
+	register ENVELOPE *e;
+{
+	register struct passwd *pw;
+	register FILE *fp;
+	int state;
+	auto ADDRESS *q = NULL;
+	register char *p;
+	MCI mcibuf;
+	char buf[MAXLINE+1];
+	extern struct passwd *getpwnam();
+	extern char *ttypath();
+	typedef int (*fnptr)();
+	extern bool writable();
+
+	if (tTd(6, 1))
+	{
+		printf("\nsavemail, errormode = %c, id = %s, ExitStat = %d\n  e_from=",
+			e->e_errormode, e->e_id == NULL ? "NONE" : e->e_id,
+			ExitStat);
+		printaddr(&e->e_from, FALSE);
+	}
+
+	if (e->e_id == NULL)
+	{
+		/* can't return a message with no id */
+		return;
+	}
+
+	/*
+	**  In the unhappy event we don't know who to return the mail
+	**  to, make someone up.
+	*/
+
+	if (e->e_from.q_paddr == NULL)
+	{
+		e->e_sender = "Postmaster";
+		if (parseaddr(e->e_sender, &e->e_from,
+			      RF_COPYPARSE|RF_SENDERADDR, '\0', NULL, e) == NULL)
+		{
+			syserr("553 Cannot parse Postmaster!");
+			ExitStat = EX_SOFTWARE;
+			finis();
+		}
+	}
+	e->e_to = NULL;
+
+	/*
+	**  Basic state machine.
+	**
+	**	This machine runs through the following states:
+	**
+	**	ESM_QUIET	Errors have already been printed iff the
+	**			sender is local.
+	**	ESM_REPORT	Report directly to the sender's terminal.
+	**	ESM_MAIL	Mail response to the sender.
+	**	ESM_DEADLETTER	Save response in ~/dead.letter.
+	**	ESM_POSTMASTER	Mail response to the postmaster.
+	**	ESM_PANIC	Save response anywhere possible.
+	*/
+
+	/* determine starting state */
+	switch (e->e_errormode)
+	{
+	  case EM_WRITE:
+		state = ESM_REPORT;
+		break;
+
+	  case EM_BERKNET:
+		/* mail back, but return o.k. exit status */
+		ExitStat = EX_OK;
+
+		/* fall through.... */
+
+	  case EM_MAIL:
+		state = ESM_MAIL;
+		break;
+
+	  case EM_PRINT:
+	  case '\0':
+		state = ESM_QUIET;
+		break;
+
+	  case EM_QUIET:
+		/* no need to return anything at all */
+		return;
+
+	  default:
+		syserr("554 savemail: bogus errormode x%x\n", e->e_errormode);
+		state = ESM_MAIL;
+		break;
+	}
+
+	/* if this is already an error response, send to postmaster */
+	if (bitset(EF_RESPONSE, e->e_flags))
+	{
+		if (e->e_parent != NULL &&
+		    bitset(EF_RESPONSE, e->e_parent->e_flags))
+		{
+			/* got an error sending a response -- can it */
+			return;
+		}
+		state = ESM_POSTMASTER;
+	}
+
+	while (state != ESM_DONE)
+	{
+		if (tTd(6, 5))
+			printf("  state %d\n", state);
+
+		switch (state)
+		{
+		  case ESM_QUIET:
+			if (e->e_from.q_mailer == LocalMailer)
+				state = ESM_DEADLETTER;
+			else
+				state = ESM_MAIL;
+			break;
+
+		  case ESM_REPORT:
+
+			/*
+			**  If the user is still logged in on the same terminal,
+			**  then write the error messages back to hir (sic).
+			*/
+
+			p = ttypath();
+			if (p == NULL || freopen(p, "w", stdout) == NULL)
+			{
+				state = ESM_MAIL;
+				break;
+			}
+
+			expand("\201n", buf, &buf[sizeof buf - 1], e);
+			printf("\r\nMessage from %s...\r\n", buf);
+			printf("Errors occurred while sending mail.\r\n");
+			if (e->e_xfp != NULL)
+			{
+				(void) fflush(e->e_xfp);
+				fp = fopen(queuename(e, 'x'), "r");
+			}
+			else
+				fp = NULL;
+			if (fp == NULL)
+			{
+				syserr("Cannot open %s", queuename(e, 'x'));
+				printf("Transcript of session is unavailable.\r\n");
+			}
+			else
+			{
+				printf("Transcript follows:\r\n");
+				while (fgets(buf, sizeof buf, fp) != NULL &&
+				       !ferror(stdout))
+					fputs(buf, stdout);
+				(void) xfclose(fp, "savemail transcript", e->e_id);
+			}
+			printf("Original message will be saved in dead.letter.\r\n");
+			state = ESM_DEADLETTER;
+			break;
+
+		  case ESM_MAIL:
+			/*
+			**  If mailing back, do it.
+			**	Throw away all further output.  Don't alias,
+			**	since this could cause loops, e.g., if joe
+			**	mails to joe@x, and for some reason the network
+			**	for @x is down, then the response gets sent to
+			**	joe@x, which gives a response, etc.  Also force
+			**	the mail to be delivered even if a version of
+			**	it has already been sent to the sender.
+			**
+			**  If this is a configuration or local software
+			**	error, send to the local postmaster as well,
+			**	since the originator can't do anything
+			**	about it anyway.  Note that this is a full
+			**	copy of the message (intentionally) so that
+			**	the Postmaster can forward things along.
+			*/
+
+			if (ExitStat == EX_CONFIG || ExitStat == EX_SOFTWARE)
+			{
+				(void) sendtolist("postmaster",
+					  NULLADDR, &e->e_errorqueue, e);
+			}
+			if (strcmp(e->e_from.q_paddr, "<>") != 0)
+			{
+				(void) sendtolist(e->e_from.q_paddr,
+					  NULLADDR, &e->e_errorqueue, e);
+			}
+
+			/*
+			**  Deliver a non-delivery report to the
+			**  Postmaster-designate (not necessarily
+			**  Postmaster).  This does not include the
+			**  body of the message, for privacy reasons.
+			**  You really shouldn't need this.
+			*/
+
+			e->e_flags |= EF_PM_NOTIFY;
+
+			/* check to see if there are any good addresses */
+			for (q = e->e_errorqueue; q != NULL; q = q->q_next)
+				if (!bitset(QBADADDR|QDONTSEND, q->q_flags))
+					break;
+			if (q == NULL)
+			{
+				/* this is an error-error */
+				state = ESM_POSTMASTER;
+				break;
+			}
+			if (returntosender(e->e_message, e->e_errorqueue,
+					   (e->e_class >= 0), e) == 0)
+			{
+				state = ESM_DONE;
+				break;
+			}
+
+			/* didn't work -- return to postmaster */
+			state = ESM_POSTMASTER;
+			break;
+
+		  case ESM_POSTMASTER:
+			/*
+			**  Similar to previous case, but to system postmaster.
+			*/
+
+			q = NULL;
+			if (sendtolist("postmaster", NULL, &q, e) <= 0)
+			{
+				syserr("553 cannot parse postmaster!");
+				ExitStat = EX_SOFTWARE;
+				state = ESM_USRTMP;
+				break;
+			}
+			if (returntosender(e->e_message,
+					   q, (e->e_class >= 0), e) == 0)
+			{
+				state = ESM_DONE;
+				break;
+			}
+
+			/* didn't work -- last resort */
+			state = ESM_USRTMP;
+			break;
+
+		  case ESM_DEADLETTER:
+			/*
+			**  Save the message in dead.letter.
+			**	If we weren't mailing back, and the user is
+			**	local, we should save the message in
+			**	~/dead.letter so that the poor person doesn't
+			**	have to type it over again -- and we all know
+			**	what poor typists UNIX users are.
+			*/
+
+			p = NULL;
+			if (e->e_from.q_mailer == LocalMailer)
+			{
+				if (e->e_from.q_home != NULL)
+					p = e->e_from.q_home;
+				else if ((pw = getpwnam(e->e_from.q_user)) != NULL)
+					p = pw->pw_dir;
+			}
+			if (p == NULL)
+			{
+				/* no local directory */
+				state = ESM_MAIL;
+				break;
+			}
+			if (e->e_dfp != NULL)
+			{
+				bool oldverb = Verbose;
+
+				/* we have a home directory; open dead.letter */
+				define('z', p, e);
+				expand("\201z/dead.letter", buf, &buf[sizeof buf - 1], e);
+				Verbose = TRUE;
+				message("Saving message in %s", buf);
+				Verbose = oldverb;
+				e->e_to = buf;
+				q = NULL;
+				(void) sendtolist(buf, &e->e_from, &q, e);
+				if (q != NULL &&
+				    !bitset(QBADADDR, q->q_flags) &&
+				    deliver(e, q) == 0)
+					state = ESM_DONE;
+				else
+					state = ESM_MAIL;
+			}
+			else
+			{
+				/* no data file -- try mailing back */
+				state = ESM_MAIL;
+			}
+			break;
+
+		  case ESM_USRTMP:
+			/*
+			**  Log the mail in /usr/tmp/dead.letter.
+			*/
+
+			if (e->e_class < 0)
+			{
+				state = ESM_DONE;
+				break;
+			}
+
+			strcpy(buf, _PATH_VARTMP);
+			strcat(buf, "dead.letter");
+			if (!writable(buf, NULLADDR, SFF_NOSLINK))
+			{
+				state = ESM_PANIC;
+				break;
+			}
+			fp = dfopen(buf, O_WRONLY|O_CREAT|O_APPEND, FileMode);
+			if (fp == NULL)
+			{
+				state = ESM_PANIC;
+				break;
+			}
+
+			bzero(&mcibuf, sizeof mcibuf);
+			mcibuf.mci_out = fp;
+			mcibuf.mci_mailer = FileMailer;
+			if (bitnset(M_7BITS, FileMailer->m_flags))
+				mcibuf.mci_flags |= MCIF_7BIT;
+
+			putfromline(&mcibuf, e);
+			(*e->e_puthdr)(&mcibuf, e);
+			putline("\n", &mcibuf);
+			(*e->e_putbody)(&mcibuf, e, NULL);
+			putline("\n", &mcibuf);
+			(void) fflush(fp);
+			state = ferror(fp) ? ESM_PANIC : ESM_DONE;
+			(void) xfclose(fp, "savemail", "/usr/tmp/dead.letter");
+			break;
+
+		  default:
+			syserr("554 savemail: unknown state %d", state);
+
+			/* fall through ... */
+
+		  case ESM_PANIC:
+			/* leave the locked queue & transcript files around */
+			syserr("!554 savemail: cannot save rejected email anywhere");
+		}
+	}
+}
+/*
+**  RETURNTOSENDER -- return a message to the sender with an error.
+**
+**	Parameters:
+**		msg -- the explanatory message.
+**		returnq -- the queue of people to send the message to.
+**		sendbody -- if TRUE, also send back the body of the
+**			message; otherwise just send the header.
+**		e -- the current envelope.
+**
+**	Returns:
+**		zero -- if everything went ok.
+**		else -- some error.
+**
+**	Side Effects:
+**		Returns the current message to the sender via
+**		mail.
+*/
+
+static bool	SendBody;
+
+#define MAXRETURNS	6	/* max depth of returning messages */
+#define ERRORFUDGE	100	/* nominal size of error message text */
+
+returntosender(msg, returnq, sendbody, e)
+	char *msg;
+	ADDRESS *returnq;
+	bool sendbody;
+	register ENVELOPE *e;
+{
+	char buf[MAXNAME];
+	extern putheader(), errbody();
+	register ENVELOPE *ee;
+	ENVELOPE *oldcur = CurEnv;
+	ENVELOPE errenvelope;
+	static int returndepth;
+	register ADDRESS *q;
+
+	if (returnq == NULL)
+		return (-1);
+
+	if (msg == NULL)
+		msg = "Unable to deliver mail";
+
+	if (tTd(6, 1))
+	{
+		printf("Return To Sender: msg=\"%s\", depth=%d, e=%x, returnq=",
+		       msg, returndepth, e);
+		printaddr(returnq, TRUE);
+	}
+
+	if (++returndepth >= MAXRETURNS)
+	{
+		if (returndepth != MAXRETURNS)
+			syserr("554 returntosender: infinite recursion on %s", returnq->q_paddr);
+		/* don't "unrecurse" and fake a clean exit */
+		/* returndepth--; */
+		return (0);
+	}
+
+	SendBody = sendbody;
+	define('g', e->e_from.q_paddr, e);
+	define('u', NULL, e);
+	ee = newenvelope(&errenvelope, e);
+	define('a', "\201b", ee);
+	define('r', "internal", ee);
+	define('s', "localhost", ee);
+	define('_', "localhost", ee);
+	ee->e_puthdr = putheader;
+	ee->e_putbody = errbody;
+	ee->e_flags |= EF_RESPONSE|EF_METOO;
+	if (!bitset(EF_OLDSTYLE, e->e_flags))
+		ee->e_flags &= ~EF_OLDSTYLE;
+	ee->e_sendqueue = returnq;
+	ee->e_msgsize = ERRORFUDGE;
+	if (!NoReturn)
+		ee->e_msgsize += e->e_msgsize;
+	initsys(ee);
+	for (q = returnq; q != NULL; q = q->q_next)
+	{
+		if (bitset(QBADADDR, q->q_flags))
+			continue;
+
+		if (!bitset(QDONTSEND, q->q_flags))
+			ee->e_nrcpts++;
+
+		if (!DontPruneRoutes && pruneroute(q->q_paddr))
+			parseaddr(q->q_paddr, q, RF_COPYPARSE, '\0', NULL, e);
+
+		if (q->q_alias == NULL)
+			addheader("To", q->q_paddr, ee);
+	}
+
+# ifdef LOG
+	if (LogLevel > 5)
+		syslog(LOG_INFO, "%s: %s: return to sender: %s",
+			e->e_id, ee->e_id, msg);
+# endif
+
+	(void) sprintf(buf, "Returned mail: %.*s", sizeof buf - 20, msg);
+	addheader("Subject", buf, ee);
+	if (SendMIMEErrors)
+	{
+		addheader("MIME-Version", "1.0", ee);
+		(void) sprintf(buf, "%s.%ld/%s",
+			ee->e_id, curtime(), MyHostName);
+		ee->e_msgboundary = newstr(buf);
+		(void) sprintf(buf, "multipart/mixed; boundary=\"%s\"",
+					ee->e_msgboundary);
+		addheader("Content-Type", buf, ee);
+	}
+
+	/* fake up an address header for the from person */
+	expand("\201n", buf, &buf[sizeof buf - 1], e);
+	if (parseaddr(buf, &ee->e_from, RF_COPYALL|RF_SENDERADDR, '\0', NULL, e) == NULL)
+	{
+		syserr("553 Can't parse myself!");
+		ExitStat = EX_SOFTWARE;
+		returndepth--;
+		return (-1);
+	}
+	ee->e_sender = ee->e_from.q_paddr;
+
+	/* push state into submessage */
+	CurEnv = ee;
+	define('f', "\201n", ee);
+	define('x', "Mail Delivery Subsystem", ee);
+	eatheader(ee, TRUE);
+
+	/* mark statistics */
+	markstats(ee, NULLADDR);
+
+	/* actually deliver the error message */
+	sendall(ee, SM_DEFAULT);
+
+	/* restore state */
+	dropenvelope(ee);
+	CurEnv = oldcur;
+	returndepth--;
+
+	/* should check for delivery errors here */
+	return (0);
+}
+/*
+**  ERRBODY -- output the body of an error message.
+**
+**	Typically this is a copy of the transcript plus a copy of the
+**	original offending message.
+**
+**	Parameters:
+**		mci -- the mailer connection information.
+**		e -- the envelope we are working in.
+**
+**	Returns:
+**		none
+**
+**	Side Effects:
+**		Outputs the body of an error message.
+*/
+
+errbody(mci, e)
+	register MCI *mci;
+	register ENVELOPE *e;
+{
+	register FILE *xfile;
+	char *p;
+	register ADDRESS *q;
+	bool printheader;
+	char buf[MAXLINE];
+
+	if (e->e_parent == NULL)
+	{
+		syserr("errbody: null parent");
+		putline("   ----- Original message lost -----\n", mci);
+		return;
+	}
+
+	/*
+	**  Output MIME header.
+	*/
+
+	if (e->e_msgboundary != NULL)
+	{
+		putline("This is a MIME-encapsulated message", mci);
+		putline("", mci);
+		(void) sprintf(buf, "--%s", e->e_msgboundary);
+		putline(buf, mci);
+		putline("", mci);
+	}
+
+	/*
+	**  Output introductory information.
+	*/
+
+	for (q = e->e_parent->e_sendqueue; q != NULL; q = q->q_next)
+		if (bitset(QBADADDR, q->q_flags))
+			break;
+	if (q == NULL &&
+	    !bitset(EF_FATALERRS|EF_SENDRECEIPT, e->e_parent->e_flags))
+	{
+		putline("    **********************************************",
+			mci);
+		putline("    **      THIS IS A WARNING MESSAGE ONLY      **",
+			mci);
+		putline("    **  YOU DO NOT NEED TO RESEND YOUR MESSAGE  **",
+			mci);
+		putline("    **********************************************",
+			mci);
+		putline("", mci);
+	}
+	sprintf(buf, "The original message was received at %s",
+		arpadate(ctime(&e->e_parent->e_ctime)));
+	putline(buf, mci);
+	expand("from \201_", buf, &buf[sizeof buf - 1], e->e_parent);
+	putline(buf, mci);
+	putline("", mci);
+
+	/*
+	**  Output error message header (if specified and available).
+	*/
+
+	if (ErrMsgFile != NULL)
+	{
+		if (*ErrMsgFile == '/')
+		{
+			xfile = fopen(ErrMsgFile, "r");
+			if (xfile != NULL)
+			{
+				while (fgets(buf, sizeof buf, xfile) != NULL)
+				{
+					expand(buf, buf, &buf[sizeof buf - 1], e);
+					putline(buf, mci);
+				}
+				(void) fclose(xfile);
+				putline("\n", mci);
+			}
+		}
+		else
+		{
+			expand(ErrMsgFile, buf, &buf[sizeof buf - 1], e);
+			putline(buf, mci);
+			putline("", mci);
+		}
+	}
+
+	/*
+	**  Output message introduction
+	*/
+
+	printheader = TRUE;
+	for (q = e->e_parent->e_sendqueue; q != NULL; q = q->q_next)
+	{
+		if (bitset(QBADADDR|QREPORT, q->q_flags))
+		{
+			if (printheader)
+			{
+				putline("   ----- The following addresses had delivery problems -----",
+					mci);
+				printheader = FALSE;
+			}
+			strcpy(buf, q->q_paddr);
+			if (bitset(QBADADDR, q->q_flags))
+				strcat(buf, "  (unrecoverable error)");
+			else
+				strcat(buf, "  (transient failure)");
+			putline(buf, mci);
+			if (q->q_alias != NULL)
+			{
+				strcpy(buf, "    (expanded from: ");
+				strcat(buf, q->q_alias->q_paddr);
+				strcat(buf, ")");
+				putline(buf, mci);
+			}
+		}
+	}
+	if (!printheader)
+		putline("\n", mci);
+
+	/*
+	**  Output transcript of errors
+	*/
+
+	(void) fflush(stdout);
+	p = queuename(e->e_parent, 'x');
+	if ((xfile = fopen(p, "r")) == NULL)
+	{
+		syserr("Cannot open %s", p);
+		putline("   ----- Transcript of session is unavailable -----\n", mci);
+	}
+	else
+	{
+		putline("   ----- Transcript of session follows -----\n", mci);
+		if (e->e_xfp != NULL)
+			(void) fflush(e->e_xfp);
+		while (fgets(buf, sizeof buf, xfile) != NULL)
+			putline(buf, mci);
+		(void) xfclose(xfile, "errbody xscript", p);
+	}
+	errno = 0;
+
+	/*
+	**  Output text of original message
+	*/
+
+	if (NoReturn)
+		SendBody = FALSE;
+	putline("", mci);
+	if (e->e_parent->e_df != NULL)
+	{
+		if (SendBody)
+			putline("   ----- Original message follows -----\n", mci);
+		else
+			putline("   ----- Message header follows -----\n", mci);
+		(void) fflush(mci->mci_out);
+
+		if (e->e_msgboundary != NULL)
+		{
+			putline("", mci);
+			(void) sprintf(buf, "--%s", e->e_msgboundary);
+			putline(buf, mci);
+			putline("Content-Type: message/rfc822", mci);
+			putline("", mci);
+		}
+		putheader(mci, e->e_parent);
+		putline("", mci);
+		if (SendBody)
+			putbody(mci, e->e_parent, e->e_msgboundary);
+		else
+			putline("   ----- Message body suppressed -----", mci);
+	}
+	else
+	{
+		putline("  ----- No message was collected -----\n", mci);
+	}
+
+	if (e->e_msgboundary != NULL)
+	{
+		putline("", mci);
+		(void) sprintf(buf, "--%s--", e->e_msgboundary);
+		putline(buf, mci);
+	}
+	putline("", mci);
+
+	/*
+	**  Cleanup and exit
+	*/
+
+	if (errno != 0)
+		syserr("errbody: I/O error");
+}
+/*
+**  PRUNEROUTE -- prune an RFC-822 source route
+** 
+**	Trims down a source route to the last internet-registered hop.
+**	This is encouraged by RFC 1123 section 5.3.3.
+** 
+**	Parameters:
+**		addr -- the address
+** 
+**	Returns:
+**		TRUE -- address was modified
+**		FALSE -- address could not be pruned
+** 
+**	Side Effects:
+**		modifies addr in-place
+*/
+
+pruneroute(addr)
+	char *addr;
+{
+#if NAMED_BIND
+	char *start, *at, *comma;
+	char c;
+	int rcode;
+	char hostbuf[BUFSIZ];
+	char *mxhosts[MAXMXHOSTS + 1];
+
+	/* check to see if this is really a route-addr */
+	if (*addr != '<' || addr[1] != '@' || addr[strlen(addr) - 1] != '>')
+		return FALSE;
+	start = strchr(addr, ':');
+	at = strrchr(addr, '@');
+	if (start == NULL || at == NULL || at < start)
+		return FALSE;
+
+	/* slice off the angle brackets */
+	strcpy(hostbuf, at + 1);
+	hostbuf[strlen(hostbuf) - 1] = '\0';
+
+	while (start)
+	{
+		if (getmxrr(hostbuf, mxhosts, FALSE, &rcode) > 0)
+		{
+			strcpy(addr + 1, start + 1);
+			return TRUE;
+		}
+		c = *start;
+		*start = '\0';
+		comma = strrchr(addr, ',');
+		if (comma && comma[1] == '@')
+			strcpy(hostbuf, comma + 2);
+		else
+			comma = 0;
+		*start = c;
+		start = comma;
+	}
+#endif
+	return FALSE;
+}
diff --git a/usr.sbin/sendmail/src/sendmail.8 b/usr.sbin/sendmail/src/sendmail.8
new file mode 100644
index 00000000000..f03d3deb9c1
--- /dev/null
+++ b/usr.sbin/sendmail/src/sendmail.8
@@ -0,0 +1,501 @@
+.\" Copyright (c) 1988, 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 3. All advertising materials mentioning features or use of this software
+.\"    must display the following acknowledgement:
+.\"	This product includes software developed by the University of
+.\"	California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     @(#)sendmail.8	8.4 (Berkeley) 12/11/93
+.\"
+.Dd December 11, 1993
+.Dt SENDMAIL 8
+.Os BSD 4
+.Sh NAME
+.Nm sendmail
+.Nd send mail over the internet
+.Sh SYNOPSIS
+.Nm sendmail
+.Op Ar flags
+.Op Ar address ...
+.Nm newaliases
+.Nm mailq
+.Op Fl v
+.Sh DESCRIPTION
+.Nm Sendmail
+sends a message to one or more
+.Em recipients ,
+routing the message over whatever networks
+are necessary.
+.Nm Sendmail
+does internetwork forwarding as necessary
+to deliver the message to the correct place.
+.Pp
+.Nm Sendmail
+is not intended as a user interface routine;
+other programs provide user-friendly
+front ends;
+.Nm sendmail
+is used only to deliver pre-formatted messages.
+.Pp
+With no flags,
+.Nm sendmail
+reads its standard input
+up to an end-of-file
+or a line consisting only of a single dot
+and sends a copy of the message found there
+to all of the addresses listed.
+It determines the network(s) to use
+based on the syntax and contents of the addresses.
+.Pp
+Local addresses are looked up in a file
+and aliased appropriately.
+Aliasing can be prevented by preceding the address
+with a backslash.
+Normally the sender is not included in any alias
+expansions, e.g.,
+if `john' sends to `group',
+and `group' includes `john' in the expansion,
+then the letter will not be delivered to `john'.
+.Ss Parameters
+.Bl -tag -width Fl
+.It Fl B Ns Ar type
+Set the body type to
+.Ar type .
+Current legal values
+.Li 7BIT
+or
+.Li 8BITMIME .
+.It Fl ba
+Go into
+.Tn ARPANET
+mode.
+All input lines must end with a CR-LF,
+and all messages will be generated with a CR-LF at the end.
+Also,
+the ``From:'' and ``Sender:''
+fields are examined for the name of the sender.
+.It Fl bd
+Run as a daemon.  This requires Berkeley
+.Tn IPC .
+.Nm Sendmail
+will fork and run in background
+listening on socket 25 for incoming
+.Tn SMTP
+connections.
+This is normally run from
+.Pa /etc/rc .
+.It Fl bi
+Initialize the alias database.
+.It Fl bm
+Deliver mail in the usual way (default).
+.It Fl bp
+Print a listing of the queue.
+.It Fl bs
+Use the
+.Tn SMTP
+protocol as described in
+.Tn RFC821
+on standard input and output.
+This flag implies all the operations of the
+.Fl ba
+flag that are compatible with
+.Tn SMTP .
+.It Fl bt
+Run in address test mode.
+This mode reads addresses and shows the steps in parsing;
+it is used for debugging configuration tables.
+.It Fl bv
+Verify names only \- do not try to collect or deliver a message.
+Verify mode is normally used for validating
+users or mailing lists.
+.It Fl C Ns Ar file
+Use alternate configuration file.
+.Nm Sendmail
+refuses to run as root if an alternate configuration file is specified.
+.It Fl d Ns Ar X
+Set debugging value to
+.Ar X .
+.ne 1i
+.It Fl F Ns Ar fullname
+Set the full name of the sender.
+.It Fl f Ns Ar name
+Sets the name of the ``from'' person
+(i.e., the sender of the mail).
+.Fl f
+can only be used
+by ``trusted'' users
+(normally
+.Em root ,
+.Em daemon ,
+and
+.Em network )
+or if the person you are trying to become
+is the same as the person you are.
+.It Fl h Ns Ar N
+Set the hop count to
+.Ar N .
+The hop count is incremented every time the mail is
+processed.
+When it reaches a limit,
+the mail is returned with an error message,
+the victim of an aliasing loop.
+If not specified,
+``Received:'' lines in the message are counted.
+.It Fl n
+Don't do aliasing.
+.It Fl o Ns Ar x Em value
+Set option
+.Ar x
+to the specified
+.Em value .
+Options are described below.
+.It Fl p Ns Ar protocol
+Set the name of the protocol used to receive the message.
+This can be a simple protocol name such as ``UUCP''
+or a protocol and hostname, such as ``UUCP:ucbvax''.
+.It Fl q Ns Bq Ar time
+Processed saved messages in the queue at given intervals.
+If
+.Ar time
+is omitted,
+process the queue once.
+.Xr Time
+is given as a tagged number,
+with
+.Ql s
+being seconds,
+.Ql m
+being minutes,
+.Ql h
+being hours,
+.Ql d
+being days,
+and
+.Ql w
+being weeks.
+For example,
+.Ql \-q1h30m
+or
+.Ql \-q90m
+would both set the timeout to one hour thirty minutes.
+If
+.Ar time
+is specified,
+.Nm sendmail
+will run in background.
+This option can be used safely with
+.Fl bd .
+.It Fl r Ns Ar name
+An alternate and obsolete form of the
+.Fl f
+flag.
+.It Fl t
+Read message for recipients.
+To:, Cc:, and Bcc: lines will be scanned for recipient addresses.
+The Bcc: line will be deleted before transmission.
+Any addresses in the argument list will be suppressed,
+that is,
+they will
+.Em not
+receive copies even if listed in the message header.
+.It Fl v
+Go into verbose mode.
+Alias expansions will be announced, etc.
+.It Fl X Ar logfile
+Log all traffic in and out of mailers in the indicated log file.
+This should only be used as a last resort
+for debugging mailer bugs.
+It will log a lot of data very quickly.
+.El
+.Ss Options
+There are also a number of processing options that may be set.
+Normally these will only be used by a system administrator.
+Options may be set either on the command line
+using the
+.Fl o
+flag
+or in the configuration file.
+This is a partial list;
+for a complete list (and details), consult the
+.%T "Sendmail Installation and Operation Guide" .
+The options are:
+.Bl -tag -width Fl
+.It Li A Ns Ar file
+Use alternate alias file.
+.It Li b Ns Ar nblocks
+The minimum number of free blocks needed on the spool filesystem.
+.It Li c
+On mailers that are considered ``expensive'' to connect to,
+don't initiate immediate connection.
+This requires queueing.
+.It Li C Ar N
+Checkpoint the queue file after every
+.Ar N
+successful deliveries (default 10).
+This avoids excessive duplicate deliveries
+when sending to long mailing lists
+interrupted by system crashes.
+.It Li d Ns Ar x
+Set the delivery mode to
+.Ar x .
+Delivery modes are
+.Ql i
+for interactive (synchronous) delivery,
+.Ql b
+for background (asynchronous) delivery,
+and
+.Ql q
+for queue only \- i.e.,
+actual delivery is done the next time the queue is run.
+.It Li D
+Try to automatically rebuild the alias database
+if necessary.
+.It Li e Ns Ar x
+Set error processing to mode
+.Ar x .
+Valid modes are
+.Ql m
+to mail back the error message,
+.Ql w
+to ``write'' back the error message
+(or mail it back if the sender is not logged in),
+.Ql p
+to print the errors on the terminal
+(default),
+.Ql q
+to throw away error messages
+(only exit status is returned),
+and
+.Ql e
+to do special processing for the BerkNet.
+If the text of the message is not mailed back
+by
+modes
+.Ql m
+or
+.Ql w
+and if the sender is local to this machine,
+a copy of the message is appended to the file
+.Pa dead.letter
+in the sender's home directory.
+.It Li f
+Save
+.Tn UNIX Ns \-style
+From lines at the front of messages.
+.It Li G
+Match local mail names against the GECOS portion of the password file.
+.It Li g Ar N
+The default group id to use when calling mailers.
+.It Li H Ns Ar file
+The
+.Tn SMTP
+help file.
+.It Li h Ar N
+The maximum number of times a message is allowed to ``hop''
+before we decide it is in a loop.
+.It Li i
+Do not take dots on a line by themselves
+as a message terminator.
+.It Li j
+Send error messages in MIME format.
+.It Li K Ns Ar timeout
+Set connection cache timeout.
+.It Li k Ns Ar N
+Set connection cache size.
+.It Li L Ns Ar n
+The log level.
+.It Li l
+Pay attention to the Errors-To: header.
+.It Li m
+Send to ``me'' (the sender) also if I am in an alias expansion.
+.It Li n
+Validate the right hand side of aliases during a
+.Xr newaliases 1
+command.
+.It Li o
+If set, this message may have
+old style headers.
+If not set,
+this message is guaranteed to have new style headers
+(i.e., commas instead of spaces between addresses).
+If set, an adaptive algorithm is used that will correctly
+determine the header format in most cases.
+.It Li Q Ns Ar queuedir
+Select the directory in which to queue messages.
+.It Li S Ns Ar file
+Save statistics in the named file.
+.It Li s
+Always instantiate the queue file,
+even under circumstances where it is not strictly necessary.
+This provides safety against system crashes during delivery.
+.It Li T Ns Ar time
+Set the timeout on undelivered messages in the queue to the specified time.
+After delivery has failed
+(e.g., because of a host being down)
+for this amount of time,
+failed messages will be returned to the sender.
+The default is three days.
+.It Li t Ns Ar stz , Ar dtz
+Set the name of the time zone.
+.It Li U Ns Ar userdatabase
+If set, a user database is consulted to get forwarding information.
+You can consider this an adjunct to the aliasing mechanism,
+except that the database is intended to be distributed;
+aliases are local to a particular host.
+This may not be available if your sendmail does not have the
+.Dv USERDB
+option compiled in.
+.It Li u Ns Ar N
+Set the default user id for mailers.
+.It Li Y
+Fork each job during queue runs.
+May be convenient on memory-poor machines.
+.It Li 7
+Strip incoming messages to seven bits.
+.El
+.Pp
+In aliases,
+the first character of a name may be
+a vertical bar to cause interpretation of
+the rest of the name as a command
+to pipe the mail to.
+It may be necessary to quote the name
+to keep
+.Nm sendmail
+from suppressing the blanks from between arguments.
+For example, a common alias is:
+.Pp
+.Bd -literal -offset indent -compact
+msgs: "|/usr/bin/msgs -s"
+.Ed
+.Pp
+Aliases may also have the syntax
+.Dq :include: Ns Ar filename
+to ask
+.Xr sendmail
+to read the named file for a list of recipients.
+For example, an alias such as:
+.Pp
+.Bd -literal -offset indent -compact
+poets: ":include:/usr/local/lib/poets.list"
+.Ed
+.Pp
+would read
+.Pa /usr/local/lib/poets.list
+for the list of addresses making up the group.
+.Pp
+.Nm Sendmail
+returns an exit status
+describing what it did.
+The codes are defined in
+.Aq Pa sysexits.h :
+.Bl -tag -width EX_UNAVAILABLE -compact -offset indent
+.It Dv EX_OK
+Successful completion on all addresses.
+.It Dv EX_NOUSER
+User name not recognized.
+.It Dv EX_UNAVAILABLE
+Catchall meaning necessary resources
+were not available.
+.It Dv EX_SYNTAX
+Syntax error in address.
+.It Dv EX_SOFTWARE
+Internal software error,
+including bad arguments.
+.It Dv EX_OSERR
+Temporary operating system error,
+such as
+.Dq cannot fork .
+.It Dv EX_NOHOST
+Host name not recognized.
+.It Dv EX_TEMPFAIL
+Message could not be sent immediately,
+but was queued.
+.El
+.Pp
+If invoked as
+.Nm newaliases ,
+.Nm sendmail
+will rebuild the alias database.
+If invoked as
+.Nm mailq ,
+.Nm sendmail
+will print the contents of the mail queue.
+.Sh FILES
+Except for the file
+.Pa /etc/sendmail.cf
+itself,
+the following pathnames are all specified in
+.Pa /etc/sendmail.cf.
+Thus,
+these values are only approximations.
+.Pp
+.Bl -tag -width /usr/lib/sendmail.fc -compact
+.It Pa /etc/aliases
+raw data for alias names
+.It Pa /etc/aliases.db
+data base of alias names
+.It Pa /etc/sendmail.cf
+configuration file
+.It Pa /etc/sendmail.hf
+help file
+.It Pa /var/log/sendmail.st
+collected statistics
+.It Pa /var/spool/mqueue/*
+temp files
+.It Pa /var/run/sendmail.pid
+The process id of the daemon
+.El
+.Sh SEE ALSO
+.Xr mail 1 ,
+.Xr rmail 1 ,
+.Xr syslog 3 ,
+.Xr aliases 5 ,
+.Xr mailaddr 7 ,
+.Xr mail.local 8 ,
+.Xr rc 8 ;
+.Pp
+DARPA
+Internet Request For Comments
+.%T RFC819 ,
+.%T RFC821 ,
+.%T RFC822 .
+.Rs
+.%T "Sendmail \- An Internetwork Mail Router"
+.%V SMM
+.%N \&No. 9
+.Re
+.Rs
+.%T "Sendmail Installation and Operation Guide"
+.%V SMM
+.%N \&No. 8
+.Re
+.Sh HISTORY
+The
+.Nm
+command appeared in
+.Bx 4.2 .
diff --git a/usr.sbin/sendmail/src/sendmail.h b/usr.sbin/sendmail/src/sendmail.h
new file mode 100644
index 00000000000..4fc1ef7addc
--- /dev/null
+++ b/usr.sbin/sendmail/src/sendmail.h
@@ -0,0 +1,974 @@
+/*
+ * Copyright (c) 1983 Eric P. Allman
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)sendmail.h	8.43.1.3 (Berkeley) 3/5/95
+ */
+
+/*
+**  SENDMAIL.H -- Global definitions for sendmail.
+*/
+
+# ifdef _DEFINE
+# define EXTERN
+# ifndef lint
+static char SmailSccsId[] =	"@(#)sendmail.h	8.43.1.3		3/5/95";
+# endif
+# else /*  _DEFINE */
+# define EXTERN extern
+# endif /* _DEFINE */
+
+# include <unistd.h>
+# include <stddef.h>
+# include <stdlib.h>
+# include <stdio.h>
+# include <ctype.h>
+# include <setjmp.h>
+# include <sysexits.h>
+# include <string.h>
+# include <time.h>
+# include <errno.h>
+
+# include "conf.h"
+# include "useful.h"
+
+# ifdef LOG
+# include <syslog.h>
+# endif /* LOG */
+
+# ifdef DAEMON
+# include <sys/socket.h>
+# endif
+# ifdef NETUNIX
+# include <sys/un.h>
+# endif
+# ifdef NETINET
+# include <netinet/in.h>
+# endif
+# ifdef NETISO
+# include <netiso/iso.h>
+# endif
+# ifdef NETNS
+# include <netns/ns.h>
+# endif
+# ifdef NETX25
+# include <netccitt/x25.h>
+# endif
+
+
+
+
+/*
+**  Data structure for bit maps.
+**
+**	Each bit in this map can be referenced by an ascii character.
+**	This is 128 possible bits, or 12 8-bit bytes.
+*/
+
+#define BITMAPBYTES	16	/* number of bytes in a bit map */
+#define BYTEBITS	8	/* number of bits in a byte */
+
+/* internal macros */
+#define _BITWORD(bit)	(bit / (BYTEBITS * sizeof (int)))
+#define _BITBIT(bit)	(1 << (bit % (BYTEBITS * sizeof (int))))
+
+typedef int	BITMAP[BITMAPBYTES / sizeof (int)];
+
+/* test bit number N */
+#define bitnset(bit, map)	((map)[_BITWORD(bit)] & _BITBIT(bit))
+
+/* set bit number N */
+#define setbitn(bit, map)	(map)[_BITWORD(bit)] |= _BITBIT(bit)
+
+/* clear bit number N */
+#define clrbitn(bit, map)	(map)[_BITWORD(bit)] &= ~_BITBIT(bit)
+
+/* clear an entire bit map */
+#define clrbitmap(map)		bzero((char *) map, BITMAPBYTES)
+/*
+**  Address structure.
+**	Addresses are stored internally in this structure.
+*/
+
+struct address
+{
+	char		*q_paddr;	/* the printname for the address */
+	char		*q_user;	/* user name */
+	char		*q_ruser;	/* real user name, or NULL if q_user */
+	char		*q_host;	/* host name */
+	struct mailer	*q_mailer;	/* mailer to use */
+	u_short		q_flags;	/* status flags, see below */
+	uid_t		q_uid;		/* user-id of receiver (if known) */
+	gid_t		q_gid;		/* group-id of receiver (if known) */
+	char		*q_home;	/* home dir (local mailer only) */
+	char		*q_fullname;	/* full name if known */
+	struct address	*q_next;	/* chain */
+	struct address	*q_alias;	/* address this results from */
+	char		*q_owner;	/* owner of q_alias */
+	struct address	*q_tchain;	/* temporary use chain */
+	time_t		q_timeout;	/* timeout for this address */
+};
+
+typedef struct address ADDRESS;
+
+# define QDONTSEND	000001	/* don't send to this address */
+# define QBADADDR	000002	/* this address is verified bad */
+# define QGOODUID	000004	/* the q_uid q_gid fields are good */
+# define QPRIMARY	000010	/* set from argv */
+# define QQUEUEUP	000020	/* queue for later transmission */
+# define QSENT		000040	/* has been successfully delivered */
+# define QNOTREMOTE	000100	/* not an address for remote forwarding */
+# define QSELFREF	000200	/* this address references itself */
+# define QVERIFIED	000400	/* verified, but not expanded */
+# define QREPORT	001000	/* report this address in return message */
+# define QBOGUSSHELL	002000	/* this entry has an invalid shell listed */
+# define QUNSAFEADDR	004000	/* address aquired through an unsafe path */
+
+# define NULLADDR	((ADDRESS *) NULL)
+/*
+**  Mailer definition structure.
+**	Every mailer known to the system is declared in this
+**	structure.  It defines the pathname of the mailer, some
+**	flags associated with it, and the argument vector to
+**	pass to it.  The flags are defined in conf.c
+**
+**	The argument vector is expanded before actual use.  All
+**	words except the first are passed through the macro
+**	processor.
+*/
+
+struct mailer
+{
+	char	*m_name;	/* symbolic name of this mailer */
+	char	*m_mailer;	/* pathname of the mailer to use */
+	BITMAP	m_flags;	/* status flags, see below */
+	short	m_mno;		/* mailer number internally */
+	char	**m_argv;	/* template argument vector */
+	short	m_sh_rwset;	/* rewrite set: sender header addresses */
+	short	m_se_rwset;	/* rewrite set: sender envelope addresses */
+	short	m_rh_rwset;	/* rewrite set: recipient header addresses */
+	short	m_re_rwset;	/* rewrite set: recipient envelope addresses */
+	char	*m_eol;		/* end of line string */
+	long	m_maxsize;	/* size limit on message to this mailer */
+	int	m_linelimit;	/* max # characters per line */
+	char	*m_execdir;	/* directory to chdir to before execv */
+};
+
+typedef struct mailer	MAILER;
+
+/* bits for m_flags */
+# define M_ESMTP	'a'	/* run Extended SMTP protocol */
+# define M_BLANKEND	'b'	/* ensure blank line at end of message */
+# define M_NOCOMMENT	'c'	/* don't include comment part of address */
+# define M_CANONICAL	'C'	/* make addresses canonical "u@dom" */
+		/*	'D'	/* CF: include Date: */
+# define M_EXPENSIVE	'e'	/* it costs to use this mailer.... */
+# define M_ESCFROM	'E'	/* escape From lines to >From */
+# define M_FOPT		'f'	/* mailer takes picky -f flag */
+		/*	'F'	/* CF: include From: or Resent-From: */
+# define M_NO_NULL_FROM	'g'	/* sender of errors should be $g */
+# define M_HST_UPPER	'h'	/* preserve host case distinction */
+# define M_PREHEAD	'H'	/* MAIL11V3: preview headers */
+# define M_INTERNAL	'I'	/* SMTP to another sendmail site */
+# define M_LOCALMAILER	'l'	/* delivery is to this host */
+# define M_LIMITS	'L'	/* must enforce SMTP line limits */
+# define M_MUSER	'm'	/* can handle multiple users at once */
+		/*	'M'	/* CF: include Message-Id: */
+# define M_NHDR		'n'	/* don't insert From line */
+# define M_MANYSTATUS	'N'	/* MAIL11V3: DATA returns multi-status */
+# define M_FROMPATH	'p'	/* use reverse-path in MAIL FROM: */
+		/*	'P'	/* CF: include Return-Path: */
+# define M_ROPT		'r'	/* mailer takes picky -r flag */
+# define M_SECURE_PORT	'R'	/* try to send on a reserved TCP port */
+# define M_STRIPQ	's'	/* strip quote chars from user/host */
+# define M_RESTR	'S'	/* must be daemon to execute */
+# define M_USR_UPPER	'u'	/* preserve user case distinction */
+# define M_UGLYUUCP	'U'	/* this wants an ugly UUCP from line */
+		/*	'V'	/* UIUC: !-relativize all addresses */
+		/*	'x'	/* CF: include Full-Name: */
+# define M_XDOT		'X'	/* use hidden-dot algorithm */
+# define M_7BITS	'7'	/* use 7-bit path */
+
+EXTERN MAILER	*Mailer[MAXMAILERS+1];
+
+EXTERN MAILER	*LocalMailer;		/* ptr to local mailer */
+EXTERN MAILER	*ProgMailer;		/* ptr to program mailer */
+EXTERN MAILER	*FileMailer;		/* ptr to *file* mailer */
+EXTERN MAILER	*InclMailer;		/* ptr to *include* mailer */
+/*
+**  Header structure.
+**	This structure is used internally to store header items.
+*/
+
+struct header
+{
+	char		*h_field;	/* the name of the field */
+	char		*h_value;	/* the value of that field */
+	struct header	*h_link;	/* the next header */
+	u_short		h_flags;	/* status bits, see below */
+	BITMAP		h_mflags;	/* m_flags bits needed */
+};
+
+typedef struct header	HDR;
+
+/*
+**  Header information structure.
+**	Defined in conf.c, this struct declares the header fields
+**	that have some magic meaning.
+*/
+
+struct hdrinfo
+{
+	char	*hi_field;	/* the name of the field */
+	u_short	hi_flags;	/* status bits, see below */
+};
+
+extern struct hdrinfo	HdrInfo[];
+
+/* bits for h_flags and hi_flags */
+# define H_EOH		00001	/* this field terminates header */
+# define H_RCPT		00002	/* contains recipient addresses */
+# define H_DEFAULT	00004	/* if another value is found, drop this */
+# define H_RESENT	00010	/* this address is a "Resent-..." address */
+# define H_CHECK	00020	/* check h_mflags against m_flags */
+# define H_ACHECK	00040	/* ditto, but always (not just default) */
+# define H_FORCE	00100	/* force this field, even if default */
+# define H_TRACE	00200	/* this field contains trace information */
+# define H_FROM		00400	/* this is a from-type field */
+# define H_VALID	01000	/* this field has a validated value */
+# define H_RECEIPTTO	02000	/* this field has return receipt info */
+# define H_ERRORSTO	04000	/* this field has error address info */
+/*
+**  Information about currently open connections to mailers, or to
+**  hosts that we have looked up recently.
+*/
+
+# define MCI		struct mailer_con_info
+
+MCI
+{
+	short		mci_flags;	/* flag bits, see below */
+	short		mci_errno;	/* error number on last connection */
+	short		mci_herrno;	/* h_errno from last DNS lookup */
+	short		mci_exitstat;	/* exit status from last connection */
+	short		mci_state;	/* SMTP state */
+	long		mci_maxsize;	/* max size this server will accept */
+	FILE		*mci_in;	/* input side of connection */
+	FILE		*mci_out;	/* output side of connection */
+	int		mci_pid;	/* process id of subordinate proc */
+	char		*mci_phase;	/* SMTP phase string */
+	struct mailer	*mci_mailer;	/* ptr to the mailer for this conn */
+	char		*mci_host;	/* host name */
+	time_t		mci_lastuse;	/* last usage time */
+};
+
+
+/* flag bits */
+#define MCIF_VALID	000001		/* this entry is valid */
+#define MCIF_TEMP	000002		/* don't cache this connection */
+#define MCIF_CACHED	000004		/* currently in open cache */
+#define MCIF_ESMTP	000010		/* this host speaks ESMTP */
+#define MCIF_EXPN	000020		/* EXPN command supported */
+#define MCIF_SIZE	000040		/* SIZE option supported */
+#define MCIF_8BITMIME	000100		/* BODY=8BITMIME supported */
+#define MCIF_7BIT	000200		/* strip this message to 7 bits */
+#define MCIF_MULTSTAT	000400		/* MAIL11V3: handles MULT status */
+
+/* states */
+#define MCIS_CLOSED	0		/* no traffic on this connection */
+#define MCIS_OPENING	1		/* sending initial protocol */
+#define MCIS_OPEN	2		/* open, initial protocol sent */
+#define MCIS_ACTIVE	3		/* message being sent */
+#define MCIS_QUITING	4		/* running quit protocol */
+#define MCIS_SSD	5		/* service shutting down */
+#define MCIS_ERROR	6		/* I/O error on connection */
+/*
+**  Envelope structure.
+**	This structure defines the message itself.  There is usually
+**	only one of these -- for the message that we originally read
+**	and which is our primary interest -- but other envelopes can
+**	be generated during processing.  For example, error messages
+**	will have their own envelope.
+*/
+
+# define ENVELOPE	struct envelope
+
+ENVELOPE
+{
+	HDR		*e_header;	/* head of header list */
+	long		e_msgpriority;	/* adjusted priority of this message */
+	time_t		e_ctime;	/* time message appeared in the queue */
+	char		*e_to;		/* the target person */
+	char		*e_receiptto;	/* return receipt address */
+	ADDRESS		e_from;		/* the person it is from */
+	char		*e_sender;	/* e_from.q_paddr w comments stripped */
+	char		**e_fromdomain;	/* the domain part of the sender */
+	ADDRESS		*e_sendqueue;	/* list of message recipients */
+	ADDRESS		*e_errorqueue;	/* the queue for error responses */
+	long		e_msgsize;	/* size of the message in bytes */
+	long		e_flags;	/* flags, see below */
+	int		e_nrcpts;	/* number of recipients */
+	short		e_class;	/* msg class (priority, junk, etc.) */
+	short		e_hopcount;	/* number of times processed */
+	short		e_nsent;	/* number of sends since checkpoint */
+	short		e_sendmode;	/* message send mode */
+	short		e_errormode;	/* error return mode */
+	int		(*e_puthdr)__P((MCI *, ENVELOPE *));
+					/* function to put header of message */
+	int		(*e_putbody)__P((MCI *, ENVELOPE *, char *));
+					/* function to put body of message */
+	struct envelope	*e_parent;	/* the message this one encloses */
+	struct envelope *e_sibling;	/* the next envelope of interest */
+	char		*e_bodytype;	/* type of message body */
+	char		*e_df;		/* location of temp file */
+	FILE		*e_dfp;		/* temporary file */
+	char		*e_id;		/* code for this entry in queue */
+	FILE		*e_xfp;		/* transcript file */
+	FILE		*e_lockfp;	/* the lock file for this message */
+	char		*e_message;	/* error message */
+	char		*e_statmsg;	/* stat msg (changes per delivery) */
+	char		*e_msgboundary;	/* MIME-style message part boundary */
+	char		*e_origrcpt;	/* original recipient (one only) */
+	char		*e_macro[128];	/* macro definitions */
+};
+
+/* values for e_flags */
+#define EF_OLDSTYLE	0x0000001	/* use spaces (not commas) in hdrs */
+#define EF_INQUEUE	0x0000002	/* this message is fully queued */
+#define EF_CLRQUEUE	0x0000008	/* disk copy is no longer needed */
+#define EF_SENDRECEIPT	0x0000010	/* send a return receipt */
+#define EF_FATALERRS	0x0000020	/* fatal errors occured */
+#define EF_KEEPQUEUE	0x0000040	/* keep queue files always */
+#define EF_RESPONSE	0x0000080	/* this is an error or return receipt */
+#define EF_RESENT	0x0000100	/* this message is being forwarded */
+#define EF_VRFYONLY	0x0000200	/* verify only (don't expand aliases) */
+#define EF_WARNING	0x0000400	/* warning message has been sent */
+#define EF_QUEUERUN	0x0000800	/* this envelope is from queue */
+#define EF_GLOBALERRS	0x0001000	/* treat errors as global */
+#define EF_PM_NOTIFY	0x0002000	/* send return mail to postmaster */
+#define EF_METOO	0x0004000	/* send to me too */
+#define EF_LOGSENDER	0x0008000	/* need to log the sender */
+#define EF_NORECEIPT	0x0010000	/* suppress all return-receipts */
+
+EXTERN ENVELOPE	*CurEnv;	/* envelope currently being processed */
+/*
+**  Message priority classes.
+**
+**	The message class is read directly from the Priority: header
+**	field in the message.
+**
+**	CurEnv->e_msgpriority is the number of bytes in the message plus
+**	the creation time (so that jobs ``tend'' to be ordered correctly),
+**	adjusted by the message class, the number of recipients, and the
+**	amount of time the message has been sitting around.  This number
+**	is used to order the queue.  Higher values mean LOWER priority.
+**
+**	Each priority class point is worth WkClassFact priority points;
+**	each recipient is worth WkRecipFact priority points.  Each time
+**	we reprocess a message the priority is adjusted by WkTimeFact.
+**	WkTimeFact should normally decrease the priority so that jobs
+**	that have historically failed will be run later; thanks go to
+**	Jay Lepreau at Utah for pointing out the error in my thinking.
+**
+**	The "class" is this number, unadjusted by the age or size of
+**	this message.  Classes with negative representations will have
+**	error messages thrown away if they are not local.
+*/
+
+struct priority
+{
+	char	*pri_name;	/* external name of priority */
+	int	pri_val;	/* internal value for same */
+};
+
+EXTERN struct priority	Priorities[MAXPRIORITIES];
+EXTERN int		NumPriorities;	/* pointer into Priorities */
+/*
+**  Rewrite rules.
+*/
+
+struct rewrite
+{
+	char	**r_lhs;	/* pattern match */
+	char	**r_rhs;	/* substitution value */
+	struct rewrite	*r_next;/* next in chain */
+};
+
+EXTERN struct rewrite	*RewriteRules[MAXRWSETS];
+
+/*
+**  Special characters in rewriting rules.
+**	These are used internally only.
+**	The COND* rules are actually used in macros rather than in
+**		rewriting rules, but are given here because they
+**		cannot conflict.
+*/
+
+/* left hand side items */
+# define MATCHZANY	0220	/* match zero or more tokens */
+# define MATCHANY	0221	/* match one or more tokens */
+# define MATCHONE	0222	/* match exactly one token */
+# define MATCHCLASS	0223	/* match one token in a class */
+# define MATCHNCLASS	0224	/* match anything not in class */
+# define MATCHREPL	0225	/* replacement on RHS for above */
+
+/* right hand side items */
+# define CANONNET	0226	/* canonical net, next token */
+# define CANONHOST	0227	/* canonical host, next token */
+# define CANONUSER	0230	/* canonical user, next N tokens */
+# define CALLSUBR	0231	/* call another rewriting set */
+
+/* conditionals in macros */
+# define CONDIF		0232	/* conditional if-then */
+# define CONDELSE	0233	/* conditional else */
+# define CONDFI		0234	/* conditional fi */
+
+/* bracket characters for host name lookup */
+# define HOSTBEGIN	0235	/* hostname lookup begin */
+# define HOSTEND	0236	/* hostname lookup end */
+
+/* bracket characters for generalized lookup */
+# define LOOKUPBEGIN	0205	/* generalized lookup begin */
+# define LOOKUPEND	0206	/* generalized lookup end */
+
+/* macro substitution character */
+# define MACROEXPAND	0201	/* macro expansion */
+# define MACRODEXPAND	0202	/* deferred macro expansion */
+
+/* to make the code clearer */
+# define MATCHZERO	CANONHOST
+
+/* external <==> internal mapping table */
+struct metamac
+{
+	char	metaname;	/* external code (after $) */
+	u_char	metaval;	/* internal code (as above) */
+};
+/*
+**  Name canonification short circuit.
+**
+**	If the name server for a host is down, the process of trying to
+**	canonify the name can hang.  This is similar to (but alas, not
+**	identical to) looking up the name for delivery.  This stab type
+**	caches the result of the name server lookup so we don't hang
+**	multiple times.
+*/
+
+#define NAMECANON	struct _namecanon
+
+NAMECANON
+{
+	short		nc_errno;	/* cached errno */
+	short		nc_herrno;	/* cached h_errno */
+	short		nc_stat;	/* cached exit status code */
+	short		nc_flags;	/* flag bits */
+	char		*nc_cname;	/* the canonical name */
+};
+
+/* values for nc_flags */
+#define NCF_VALID	0x0001	/* entry valid */
+/*
+**  Mapping functions
+**
+**	These allow arbitrary mappings in the config file.  The idea
+**	(albeit not the implementation) comes from IDA sendmail.
+*/
+
+# define MAPCLASS	struct _mapclass
+# define MAP		struct _map
+
+
+/*
+**  An actual map.
+*/
+
+MAP
+{
+	MAPCLASS	*map_class;	/* the class of this map */
+	char		*map_mname;	/* name of this map */
+	int		map_mflags;	/* flags, see below */
+	char		*map_file;	/* the (nominal) filename */
+	ARBPTR_T	map_db1;	/* the open database ptr */
+	ARBPTR_T	map_db2;	/* an "extra" database pointer */
+	char		*map_app;	/* to append to successful matches */
+	char		*map_domain;	/* the (nominal) NIS domain */
+	char		*map_rebuild;	/* program to run to do auto-rebuild */
+	time_t		map_mtime;	/* last database modification time */
+};
+
+/* bit values for map_flags */
+# define MF_VALID	0x0001		/* this entry is valid */
+# define MF_INCLNULL	0x0002		/* include null byte in key */
+# define MF_OPTIONAL	0x0004		/* don't complain if map not found */
+# define MF_NOFOLDCASE	0x0008		/* don't fold case in keys */
+# define MF_MATCHONLY	0x0010		/* don't use the map value */
+# define MF_OPEN	0x0020		/* this entry is open */
+# define MF_WRITABLE	0x0040		/* open for writing */
+# define MF_ALIAS	0x0080		/* this is an alias file */
+# define MF_TRY0NULL	0x0100		/* try with no null byte */
+# define MF_TRY1NULL	0x0200		/* try with the null byte */
+# define MF_LOCKED	0x0400		/* this map is currently locked */
+# define MF_ALIASWAIT	0x0800		/* alias map in aliaswait state */
+# define MF_IMPL_HASH	0x1000		/* implicit: underlying hash database */
+# define MF_IMPL_NDBM	0x2000		/* implicit: underlying NDBM database */
+
+
+/*
+**  The class of a map -- essentially the functions to call
+*/
+
+MAPCLASS
+{
+	char	*map_cname;		/* name of this map class */
+	char	*map_ext;		/* extension for database file */
+	short	map_cflags;		/* flag bits, see below */
+	bool	(*map_parse)__P((MAP *, char *));
+					/* argument parsing function */
+	char	*(*map_lookup)__P((MAP *, char *, char **, int *));
+					/* lookup function */
+	void	(*map_store)__P((MAP *, char *, char *));
+					/* store function */
+	bool	(*map_open)__P((MAP *, int));
+					/* open function */
+	void	(*map_close)__P((MAP *));
+					/* close function */
+};
+
+/* bit values for map_cflags */
+#define MCF_ALIASOK	0x0001		/* can be used for aliases */
+#define MCF_ALIASONLY	0x0002		/* usable only for aliases */
+#define MCF_REBUILDABLE	0x0004		/* can rebuild alias files */
+/*
+**  Symbol table definitions
+*/
+
+struct symtab
+{
+	char		*s_name;	/* name to be entered */
+	char		s_type;		/* general type (see below) */
+	struct symtab	*s_next;	/* pointer to next in chain */
+	union
+	{
+		BITMAP		sv_class;	/* bit-map of word classes */
+		ADDRESS		*sv_addr;	/* pointer to address header */
+		MAILER		*sv_mailer;	/* pointer to mailer */
+		char		*sv_alias;	/* alias */
+		MAPCLASS	sv_mapclass;	/* mapping function class */
+		MAP		sv_map;		/* mapping function */
+		char		*sv_hostsig;	/* host signature */
+		MCI		sv_mci;		/* mailer connection info */
+		NAMECANON	sv_namecanon;	/* canonical name cache */
+	}	s_value;
+};
+
+typedef struct symtab	STAB;
+
+/* symbol types */
+# define ST_UNDEF	0	/* undefined type */
+# define ST_CLASS	1	/* class map */
+# define ST_ADDRESS	2	/* an address in parsed format */
+# define ST_MAILER	3	/* a mailer header */
+# define ST_ALIAS	4	/* an alias */
+# define ST_MAPCLASS	5	/* mapping function class */
+# define ST_MAP		6	/* mapping function */
+# define ST_HOSTSIG	7	/* host signature */
+# define ST_NAMECANON	8	/* cached canonical name */
+# define ST_MCI		16	/* mailer connection info (offset) */
+
+# define s_class	s_value.sv_class
+# define s_address	s_value.sv_addr
+# define s_mailer	s_value.sv_mailer
+# define s_alias	s_value.sv_alias
+# define s_mci		s_value.sv_mci
+# define s_mapclass	s_value.sv_mapclass
+# define s_hostsig	s_value.sv_hostsig
+# define s_map		s_value.sv_map
+# define s_namecanon	s_value.sv_namecanon
+
+extern STAB		*stab __P((char *, int, int));
+extern void		stabapply __P((void (*)(STAB *, int), int));
+
+/* opcodes to stab */
+# define ST_FIND	0	/* find entry */
+# define ST_ENTER	1	/* enter if not there */
+/*
+**  STRUCT EVENT -- event queue.
+**
+**	Maintained in sorted order.
+**
+**	We store the pid of the process that set this event to insure
+**	that when we fork we will not take events intended for the parent.
+*/
+
+struct event
+{
+	time_t		ev_time;	/* time of the function call */
+	int		(*ev_func)__P((int));
+					/* function to call */
+	int		ev_arg;		/* argument to ev_func */
+	int		ev_pid;		/* pid that set this event */
+	struct event	*ev_link;	/* link to next item */
+};
+
+typedef struct event	EVENT;
+
+EXTERN EVENT	*EventQueue;		/* head of event queue */
+/*
+**  Operation, send, and error modes
+**
+**	The operation mode describes the basic operation of sendmail.
+**	This can be set from the command line, and is "send mail" by
+**	default.
+**
+**	The send mode tells how to send mail.  It can be set in the
+**	configuration file.  It's setting determines how quickly the
+**	mail will be delivered versus the load on your system.  If the
+**	-v (verbose) flag is given, it will be forced to SM_DELIVER
+**	mode.
+**
+**	The error mode tells how to return errors.
+*/
+
+EXTERN char	OpMode;		/* operation mode, see below */
+
+#define MD_DELIVER	'm'		/* be a mail sender */
+#define MD_SMTP		's'		/* run SMTP on standard input */
+#define MD_ARPAFTP	'a'		/* obsolete ARPANET mode (Grey Book) */
+#define MD_DAEMON	'd'		/* run as a daemon */
+#define MD_VERIFY	'v'		/* verify: don't collect or deliver */
+#define MD_TEST		't'		/* test mode: resolve addrs only */
+#define MD_INITALIAS	'i'		/* initialize alias database */
+#define MD_PRINT	'p'		/* print the queue */
+#define MD_FREEZE	'z'		/* freeze the configuration file */
+
+
+/* values for e_sendmode -- send modes */
+#define SM_DELIVER	'i'		/* interactive delivery */
+#define SM_QUICKD	'j'		/* deliver w/o queueing */
+#define SM_FORK		'b'		/* deliver in background */
+#define SM_QUEUE	'q'		/* queue, don't deliver */
+#define SM_VERIFY	'v'		/* verify only (used internally) */
+
+/* used only as a parameter to sendall */
+#define SM_DEFAULT	'\0'		/* unspecified, use SendMode */
+
+
+/* values for e_errormode -- error handling modes */
+#define EM_PRINT	'p'		/* print errors */
+#define EM_MAIL		'm'		/* mail back errors */
+#define EM_WRITE	'w'		/* write back errors */
+#define EM_BERKNET	'e'		/* special berknet processing */
+#define EM_QUIET	'q'		/* don't print messages (stat only) */
+/*
+**  Additional definitions
+*/
+
+
+/*
+**  Privacy flags
+**	These are bit values for the PrivacyFlags word.
+*/
+
+#define PRIV_PUBLIC		0	/* what have I got to hide? */
+#define PRIV_NEEDMAILHELO	00001	/* insist on HELO for MAIL, at least */
+#define PRIV_NEEDEXPNHELO	00002	/* insist on HELO for EXPN */
+#define PRIV_NEEDVRFYHELO	00004	/* insist on HELO for VRFY */
+#define PRIV_NOEXPN		00010	/* disallow EXPN command entirely */
+#define PRIV_NOVRFY		00020	/* disallow VRFY command entirely */
+#define PRIV_AUTHWARNINGS	00040	/* flag possible authorization probs */
+#define PRIV_NORECEIPTS		00100	/* disallow return receipts */
+#define PRIV_RESTRICTMAILQ	01000	/* restrict mailq command */
+#define PRIV_RESTRICTQRUN	02000	/* restrict queue run */
+#define PRIV_GOAWAY		00777	/* don't give no info, anyway, anyhow */
+
+/* struct defining such things */
+struct prival
+{
+	char	*pv_name;	/* name of privacy flag */
+	int	pv_flag;	/* numeric level */
+};
+
+
+/*
+**  Flags passed to remotename, parseaddr, allocaddr, and buildaddr.
+*/
+
+#define RF_SENDERADDR		0001	/* this is a sender address */
+#define RF_HEADERADDR		0002	/* this is a header address */
+#define RF_CANONICAL		0004	/* strip comment information */
+#define RF_ADDDOMAIN		0010	/* OK to do domain extension */
+#define RF_COPYPARSE		0020	/* copy parsed user & host */
+#define RF_COPYPADDR		0040	/* copy print address */
+#define RF_COPYALL		(RF_COPYPARSE|RF_COPYPADDR)
+#define RF_COPYNONE		0
+
+
+/*
+**  Flags passed to safefile.
+*/
+
+#define SFF_ANYFILE		0	/* no special restrictions */
+#define SFF_MUSTOWN		0x0001	/* user must own this file */
+#define SFF_NOSLINK		0x0002	/* file cannot be a symbolic link */
+#define SFF_ROOTOK		0x0004	/* ok for root to own this file */
+
+
+/*
+**  Regular UNIX sockaddrs are too small to handle ISO addresses, so
+**  we are forced to declare a supertype here.
+*/
+
+union bigsockaddr
+{
+	struct sockaddr		sa;	/* general version */
+#ifdef NETUNIX
+	struct sockaddr_un	sunix;	/* UNIX family */
+#endif
+#ifdef NETINET
+	struct sockaddr_in	sin;	/* INET family */
+#endif
+#ifdef NETISO
+	struct sockaddr_iso	siso;	/* ISO family */
+#endif
+#ifdef NETNS
+	struct sockaddr_ns	sns;	/* XNS family */
+#endif
+#ifdef NETX25
+	struct sockaddr_x25	sx25;	/* X.25 family */
+#endif
+};
+
+#define SOCKADDR	union bigsockaddr
+/*
+**  Global variables.
+*/
+
+EXTERN bool	FromFlag;	/* if set, "From" person is explicit */
+EXTERN bool	MeToo;		/* send to the sender also */
+EXTERN bool	IgnrDot;	/* don't let dot end messages */
+EXTERN bool	SaveFrom;	/* save leading "From" lines */
+EXTERN bool	Verbose;	/* set if blow-by-blow desired */
+EXTERN bool	GrabTo;		/* if set, get recipients from msg */
+EXTERN bool	NoReturn;	/* don't return letter to sender */
+EXTERN bool	SuprErrs;	/* set if we are suppressing errors */
+EXTERN bool	HoldErrs;	/* only output errors to transcript */
+EXTERN bool	NoConnect;	/* don't connect to non-local mailers */
+EXTERN bool	SuperSafe;	/* be extra careful, even if expensive */
+EXTERN bool	ForkQueueRuns;	/* fork for each job when running the queue */
+EXTERN bool	AutoRebuild;	/* auto-rebuild the alias database as needed */
+EXTERN bool	CheckAliases;	/* parse addresses during newaliases */
+EXTERN bool	NoAlias;	/* suppress aliasing */
+EXTERN bool	UseNameServer;	/* use internet domain name server */
+EXTERN bool	SevenBit;	/* force 7-bit data */
+EXTERN time_t	SafeAlias;	/* interval to wait until @:@ in alias file */
+EXTERN FILE	*InChannel;	/* input connection */
+EXTERN FILE	*OutChannel;	/* output connection */
+EXTERN uid_t	RealUid;	/* when Daemon, real uid of caller */
+EXTERN gid_t	RealGid;	/* when Daemon, real gid of caller */
+EXTERN uid_t	DefUid;		/* default uid to run as */
+EXTERN gid_t	DefGid;		/* default gid to run as */
+EXTERN char	*DefUser;	/* default user to run as (from DefUid) */
+EXTERN int	OldUmask;	/* umask when sendmail starts up */
+EXTERN int	Errors;		/* set if errors (local to single pass) */
+EXTERN int	ExitStat;	/* exit status code */
+EXTERN int	AliasLevel;	/* depth of aliasing */
+EXTERN int	LineNumber;	/* line number in current input */
+EXTERN int	LogLevel;	/* level of logging to perform */
+EXTERN int	FileMode;	/* mode on files */
+EXTERN int	QueueLA;	/* load average starting forced queueing */
+EXTERN int	RefuseLA;	/* load average refusing connections are */
+EXTERN int	CurrentLA;	/* current load average */
+EXTERN long	QueueFactor;	/* slope of queue function */
+EXTERN time_t	QueueIntvl;	/* intervals between running the queue */
+EXTERN char	*HelpFile;	/* location of SMTP help file */
+EXTERN char	*ErrMsgFile;	/* file to prepend to all error messages */
+EXTERN char	*StatFile;	/* location of statistics summary */
+EXTERN char	*QueueDir;	/* location of queue directory */
+EXTERN char	*FileName;	/* name to print on error messages */
+EXTERN char	*SmtpPhase;	/* current phase in SMTP processing */
+EXTERN char	*MyHostName;	/* name of this host for SMTP messages */
+EXTERN char	*RealHostName;	/* name of host we are talking to */
+EXTERN SOCKADDR RealHostAddr;	/* address of host we are talking to */
+EXTERN char	*CurHostName;	/* current host we are dealing with */
+EXTERN jmp_buf	TopFrame;	/* branch-to-top-of-loop-on-error frame */
+EXTERN bool	QuickAbort;	/*  .... but only if we want a quick abort */
+EXTERN bool	LogUsrErrs;	/* syslog user errors (e.g., SMTP RCPT cmd) */
+EXTERN bool	SendMIMEErrors;	/* send error messages in MIME format */
+EXTERN bool	MatchGecos;	/* look for user names in gecos field */
+EXTERN bool	UseErrorsTo;	/* use Errors-To: header (back compat) */
+EXTERN bool	TryNullMXList;	/* if we are the best MX, try host directly */
+extern bool	CheckLoopBack;	/* check for loopback on HELO packet */
+EXTERN bool	InChild;	/* true if running in an SMTP subprocess */
+EXTERN bool	DisConnected;	/* running with OutChannel redirected to xf */
+EXTERN char	SpaceSub;	/* substitution for <lwsp> */
+EXTERN int	PrivacyFlags;	/* privacy flags */
+EXTERN char	*ConfFile;	/* location of configuration file [conf.c] */
+extern char	*PidFile;	/* location of proc id file [conf.c] */
+extern ADDRESS	NullAddress;	/* a null (template) address [main.c] */
+EXTERN long	WkClassFact;	/* multiplier for message class -> priority */
+EXTERN long	WkRecipFact;	/* multiplier for # of recipients -> priority */
+EXTERN long	WkTimeFact;	/* priority offset each time this job is run */
+EXTERN char	*UdbSpec;	/* user database source spec */
+EXTERN int	MaxHopCount;	/* max # of hops until bounce */
+EXTERN int	ConfigLevel;	/* config file level */
+EXTERN char	*TimeZoneSpec;	/* override time zone specification */
+EXTERN char	*ForwardPath;	/* path to search for .forward files */
+EXTERN long	MinBlocksFree;	/* min # of blocks free on queue fs */
+EXTERN char	*FallBackMX;	/* fall back MX host */
+EXTERN long	MaxMessageSize;	/* advertised max size we will accept */
+EXTERN char	*PostMasterCopy;	/* address to get errs cc's */
+EXTERN int	CheckpointInterval;	/* queue file checkpoint interval */
+EXTERN bool	DontPruneRoutes;	/* don't prune source routes */
+extern bool	BrokenSmtpPeers;	/* peers can't handle 2-line greeting */
+EXTERN int	MaxMciCache;		/* maximum entries in MCI cache */
+EXTERN time_t	MciCacheTimeout;	/* maximum idle time on connections */
+EXTERN char	*QueueLimitRecipient;	/* limit queue runs to this recipient */
+EXTERN char	*QueueLimitSender;	/* limit queue runs to this sender */
+EXTERN char	*QueueLimitId;		/* limit queue runs to this id */
+EXTERN FILE	*TrafficLogFile;	/* file in which to log all traffic */
+extern int	errno;
+
+
+/*
+**  Timeouts
+**
+**	Indicated values are the MINIMUM per RFC 1123 section 5.3.2.
+*/
+
+EXTERN struct
+{
+			/* RFC 1123-specified timeouts [minimum value] */
+	time_t	to_initial;	/* initial greeting timeout [5m] */
+	time_t	to_mail;	/* MAIL command [5m] */
+	time_t	to_rcpt;	/* RCPT command [5m] */
+	time_t	to_datainit;	/* DATA initiation [2m] */
+	time_t	to_datablock;	/* DATA block [3m] */
+	time_t	to_datafinal;	/* DATA completion [10m] */
+	time_t	to_nextcommand;	/* next command [5m] */
+			/* following timeouts are not mentioned in RFC 1123 */
+	time_t	to_rset;	/* RSET command */
+	time_t	to_helo;	/* HELO command */
+	time_t	to_quit;	/* QUIT command */
+	time_t	to_miscshort;	/* misc short commands (NOOP, VERB, etc) */
+	time_t	to_ident;	/* IDENT protocol requests */
+			/* following are per message */
+	time_t	to_q_return;	/* queue return timeout */
+	time_t	to_q_warning;	/* queue warning timeout */
+} TimeOuts;
+
+
+/*
+**  Trace information
+*/
+
+/* trace vector and macros for debugging flags */
+EXTERN u_char	tTdvect[100];
+# define tTd(flag, level)	(tTdvect[flag] >= level)
+# define tTdlevel(flag)		(tTdvect[flag])
+/*
+**  Miscellaneous information.
+*/
+
+
+
+/*
+**  Some in-line functions
+*/
+
+/* set exit status */
+#define setstat(s)	{ \
+				if (ExitStat == EX_OK || ExitStat == EX_TEMPFAIL) \
+					ExitStat = s; \
+			}
+
+/* make a copy of a string */
+#define newstr(s)	strcpy(xalloc(strlen(s) + 1), s)
+
+#define STRUCTCOPY(s, d)	d = s
+
+
+/*
+**  Declarations of useful functions
+*/
+
+extern ADDRESS		*parseaddr __P((char *, ADDRESS *, int, int, char **, ENVELOPE *));
+extern char		*xalloc __P((int));
+extern bool		sameaddr __P((ADDRESS *, ADDRESS *));
+extern FILE		*dfopen __P((char *, int, int));
+extern EVENT		*setevent __P((time_t, int(*)(), int));
+extern char		*sfgets __P((char *, int, FILE *, time_t, char *));
+extern char		*queuename __P((ENVELOPE *, int));
+extern time_t		curtime __P(());
+extern bool		transienterror __P((int));
+extern const char	*errstring __P((int));
+extern void		expand __P((char *, char *, char *, ENVELOPE *));
+extern void		define __P((int, char *, ENVELOPE *));
+extern char		*macvalue __P((int, ENVELOPE *));
+extern char		**prescan __P((char *, int, char[], int, char **));
+extern int		rewrite __P((char **, int, int, ENVELOPE *));
+extern char		*fgetfolded __P((char *, int, FILE *));
+extern ADDRESS		*recipient __P((ADDRESS *, ADDRESS **, ENVELOPE *));
+extern ENVELOPE		*newenvelope __P((ENVELOPE *, ENVELOPE *));
+extern void		dropenvelope __P((ENVELOPE *));
+extern void		clearenvelope __P((ENVELOPE *, int));
+extern char		*username __P(());
+extern MCI		*mci_get __P((char *, MAILER *));
+extern char		*pintvl __P((time_t, int));
+extern char		*map_rewrite __P((MAP *, char *, int, char **));
+extern ADDRESS		*getctladdr __P((ADDRESS *));
+extern char		*anynet_ntoa __P((SOCKADDR *));
+extern char		*remotename __P((char *, MAILER *, int, int *, ENVELOPE *));
+extern bool		shouldqueue __P((long, time_t));
+extern bool		lockfile __P((int, char *, char *, int));
+extern char		*hostsignature __P((MAILER *, char *, ENVELOPE *));
+extern void		openxscript __P((ENVELOPE *));
+extern void		closexscript __P((ENVELOPE *));
+extern sigfunc_t	setsignal __P((int, sigfunc_t));
+extern char		*shortenstring __P((char *, int));
+extern bool		usershellok __P((char *));
+extern void		commaize __P((HDR *, char *, int, MCI *, ENVELOPE *));
+extern char		*denlstring __P((char *, int, int));
+
+/* ellipsis is a different case though */
+#ifdef __STDC__
+extern void		auth_warning(ENVELOPE *, const char *, ...);
+extern void		syserr(const char *, ...);
+extern void		usrerr(const char *, ...);
+extern void		message(const char *, ...);
+extern void		nmessage(const char *, ...);
+#else
+extern void		auth_warning();
+extern void		syserr();
+extern void		usrerr();
+extern void		message();
+extern void		nmessage();
+#endif
diff --git a/usr.sbin/sendmail/src/sendmail.hf b/usr.sbin/sendmail/src/sendmail.hf
new file mode 100644
index 00000000000..142a7f57705
--- /dev/null
+++ b/usr.sbin/sendmail/src/sendmail.hf
@@ -0,0 +1,58 @@
+cpyr
+cpyr	Copyright (c) 1983  Eric P. Allman
+cpyr	Copyright (c) 1988, 1993
+cpyr	    The Regents of the University of California.  All rights reserved.
+cpyr	
+cpyr	@(#)sendmail.hf	8.2 (Berkeley) 7/16/93
+cpyr
+smtp	Commands:
+smtp		HELO	EHLO	MAIL	RCPT	DATA
+smtp		RSET	NOOP	QUIT	HELP	VRFY
+smtp		EXPN	VERB
+smtp	For more info use "HELP <topic>".
+smtp	To report bugs in the implementation send email to
+smtp		sendmail@CS.Berkeley.EDU.
+smtp	For local information send email to Postmaster at your site.
+help	HELP [ <topic> ]
+help		The HELP command gives help info.
+helo	HELO <hostname>
+helo		Introduce yourself.
+ehlo	EHLO <hostname>
+ehlo		Introduce yourself, and request extended SMTP mode.
+mail	MAIL FROM: <sender>
+mail		Specifies the sender.
+rcpt	RCPT TO: <recipient>
+rcpt		Specifies the recipient.  Can be used any number of times.
+data	DATA
+data		Following text is collected as the message.
+data		End with a single dot.
+rset	RSET
+rset		Resets the system.
+quit	QUIT
+quit		Exit sendmail (SMTP).
+verb	VERB
+verb		Go into verbose mode.  This sends 0xy responses that are
+verb		are not RFC821 standard (but should be)  They are recognized
+verb		by humans and other sendmail implementations.
+vrfy	VRFY <recipient>
+vrfy		Verify an address.  If you want to see what it aliases
+vrfy		to, use EXPN instead.
+expn	EXPN <recipient>
+expn		Expand an address.  If the address indicates a mailing
+expn		list, return the contents of that list.
+noop	NOOP
+noop		Do nothing.
+send	SEND FROM: <sender>
+send		replaces the MAIL command, and can be used to send
+send		directly to a users terminal.  Not supported in this
+send		implementation.
+soml	SOML FROM: <sender>
+soml		Send or mail.  If the user is logged in, send directly,
+soml		otherwise mail.  Not supported in this implementation.
+saml	SAML FROM: <sender>
+saml		Send and mail.  Send directly to the user's terminal,
+saml		and also mail a letter.  Not supported in this
+saml		implementation.
+turn	TURN
+turn		Reverses the direction of the connection.  Not currently
+turn		implemented.
diff --git a/usr.sbin/sendmail/src/srvrsmtp.c b/usr.sbin/sendmail/src/srvrsmtp.c
new file mode 100644
index 00000000000..eef525de730
--- /dev/null
+++ b/usr.sbin/sendmail/src/srvrsmtp.c
@@ -0,0 +1,1032 @@
+/*
+ * Copyright (c) 1983 Eric P. Allman
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+# include "sendmail.h"
+
+#ifndef lint
+#ifdef SMTP
+static char sccsid[] = "@(#)srvrsmtp.c	8.37 (Berkeley) 4/13/94 (with SMTP)";
+#else
+static char sccsid[] = "@(#)srvrsmtp.c	8.37 (Berkeley) 4/13/94 (without SMTP)";
+#endif
+#endif /* not lint */
+
+# include <errno.h>
+
+# ifdef SMTP
+
+/*
+**  SMTP -- run the SMTP protocol.
+**
+**	Parameters:
+**		none.
+**
+**	Returns:
+**		never.
+**
+**	Side Effects:
+**		Reads commands from the input channel and processes
+**			them.
+*/
+
+struct cmd
+{
+	char	*cmdname;	/* command name */
+	int	cmdcode;	/* internal code, see below */
+};
+
+/* values for cmdcode */
+# define CMDERROR	0	/* bad command */
+# define CMDMAIL	1	/* mail -- designate sender */
+# define CMDRCPT	2	/* rcpt -- designate recipient */
+# define CMDDATA	3	/* data -- send message text */
+# define CMDRSET	4	/* rset -- reset state */
+# define CMDVRFY	5	/* vrfy -- verify address */
+# define CMDEXPN	6	/* expn -- expand address */
+# define CMDNOOP	7	/* noop -- do nothing */
+# define CMDQUIT	8	/* quit -- close connection and die */
+# define CMDHELO	9	/* helo -- be polite */
+# define CMDHELP	10	/* help -- give usage info */
+# define CMDEHLO	11	/* ehlo -- extended helo (RFC 1425) */
+/* non-standard commands */
+# define CMDONEX	16	/* onex -- sending one transaction only */
+# define CMDVERB	17	/* verb -- go into verbose mode */
+/* use this to catch and log "door handle" attempts on your system */
+# define CMDLOGBOGUS	23	/* bogus command that should be logged */
+/* debugging-only commands, only enabled if SMTPDEBUG is defined */
+# define CMDDBGQSHOW	24	/* showq -- show send queue */
+# define CMDDBGDEBUG	25	/* debug -- set debug mode */
+
+static struct cmd	CmdTab[] =
+{
+	"mail",		CMDMAIL,
+	"rcpt",		CMDRCPT,
+	"data",		CMDDATA,
+	"rset",		CMDRSET,
+	"vrfy",		CMDVRFY,
+	"expn",		CMDEXPN,
+	"help",		CMDHELP,
+	"noop",		CMDNOOP,
+	"quit",		CMDQUIT,
+	"helo",		CMDHELO,
+	"ehlo",		CMDEHLO,
+	"verb",		CMDVERB,
+	"onex",		CMDONEX,
+	/*
+	 * remaining commands are here only
+	 * to trap and log attempts to use them
+	 */
+	"showq",	CMDDBGQSHOW,
+	"debug",	CMDDBGDEBUG,
+	"wiz",		CMDLOGBOGUS,
+	NULL,		CMDERROR,
+};
+
+bool	OneXact = FALSE;		/* one xaction only this run */
+char	*CurSmtpClient;			/* who's at the other end of channel */
+
+static char	*skipword();
+extern char	RealUserName[];
+
+
+#define MAXBADCOMMANDS	25		/* maximum number of bad commands */
+
+smtp(e)
+	register ENVELOPE *e;
+{
+	register char *p;
+	register struct cmd *c;
+	char *cmd;
+	auto ADDRESS *vrfyqueue;
+	ADDRESS *a;
+	bool gotmail;			/* mail command received */
+	bool gothello;			/* helo command received */
+	bool vrfy;			/* set if this is a vrfy command */
+	char *protocol;			/* sending protocol */
+	char *sendinghost;		/* sending hostname */
+	unsigned long msize;		/* approximate maximum message size */
+	char *peerhostname;		/* name of SMTP peer or "localhost" */
+	auto char *delimptr;
+	char *id;
+	int nrcpts;			/* number of RCPT commands */
+	bool doublequeue;
+	int badcommands = 0;		/* count of bad commands */
+	char inp[MAXLINE];
+	char cmdbuf[MAXLINE];
+	extern char Version[];
+	extern ENVELOPE BlankEnvelope;
+
+	if (fileno(OutChannel) != fileno(stdout))
+	{
+		/* arrange for debugging output to go to remote host */
+		(void) dup2(fileno(OutChannel), fileno(stdout));
+	}
+	settime(e);
+	peerhostname = RealHostName;
+	if (peerhostname == NULL)
+		peerhostname = "localhost";
+	CurHostName = peerhostname;
+	CurSmtpClient = macvalue('_', e);
+	if (CurSmtpClient == NULL)
+		CurSmtpClient = CurHostName;
+
+	setproctitle("server %s startup", CurSmtpClient);
+	expand("\201e", inp, &inp[sizeof inp], e);
+	if (BrokenSmtpPeers)
+	{
+		p = strchr(inp, '\n');
+		if (p != NULL)
+			*p = '\0';
+		message("220 %s", inp);
+	}
+	else
+	{
+		char *q = inp;
+
+		while (q != NULL)
+		{
+			p = strchr(q, '\n');
+			if (p != NULL)
+				*p++ = '\0';
+			message("220-%s", q);
+			q = p;
+		}
+		message("220 ESMTP spoken here");
+	}
+	protocol = NULL;
+	sendinghost = macvalue('s', e);
+	gothello = FALSE;
+	gotmail = FALSE;
+	for (;;)
+	{
+		/* arrange for backout */
+		if (setjmp(TopFrame) > 0)
+		{
+			/* if() nesting is necessary for Cray UNICOS */
+			if (InChild)
+			{
+				QuickAbort = FALSE;
+				SuprErrs = TRUE;
+				finis();
+			}
+		}
+		QuickAbort = FALSE;
+		HoldErrs = FALSE;
+		LogUsrErrs = FALSE;
+		e->e_flags &= ~(EF_VRFYONLY|EF_GLOBALERRS);
+
+		/* setup for the read */
+		e->e_to = NULL;
+		Errors = 0;
+		(void) fflush(stdout);
+
+		/* read the input line */
+		SmtpPhase = "server cmd read";
+		setproctitle("server %s cmd read", CurHostName);
+		p = sfgets(inp, sizeof inp, InChannel, TimeOuts.to_nextcommand,
+				SmtpPhase);
+
+		/* handle errors */
+		if (p == NULL)
+		{
+			/* end of file, just die */
+			disconnect(1, e);
+			message("421 %s Lost input channel from %s",
+				MyHostName, CurSmtpClient);
+#ifdef LOG
+			if (LogLevel > (gotmail ? 1 : 19))
+				syslog(LOG_NOTICE, "lost input channel from %s",
+					CurSmtpClient);
+#endif
+			if (InChild)
+				ExitStat = EX_QUIT;
+			finis();
+		}
+
+		/* clean up end of line */
+		fixcrlf(inp, TRUE);
+
+		/* echo command to transcript */
+		if (e->e_xfp != NULL)
+			fprintf(e->e_xfp, "<<< %s\n", inp);
+
+		if (e->e_id == NULL)
+			setproctitle("%s: %.80s", CurSmtpClient, inp);
+		else
+			setproctitle("%s %s: %.80s", e->e_id, CurSmtpClient, inp);
+
+		/* break off command */
+		for (p = inp; isascii(*p) && isspace(*p); p++)
+			continue;
+		cmd = cmdbuf;
+		while (*p != '\0' &&
+		       !(isascii(*p) && isspace(*p)) &&
+		       cmd < &cmdbuf[sizeof cmdbuf - 2])
+			*cmd++ = *p++;
+		*cmd = '\0';
+
+		/* throw away leading whitespace */
+		while (isascii(*p) && isspace(*p))
+			p++;
+
+		/* decode command */
+		for (c = CmdTab; c->cmdname != NULL; c++)
+		{
+			if (!strcasecmp(c->cmdname, cmdbuf))
+				break;
+		}
+
+		/* reset errors */
+		errno = 0;
+
+		/* process command */
+		switch (c->cmdcode)
+		{
+		  case CMDHELO:		/* hello -- introduce yourself */
+		  case CMDEHLO:		/* extended hello */
+			if (c->cmdcode == CMDEHLO)
+			{
+				protocol = "ESMTP";
+				SmtpPhase = "server EHLO";
+			}
+			else
+			{
+				protocol = "SMTP";
+				SmtpPhase = "server HELO";
+			}
+			sendinghost = newstr(p);
+			gothello = TRUE;
+			if (c->cmdcode != CMDEHLO)
+			{
+				/* print old message and be done with it */
+				message("250 %s Hello %s, pleased to meet you",
+					MyHostName, CurSmtpClient);
+				break;
+			}
+			
+			/* print extended message and brag */
+			message("250-%s Hello %s, pleased to meet you",
+				MyHostName, CurSmtpClient);
+			if (!bitset(PRIV_NOEXPN, PrivacyFlags))
+				message("250-EXPN");
+			if (MaxMessageSize > 0)
+				message("250-SIZE %ld", MaxMessageSize);
+			else
+				message("250-SIZE");
+			message("250 HELP");
+			break;
+
+		  case CMDMAIL:		/* mail -- designate sender */
+			SmtpPhase = "server MAIL";
+
+			/* check for validity of this command */
+			if (!gothello)
+			{
+				/* set sending host to our known value */
+				if (sendinghost == NULL)
+					sendinghost = peerhostname;
+
+				if (bitset(PRIV_NEEDMAILHELO, PrivacyFlags))
+				{
+					message("503 Polite people say HELO first");
+					break;
+				}
+			}
+			if (gotmail)
+			{
+				message("503 Sender already specified");
+				if (InChild)
+					finis();
+				break;
+			}
+			if (InChild)
+			{
+				errno = 0;
+				syserr("503 Nested MAIL command: MAIL %s", p);
+				finis();
+			}
+
+			/* fork a subprocess to process this command */
+			if (runinchild("SMTP-MAIL", e) > 0)
+				break;
+			if (!gothello)
+			{
+				auth_warning(e,
+					"Host %s didn't use HELO protocol",
+					peerhostname);
+			}
+#ifdef PICKY_HELO_CHECK
+			if (strcasecmp(sendinghost, peerhostname) != 0 &&
+			    (strcasecmp(peerhostname, "localhost") != 0 ||
+			     strcasecmp(sendinghost, MyHostName) != 0))
+			{
+				auth_warning(e, "Host %s claimed to be %s",
+					peerhostname, sendinghost);
+			}
+#endif
+
+			if (protocol == NULL)
+				protocol = "SMTP";
+			define('r', protocol, e);
+			define('s', sendinghost, e);
+			initsys(e);
+			nrcpts = 0;
+			e->e_flags |= EF_LOGSENDER;
+			setproctitle("%s %s: %.80s", e->e_id, CurSmtpClient, inp);
+
+			/* child -- go do the processing */
+			p = skipword(p, "from");
+			if (p == NULL)
+				break;
+			if (setjmp(TopFrame) > 0)
+			{
+				/* this failed -- undo work */
+				if (InChild)
+				{
+					QuickAbort = FALSE;
+					SuprErrs = TRUE;
+					e->e_flags &= ~EF_FATALERRS;
+					finis();
+				}
+				break;
+			}
+			QuickAbort = TRUE;
+
+			/* must parse sender first */
+			delimptr = NULL;
+			setsender(p, e, &delimptr, FALSE);
+			p = delimptr;
+			if (p != NULL && *p != '\0')
+				*p++ = '\0';
+
+			/* check for possible spoofing */
+			if (RealUid != 0 && OpMode == MD_SMTP &&
+			    (e->e_from.q_mailer != LocalMailer &&
+			     strcmp(e->e_from.q_user, RealUserName) != 0))
+			{
+				auth_warning(e, "%s owned process doing -bs",
+					RealUserName);
+			}
+
+			/* now parse ESMTP arguments */
+			msize = 0;
+			while (p != NULL && *p != '\0')
+			{
+				char *kp;
+				char *vp = NULL;
+
+				/* locate the beginning of the keyword */
+				while (isascii(*p) && isspace(*p))
+					p++;
+				if (*p == '\0')
+					break;
+				kp = p;
+
+				/* skip to the value portion */
+				while (isascii(*p) && isalnum(*p) || *p == '-')
+					p++;
+				if (*p == '=')
+				{
+					*p++ = '\0';
+					vp = p;
+
+					/* skip to the end of the value */
+					while (*p != '\0' && *p != ' ' &&
+					       !(isascii(*p) && iscntrl(*p)) &&
+					       *p != '=')
+						p++;
+				}
+
+				if (*p != '\0')
+					*p++ = '\0';
+
+				if (tTd(19, 1))
+					printf("MAIL: got arg %s=\"%s\"\n", kp,
+						vp == NULL ? "<null>" : vp);
+
+				if (strcasecmp(kp, "size") == 0)
+				{
+					if (vp == NULL)
+					{
+						usrerr("501 SIZE requires a value");
+						/* NOTREACHED */
+					}
+# ifdef __STDC__
+					msize = strtoul(vp, (char **) NULL, 10);
+# else
+					msize = strtol(vp, (char **) NULL, 10);
+# endif
+				}
+				else if (strcasecmp(kp, "body") == 0)
+				{
+					if (vp == NULL)
+					{
+						usrerr("501 BODY requires a value");
+						/* NOTREACHED */
+					}
+# ifdef MIME
+					if (strcasecmp(vp, "8bitmime") == 0)
+					{
+						e->e_bodytype = "8BITMIME";
+						SevenBit = FALSE;
+					}
+					else if (strcasecmp(vp, "7bit") == 0)
+					{
+						e->e_bodytype = "7BIT";
+						SevenBit = TRUE;
+					}
+					else
+					{
+						usrerr("501 Unknown BODY type %s",
+							vp);
+					}
+# endif
+				}
+				else
+				{
+					usrerr("501 %s parameter unrecognized", kp);
+					/* NOTREACHED */
+				}
+			}
+
+			if (MaxMessageSize > 0 && msize > MaxMessageSize)
+			{
+				usrerr("552 Message size exceeds fixed maximum message size (%ld)",
+					MaxMessageSize);
+				/* NOTREACHED */
+			}
+				
+			if (!enoughspace(msize))
+			{
+				message("452 Insufficient disk space; try again later");
+				break;
+			}
+			message("250 Sender ok");
+			gotmail = TRUE;
+			break;
+
+		  case CMDRCPT:		/* rcpt -- designate recipient */
+			if (!gotmail)
+			{
+				usrerr("503 Need MAIL before RCPT");
+				break;
+			}
+			SmtpPhase = "server RCPT";
+			if (setjmp(TopFrame) > 0)
+			{
+				e->e_flags &= ~EF_FATALERRS;
+				break;
+			}
+			QuickAbort = TRUE;
+			LogUsrErrs = TRUE;
+
+			if (e->e_sendmode != SM_DELIVER)
+				e->e_flags |= EF_VRFYONLY;
+
+			p = skipword(p, "to");
+			if (p == NULL)
+				break;
+			a = parseaddr(p, NULLADDR, RF_COPYALL, ' ', NULL, e);
+			if (a == NULL)
+				break;
+			a->q_flags |= QPRIMARY;
+			a = recipient(a, &e->e_sendqueue, e);
+			if (Errors != 0)
+				break;
+
+			/* no errors during parsing, but might be a duplicate */
+			e->e_to = p;
+			if (!bitset(QBADADDR, a->q_flags))
+			{
+				message("250 Recipient ok%s",
+					bitset(QQUEUEUP, a->q_flags) ?
+						" (will queue)" : "");
+				nrcpts++;
+			}
+			else
+			{
+				/* punt -- should keep message in ADDRESS.... */
+				message("550 Addressee unknown");
+			}
+			e->e_to = NULL;
+			break;
+
+		  case CMDDATA:		/* data -- text of mail */
+			SmtpPhase = "server DATA";
+			if (!gotmail)
+			{
+				message("503 Need MAIL command");
+				break;
+			}
+			else if (nrcpts <= 0)
+			{
+				message("503 Need RCPT (recipient)");
+				break;
+			}
+
+			/* check to see if we need to re-expand aliases */
+			/* also reset QBADADDR on already-diagnosted addrs */
+			doublequeue = FALSE;
+			for (a = e->e_sendqueue; a != NULL; a = a->q_next)
+			{
+				if (bitset(QVERIFIED, a->q_flags))
+				{
+					/* need to re-expand aliases */
+					doublequeue = TRUE;
+				}
+				if (bitset(QBADADDR, a->q_flags))
+				{
+					/* make this "go away" */
+					a->q_flags |= QDONTSEND;
+					a->q_flags &= ~QBADADDR;
+				}
+			}
+
+			/* collect the text of the message */
+			SmtpPhase = "collect";
+			collect(TRUE, doublequeue, e);
+			if (Errors != 0)
+				goto abortmessage;
+			HoldErrs = TRUE;
+
+			/*
+			**  Arrange to send to everyone.
+			**	If sending to multiple people, mail back
+			**		errors rather than reporting directly.
+			**	In any case, don't mail back errors for
+			**		anything that has happened up to
+			**		now (the other end will do this).
+			**	Truncate our transcript -- the mail has gotten
+			**		to us successfully, and if we have
+			**		to mail this back, it will be easier
+			**		on the reader.
+			**	Then send to everyone.
+			**	Finally give a reply code.  If an error has
+			**		already been given, don't mail a
+			**		message back.
+			**	We goose error returns by clearing error bit.
+			*/
+
+			SmtpPhase = "delivery";
+			if (nrcpts != 1 && !doublequeue)
+			{
+				HoldErrs = TRUE;
+				e->e_errormode = EM_MAIL;
+			}
+			e->e_xfp = freopen(queuename(e, 'x'), "w", e->e_xfp);
+			id = e->e_id;
+
+			/* send to all recipients */
+			sendall(e, doublequeue ? SM_QUEUE : SM_DEFAULT);
+			e->e_to = NULL;
+
+			/* issue success if appropriate and reset */
+			if (Errors == 0 || HoldErrs)
+				message("250 %s Message accepted for delivery", id);
+
+			if (bitset(EF_FATALERRS, e->e_flags) && !HoldErrs)
+			{
+				/* avoid sending back an extra message */
+				e->e_flags &= ~EF_FATALERRS;
+				e->e_flags |= EF_CLRQUEUE;
+			}
+			else
+			{
+				/* from now on, we have to operate silently */
+				HoldErrs = TRUE;
+				e->e_errormode = EM_MAIL;
+
+				/* if we just queued, poke it */
+				if (doublequeue && e->e_sendmode != SM_QUEUE)
+				{
+					extern pid_t dowork();
+
+					unlockqueue(e);
+					(void) dowork(id, TRUE, TRUE, e);
+				}
+			}
+
+  abortmessage:
+			/* if in a child, pop back to our parent */
+			if (InChild)
+				finis();
+
+			/* clean up a bit */
+			gotmail = FALSE;
+			dropenvelope(e);
+			CurEnv = e = newenvelope(e, CurEnv);
+			e->e_flags = BlankEnvelope.e_flags;
+			break;
+
+		  case CMDRSET:		/* rset -- reset state */
+			message("250 Reset state");
+			e->e_flags |= EF_CLRQUEUE;
+			if (InChild)
+				finis();
+
+			/* clean up a bit */
+			gotmail = FALSE;
+			dropenvelope(e);
+			CurEnv = e = newenvelope(e, CurEnv);
+			break;
+
+		  case CMDVRFY:		/* vrfy -- verify address */
+		  case CMDEXPN:		/* expn -- expand address */
+			vrfy = c->cmdcode == CMDVRFY;
+			if (bitset(vrfy ? PRIV_NOVRFY : PRIV_NOEXPN,
+						PrivacyFlags))
+			{
+				if (vrfy)
+					message("252 Who's to say?");
+				else
+					message("502 Sorry, we do not allow this operation");
+#ifdef LOG
+				if (LogLevel > 5)
+					syslog(LOG_INFO, "%s: %s [rejected]",
+						CurSmtpClient, inp);
+#endif
+				break;
+			}
+			else if (!gothello &&
+				 bitset(vrfy ? PRIV_NEEDVRFYHELO : PRIV_NEEDEXPNHELO,
+						PrivacyFlags))
+			{
+				message("503 I demand that you introduce yourself first");
+				break;
+			}
+			if (runinchild(vrfy ? "SMTP-VRFY" : "SMTP-EXPN", e) > 0)
+				break;
+#ifdef LOG
+			if (LogLevel > 5)
+				syslog(LOG_INFO, "%s: %s", CurSmtpClient, inp);
+#endif
+			vrfyqueue = NULL;
+			QuickAbort = TRUE;
+			if (vrfy)
+				e->e_flags |= EF_VRFYONLY;
+			while (*p != '\0' && isascii(*p) && isspace(*p))
+				*p++;
+			if (*p == '\0')
+			{
+				message("501 Argument required");
+				Errors++;
+			}
+			else
+			{
+				(void) sendtolist(p, NULLADDR, &vrfyqueue, e);
+			}
+			if (Errors != 0)
+			{
+				if (InChild)
+					finis();
+				break;
+			}
+			if (vrfyqueue == NULL)
+			{
+				message("554 Nothing to %s", vrfy ? "VRFY" : "EXPN");
+			}
+			while (vrfyqueue != NULL)
+			{
+				a = vrfyqueue;
+				while ((a = a->q_next) != NULL &&
+				       bitset(QDONTSEND|QBADADDR, a->q_flags))
+					continue;
+				if (!bitset(QDONTSEND|QBADADDR, vrfyqueue->q_flags))
+					printvrfyaddr(vrfyqueue, a == NULL);
+				vrfyqueue = vrfyqueue->q_next;
+			}
+			if (InChild)
+				finis();
+			break;
+
+		  case CMDHELP:		/* help -- give user info */
+			help(p);
+			break;
+
+		  case CMDNOOP:		/* noop -- do nothing */
+			message("250 OK");
+			break;
+
+		  case CMDQUIT:		/* quit -- leave mail */
+			message("221 %s closing connection", MyHostName);
+
+doquit:
+			/* avoid future 050 messages */
+			disconnect(1, e);
+
+			if (InChild)
+				ExitStat = EX_QUIT;
+			finis();
+
+		  case CMDVERB:		/* set verbose mode */
+			if (bitset(PRIV_NOEXPN, PrivacyFlags))
+			{
+				/* this would give out the same info */
+				message("502 Verbose unavailable");
+				break;
+			}
+			Verbose = TRUE;
+			e->e_sendmode = SM_DELIVER;
+			message("250 Verbose mode");
+			break;
+
+		  case CMDONEX:		/* doing one transaction only */
+			OneXact = TRUE;
+			message("250 Only one transaction");
+			break;
+
+# ifdef SMTPDEBUG
+		  case CMDDBGQSHOW:	/* show queues */
+			printf("Send Queue=");
+			printaddr(e->e_sendqueue, TRUE);
+			break;
+
+		  case CMDDBGDEBUG:	/* set debug mode */
+			tTsetup(tTdvect, sizeof tTdvect, "0-99.1");
+			tTflag(p);
+			message("200 Debug set");
+			break;
+
+# else /* not SMTPDEBUG */
+		  case CMDDBGQSHOW:	/* show queues */
+		  case CMDDBGDEBUG:	/* set debug mode */
+# endif /* SMTPDEBUG */
+		  case CMDLOGBOGUS:	/* bogus command */
+# ifdef LOG
+			if (LogLevel > 0)
+				syslog(LOG_CRIT,
+				    "\"%s\" command from %s (%s)",
+				    c->cmdname, peerhostname,
+				    anynet_ntoa(&RealHostAddr));
+# endif
+			/* FALL THROUGH */
+
+		  case CMDERROR:	/* unknown command */
+			if (++badcommands > MAXBADCOMMANDS)
+			{
+				message("421 %s Too many bad commands; closing connection",
+					MyHostName);
+				goto doquit;
+			}
+
+			message("500 Command unrecognized");
+			break;
+
+		  default:
+			errno = 0;
+			syserr("500 smtp: unknown code %d", c->cmdcode);
+			break;
+		}
+	}
+}
+/*
+**  SKIPWORD -- skip a fixed word.
+**
+**	Parameters:
+**		p -- place to start looking.
+**		w -- word to skip.
+**
+**	Returns:
+**		p following w.
+**		NULL on error.
+**
+**	Side Effects:
+**		clobbers the p data area.
+*/
+
+static char *
+skipword(p, w)
+	register char *p;
+	char *w;
+{
+	register char *q;
+	char *firstp = p;
+
+	/* find beginning of word */
+	while (isascii(*p) && isspace(*p))
+		p++;
+	q = p;
+
+	/* find end of word */
+	while (*p != '\0' && *p != ':' && !(isascii(*p) && isspace(*p)))
+		p++;
+	while (isascii(*p) && isspace(*p))
+		*p++ = '\0';
+	if (*p != ':')
+	{
+	  syntax:
+		message("501 Syntax error in parameters scanning \"%s\"",
+			firstp);
+		Errors++;
+		return (NULL);
+	}
+	*p++ = '\0';
+	while (isascii(*p) && isspace(*p))
+		p++;
+
+	if (*p == '\0')
+		goto syntax;
+
+	/* see if the input word matches desired word */
+	if (strcasecmp(q, w))
+		goto syntax;
+
+	return (p);
+}
+/*
+**  PRINTVRFYADDR -- print an entry in the verify queue
+**
+**	Parameters:
+**		a -- the address to print
+**		last -- set if this is the last one.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		Prints the appropriate 250 codes.
+*/
+
+printvrfyaddr(a, last)
+	register ADDRESS *a;
+	bool last;
+{
+	char fmtbuf[20];
+
+	strcpy(fmtbuf, "250");
+	fmtbuf[3] = last ? ' ' : '-';
+
+	if (a->q_fullname == NULL)
+	{
+		if (strchr(a->q_user, '@') == NULL)
+			strcpy(&fmtbuf[4], "<%s@%s>");
+		else
+			strcpy(&fmtbuf[4], "<%s>");
+		message(fmtbuf, a->q_user, MyHostName);
+	}
+	else
+	{
+		if (strchr(a->q_user, '@') == NULL)
+			strcpy(&fmtbuf[4], "%s <%s@%s>");
+		else
+			strcpy(&fmtbuf[4], "%s <%s>");
+		message(fmtbuf, a->q_fullname, a->q_user, MyHostName);
+	}
+}
+/*
+**  HELP -- implement the HELP command.
+**
+**	Parameters:
+**		topic -- the topic we want help for.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		outputs the help file to message output.
+*/
+
+help(topic)
+	char *topic;
+{
+	register FILE *hf;
+	int len;
+	char buf[MAXLINE];
+	bool noinfo;
+
+	if (HelpFile == NULL || (hf = fopen(HelpFile, "r")) == NULL)
+	{
+		/* no help */
+		errno = 0;
+		message("502 HELP not implemented");
+		return;
+	}
+
+	if (topic == NULL || *topic == '\0')
+		topic = "smtp";
+	else
+		makelower(topic);
+
+	len = strlen(topic);
+	noinfo = TRUE;
+
+	while (fgets(buf, sizeof buf, hf) != NULL)
+	{
+		if (strncmp(buf, topic, len) == 0)
+		{
+			register char *p;
+
+			p = strchr(buf, '\t');
+			if (p == NULL)
+				p = buf;
+			else
+				p++;
+			fixcrlf(p, TRUE);
+			message("214-%s", p);
+			noinfo = FALSE;
+		}
+	}
+
+	if (noinfo)
+		message("504 HELP topic unknown");
+	else
+		message("214 End of HELP info");
+	(void) fclose(hf);
+}
+/*
+**  RUNINCHILD -- return twice -- once in the child, then in the parent again
+**
+**	Parameters:
+**		label -- a string used in error messages
+**
+**	Returns:
+**		zero in the child
+**		one in the parent
+**
+**	Side Effects:
+**		none.
+*/
+
+runinchild(label, e)
+	char *label;
+	register ENVELOPE *e;
+{
+	int childpid;
+
+	if (!OneXact)
+	{
+		childpid = dofork();
+		if (childpid < 0)
+		{
+			syserr("%s: cannot fork", label);
+			return (1);
+		}
+		if (childpid > 0)
+		{
+			auto int st;
+
+			/* parent -- wait for child to complete */
+			setproctitle("server %s child wait", CurHostName);
+			st = waitfor(childpid);
+			if (st == -1)
+				syserr("%s: lost child", label);
+			else if (!WIFEXITED(st))
+				syserr("%s: died on signal %d",
+					label, st & 0177);
+
+			/* if we exited on a QUIT command, complete the process */
+			if (WEXITSTATUS(st) == EX_QUIT)
+			{
+				disconnect(1, e);
+				finis();
+			}
+
+			return (1);
+		}
+		else
+		{
+			/* child */
+			InChild = TRUE;
+			QuickAbort = FALSE;
+			clearenvelope(e, FALSE);
+		}
+	}
+
+	/* open alias database */
+	initmaps(FALSE, e);
+
+	return (0);
+}
+
+# endif /* SMTP */
diff --git a/usr.sbin/sendmail/src/stab.c b/usr.sbin/sendmail/src/stab.c
new file mode 100644
index 00000000000..07893e5b5d9
--- /dev/null
+++ b/usr.sbin/sendmail/src/stab.c
@@ -0,0 +1,166 @@
+/*
+ * Copyright (c) 1983 Eric P. Allman
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)stab.c	8.1 (Berkeley) 6/7/93";
+#endif /* not lint */
+
+# include "sendmail.h"
+
+/*
+**  STAB -- manage the symbol table
+**
+**	Parameters:
+**		name -- the name to be looked up or inserted.
+**		type -- the type of symbol.
+**		op -- what to do:
+**			ST_ENTER -- enter the name if not
+**				already present.
+**			ST_FIND -- find it only.
+**
+**	Returns:
+**		pointer to a STAB entry for this name.
+**		NULL if not found and not entered.
+**
+**	Side Effects:
+**		can update the symbol table.
+*/
+
+# define STABSIZE	400
+
+static STAB	*SymTab[STABSIZE];
+
+STAB *
+stab(name, type, op)
+	char *name;
+	int type;
+	int op;
+{
+	register STAB *s;
+	register STAB **ps;
+	register int hfunc;
+	register char *p;
+	extern char lower();
+
+	if (tTd(36, 5))
+		printf("STAB: %s %d ", name, type);
+
+	/*
+	**  Compute the hashing function
+	**
+	**	We could probably do better....
+	*/
+
+	hfunc = type;
+	for (p = name; *p != '\0'; p++)
+		hfunc = (((hfunc << 7) | lower(*p)) & 077777) % STABSIZE;
+
+	if (tTd(36, 9))
+		printf("(hfunc=%d) ", hfunc);
+
+	ps = &SymTab[hfunc];
+	while ((s = *ps) != NULL && (strcasecmp(name, s->s_name) || s->s_type != type))
+		ps = &s->s_next;
+
+	/*
+	**  Dispose of the entry.
+	*/
+
+	if (s != NULL || op == ST_FIND)
+	{
+		if (tTd(36, 5))
+		{
+			if (s == NULL)
+				printf("not found\n");
+			else
+			{
+				long *lp = (long *) s->s_class;
+
+				printf("type %d val %lx %lx %lx %lx\n",
+					s->s_type, lp[0], lp[1], lp[2], lp[3]);
+			}
+		}
+		return (s);
+	}
+
+	/*
+	**  Make a new entry and link it in.
+	*/
+
+	if (tTd(36, 5))
+		printf("entered\n");
+
+	/* make new entry */
+	s = (STAB *) xalloc(sizeof *s);
+	bzero((char *) s, sizeof *s);
+	s->s_name = newstr(name);
+	makelower(s->s_name);
+	s->s_type = type;
+
+	/* link it in */
+	*ps = s;
+
+	return (s);
+}
+/*
+**  STABAPPLY -- apply function to all stab entries
+**
+**	Parameters:
+**		func -- the function to apply.  It will be given one
+**			parameter (the stab entry).
+**		arg -- an arbitrary argument, passed to func.
+**
+**	Returns:
+**		none.
+*/
+
+void
+stabapply(func, arg)
+	void (*func)__P((STAB *, int));
+	int arg;
+{
+	register STAB **shead;
+	register STAB *s;
+
+	for (shead = SymTab; shead < &SymTab[STABSIZE]; shead++)
+	{
+		for (s = *shead; s != NULL; s = s->s_next)
+		{
+			if (tTd(38, 90))
+				printf("stabapply: trying %d/%s\n",
+					s->s_type, s->s_name);
+			func(s, arg);
+		}
+	}
+}
diff --git a/usr.sbin/sendmail/src/stats.c b/usr.sbin/sendmail/src/stats.c
new file mode 100644
index 00000000000..2dc68272fbc
--- /dev/null
+++ b/usr.sbin/sendmail/src/stats.c
@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) 1983 Eric P. Allman
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)stats.c	8.3 (Berkeley) 8/28/93";
+#endif /* not lint */
+
+# include "sendmail.h"
+# include "mailstats.h"
+
+struct statistics	Stat;
+
+bool	GotStats = FALSE;	/* set when we have stats to merge */
+
+#define ONE_K		1000		/* one thousand (twenty-four?) */
+#define KBYTES(x)	(((x) + (ONE_K - 1)) / ONE_K)
+/*
+**  MARKSTATS -- mark statistics
+*/
+
+markstats(e, to)
+	register ENVELOPE *e;
+	register ADDRESS *to;
+{
+	if (to == NULL)
+	{
+		if (e->e_from.q_mailer != NULL)
+		{
+			Stat.stat_nf[e->e_from.q_mailer->m_mno]++;
+			Stat.stat_bf[e->e_from.q_mailer->m_mno] +=
+				KBYTES(e->e_msgsize);
+		}
+	}
+	else
+	{
+		Stat.stat_nt[to->q_mailer->m_mno]++;
+		Stat.stat_bt[to->q_mailer->m_mno] += KBYTES(e->e_msgsize);
+	}
+	GotStats = TRUE;
+}
+/*
+**  POSTSTATS -- post statistics in the statistics file
+**
+**	Parameters:
+**		sfile -- the name of the statistics file.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		merges the Stat structure with the sfile file.
+*/
+
+poststats(sfile)
+	char *sfile;
+{
+	register int fd;
+	struct statistics stat;
+	extern off_t lseek();
+
+	if (sfile == NULL || !GotStats)
+		return;
+
+	(void) time(&Stat.stat_itime);
+	Stat.stat_size = sizeof Stat;
+
+	fd = open(sfile, O_RDWR);
+	if (fd < 0)
+	{
+		errno = 0;
+		return;
+	}
+	(void) lockfile(fd, sfile, NULL, LOCK_EX);
+	if (read(fd, (char *) &stat, sizeof stat) == sizeof stat &&
+	    stat.stat_size == sizeof stat)
+	{
+		/* merge current statistics into statfile */
+		register int i;
+
+		for (i = 0; i < MAXMAILERS; i++)
+		{
+			stat.stat_nf[i] += Stat.stat_nf[i];
+			stat.stat_bf[i] += Stat.stat_bf[i];
+			stat.stat_nt[i] += Stat.stat_nt[i];
+			stat.stat_bt[i] += Stat.stat_bt[i];
+		}
+	}
+	else
+		bcopy((char *) &Stat, (char *) &stat, sizeof stat);
+
+	/* write out results */
+	(void) lseek(fd, (off_t) 0, 0);
+	(void) write(fd, (char *) &stat, sizeof stat);
+	(void) close(fd);
+
+	/* clear the structure to avoid future disappointment */
+	bzero(&Stat, sizeof stat);
+	GotStats = FALSE;
+}
diff --git a/usr.sbin/sendmail/src/sysexits.c b/usr.sbin/sendmail/src/sysexits.c
new file mode 100644
index 00000000000..fff3783f911
--- /dev/null
+++ b/usr.sbin/sendmail/src/sysexits.c
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 1983 Eric P. Allman
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)sysexits.c	8.1 (Berkeley) 6/7/93";
+#endif /* not lint */
+
+#include <sysexits.h>
+
+/*
+**  SYSEXITS.C -- error messages corresponding to sysexits.h
+**
+**	If the first character of the string is a colon, interpolate
+**	the current errno after the rest of the string.
+*/
+
+char *SysExMsg[] =
+{
+	/* 64 USAGE */		" 500 Bad usage",
+	/* 65 DATAERR */	" 501 Data format error",
+	/* 66 NOINPUT */	":550 Cannot open input",
+	/* 67 NOUSER */		" 550 User unknown",
+	/* 68 NOHOST */		" 550 Host unknown",
+	/* 69 UNAVAILABLE */	" 554 Service unavailable",
+	/* 70 SOFTWARE */	":554 Internal error",
+	/* 71 OSERR */		":451 Operating system error",
+	/* 72 OSFILE */		":554 System file missing",
+	/* 73 CANTCREAT */	":550 Can't create output",
+	/* 74 IOERR */		":451 I/O error",
+	/* 75 TEMPFAIL */	" 250 Deferred",
+	/* 76 PROTOCOL */	" 554 Remote protocol error",
+	/* 77 NOPERM */		":550 Insufficient permission",
+	/* 78 CONFIG */		" 554 Local configuration error",
+};
+
+int N_SysEx = sizeof(SysExMsg) / sizeof(SysExMsg[0]);
diff --git a/usr.sbin/sendmail/src/sysexits.h b/usr.sbin/sendmail/src/sysexits.h
new file mode 100644
index 00000000000..464cb11bab2
--- /dev/null
+++ b/usr.sbin/sendmail/src/sysexits.h
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 1987, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)sysexits.h	8.1 (Berkeley) 6/2/93
+ */
+
+#ifndef	_SYSEXITS_H_
+#define	_SYSEXITS_H_
+
+/*
+ *  SYSEXITS.H -- Exit status codes for system programs.
+ *
+ *	This include file attempts to categorize possible error
+ *	exit statuses for system programs, notably delivermail
+ *	and the Berkeley network.
+ *
+ *	Error numbers begin at EX__BASE to reduce the possibility of
+ *	clashing with other exit statuses that random programs may
+ *	already return.  The meaning of the codes is approximately
+ *	as follows:
+ *
+ *	EX_USAGE -- The command was used incorrectly, e.g., with
+ *		the wrong number of arguments, a bad flag, a bad
+ *		syntax in a parameter, or whatever.
+ *	EX_DATAERR -- The input data was incorrect in some way.
+ *		This should only be used for user's data & not
+ *		system files.
+ *	EX_NOINPUT -- An input file (not a system file) did not
+ *		exist or was not readable.  This could also include
+ *		errors like "No message" to a mailer (if it cared
+ *		to catch it).
+ *	EX_NOUSER -- The user specified did not exist.  This might
+ *		be used for mail addresses or remote logins.
+ *	EX_NOHOST -- The host specified did not exist.  This is used
+ *		in mail addresses or network requests.
+ *	EX_UNAVAILABLE -- A service is unavailable.  This can occur
+ *		if a support program or file does not exist.  This
+ *		can also be used as a catchall message when something
+ *		you wanted to do doesn't work, but you don't know
+ *		why.
+ *	EX_SOFTWARE -- An internal software error has been detected.
+ *		This should be limited to non-operating system related
+ *		errors as possible.
+ *	EX_OSERR -- An operating system error has been detected.
+ *		This is intended to be used for such things as "cannot
+ *		fork", "cannot create pipe", or the like.  It includes
+ *		things like getuid returning a user that does not
+ *		exist in the passwd file.
+ *	EX_OSFILE -- Some system file (e.g., /etc/passwd, /etc/utmp,
+ *		etc.) does not exist, cannot be opened, or has some
+ *		sort of error (e.g., syntax error).
+ *	EX_CANTCREAT -- A (user specified) output file cannot be
+ *		created.
+ *	EX_IOERR -- An error occurred while doing I/O on some file.
+ *	EX_TEMPFAIL -- temporary failure, indicating something that
+ *		is not really an error.  In sendmail, this means
+ *		that a mailer (e.g.) could not create a connection,
+ *		and the request should be reattempted later.
+ *	EX_PROTOCOL -- the remote system returned something that
+ *		was "not possible" during a protocol exchange.
+ *	EX_NOPERM -- You did not have sufficient permission to
+ *		perform the operation.  This is not intended for
+ *		file system problems, which should use NOINPUT or
+ *		CANTCREAT, but rather for higher level permissions.
+ */
+
+#define EX_OK		0	/* successful termination */
+
+#define EX__BASE	64	/* base value for error messages */
+
+#define EX_USAGE	64	/* command line usage error */
+#define EX_DATAERR	65	/* data format error */
+#define EX_NOINPUT	66	/* cannot open input */
+#define EX_NOUSER	67	/* addressee unknown */
+#define EX_NOHOST	68	/* host name unknown */
+#define EX_UNAVAILABLE	69	/* service unavailable */
+#define EX_SOFTWARE	70	/* internal software error */
+#define EX_OSERR	71	/* system error (e.g., can't fork) */
+#define EX_OSFILE	72	/* critical OS file missing */
+#define EX_CANTCREAT	73	/* can't create (user) output file */
+#define EX_IOERR	74	/* input/output error */
+#define EX_TEMPFAIL	75	/* temp failure; user is invited to retry */
+#define EX_PROTOCOL	76	/* remote error in protocol */
+#define EX_NOPERM	77	/* permission denied */
+#define EX_CONFIG	78	/* configuration error */
+
+#define EX__MAX	78	/* maximum listed value */
+
+#endif /* !_SYSEXITS_H_ */
diff --git a/usr.sbin/sendmail/src/trace.c b/usr.sbin/sendmail/src/trace.c
new file mode 100644
index 00000000000..29421eee3c6
--- /dev/null
+++ b/usr.sbin/sendmail/src/trace.c
@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 1983 Eric P. Allman
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)trace.c	8.2 (Berkeley) 3/14/94";
+#endif /* not lint */
+
+# include "sendmail.h"
+
+/*
+**  TtSETUP -- set up for trace package.
+**
+**	Parameters:
+**		vect -- pointer to trace vector.
+**		size -- number of flags in trace vector.
+**		defflags -- flags to set if no value given.
+**
+**	Returns:
+**		none
+**
+**	Side Effects:
+**		environment is set up.
+*/
+
+u_char		*tTvect;
+int		tTsize;
+static char	*DefFlags;
+
+tTsetup(vect, size, defflags)
+	u_char *vect;
+	int size;
+	char *defflags;
+{
+	tTvect = vect;
+	tTsize = size;
+	DefFlags = defflags;
+}
+/*
+**  TtFLAG -- process an external trace flag description.
+**
+**	Parameters:
+**		s -- the trace flag.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		sets/clears trace flags.
+*/
+
+tTflag(s)
+	register char *s;
+{
+	unsigned int first, last;
+	register unsigned int i;
+
+	if (*s == '\0')
+		s = DefFlags;
+
+	for (;;)
+	{
+		/* find first flag to set */
+		i = 0;
+		while (isdigit(*s))
+			i = i * 10 + (*s++ - '0');
+		first = i;
+
+		/* find last flag to set */
+		if (*s == '-')
+		{
+			i = 0;
+			while (isdigit(*++s))
+				i = i * 10 + (*s - '0');
+		}
+		last = i;
+
+		/* find the level to set it to */
+		i = 1;
+		if (*s == '.')
+		{
+			i = 0;
+			while (isdigit(*++s))
+				i = i * 10 + (*s - '0');
+		}
+
+		/* clean up args */
+		if (first >= tTsize)
+			first = tTsize - 1;
+		if (last >= tTsize)
+			last = tTsize - 1;
+
+		/* set the flags */
+		while (first <= last)
+			tTvect[first++] = i;
+
+		/* more arguments? */
+		if (*s++ == '\0')
+			return;
+	}
+}
diff --git a/usr.sbin/sendmail/src/udb.c b/usr.sbin/sendmail/src/udb.c
new file mode 100644
index 00000000000..7887cb367c8
--- /dev/null
+++ b/usr.sbin/sendmail/src/udb.c
@@ -0,0 +1,985 @@
+/*
+ * Copyright (c) 1983 Eric P. Allman
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include "sendmail.h"
+
+#ifndef lint
+#ifdef USERDB
+static char sccsid [] = "@(#)udb.c	8.8 (Berkeley) 4/14/94 (with USERDB)";
+#else
+static char sccsid [] = "@(#)udb.c	8.8 (Berkeley) 4/14/94 (without USERDB)";
+#endif
+#endif
+
+#ifdef USERDB
+
+#include <errno.h>
+#include <netdb.h>
+#include <db.h>
+
+#ifdef HESIOD
+#include <hesiod.h>
+#endif /* HESIOD */
+
+/*
+**  UDB.C -- interface between sendmail and Berkeley User Data Base.
+**
+**	This depends on the 4.4BSD db package.
+*/
+
+
+struct udbent
+{
+	char	*udb_spec;		/* string version of spec */
+	int	udb_type;		/* type of entry */
+	char	*udb_default;		/* default host for outgoing mail */
+	union
+	{
+		/* type UE_REMOTE -- do remote call for lookup */
+		struct
+		{
+			struct sockaddr_in _udb_addr;	/* address */
+			int		_udb_timeout;	/* timeout */
+		} udb_remote;
+#define udb_addr	udb_u.udb_remote._udb_addr
+#define udb_timeout	udb_u.udb_remote._udb_timeout
+
+		/* type UE_FORWARD -- forward message to remote */
+		struct
+		{
+			char	*_udb_fwdhost;	/* name of forward host */
+		} udb_forward;
+#define udb_fwdhost	udb_u.udb_forward._udb_fwdhost
+
+		/* type UE_FETCH -- lookup in local database */
+		struct
+		{
+			char	*_udb_dbname;	/* pathname of database */
+			DB	*_udb_dbp;	/* open database ptr */
+		} udb_lookup;
+#define udb_dbname	udb_u.udb_lookup._udb_dbname
+#define udb_dbp		udb_u.udb_lookup._udb_dbp
+	} udb_u;
+};
+
+#define UDB_EOLIST	0	/* end of list */
+#define UDB_SKIP	1	/* skip this entry */
+#define UDB_REMOTE	2	/* look up in remote database */
+#define UDB_DBFETCH	3	/* look up in local database */
+#define UDB_FORWARD	4	/* forward to remote host */
+#define UDB_HESIOD	5	/* look up via hesiod */
+
+#define MAXUDBENT	10	/* maximum number of UDB entries */
+
+
+struct option
+{
+	char	*name;
+	char	*val;
+};
+/*
+**  UDBEXPAND -- look up user in database and expand
+**
+**	Parameters:
+**		a -- address to expand.
+**		sendq -- pointer to head of sendq to put the expansions in.
+**
+**	Returns:
+**		EX_TEMPFAIL -- if something "odd" happened -- probably due
+**			to accessing a file on an NFS server that is down.
+**		EX_OK -- otherwise.
+**
+**	Side Effects:
+**		Modifies sendq.
+*/
+
+int	UdbPort = 1616;
+int	UdbTimeout = 10;
+
+struct udbent	UdbEnts[MAXUDBENT + 1];
+int		UdbSock = -1;
+bool		UdbInitialized = FALSE;
+
+int
+udbexpand(a, sendq, e)
+	register ADDRESS *a;
+	ADDRESS **sendq;
+	register ENVELOPE *e;
+{
+	int i;
+	register char *p;
+	DBT key;
+	DBT info;
+	bool breakout;
+	register struct udbent *up;
+	int keylen;
+	int naddrs;
+	char keybuf[MAXKEY];
+	char buf[BUFSIZ];
+
+	if (tTd(28, 1))
+		printf("udbexpand(%s)\n", a->q_paddr);
+
+	/* make certain we are supposed to send to this address */
+	if (bitset(QDONTSEND|QVERIFIED, a->q_flags))
+		return EX_OK;
+	e->e_to = a->q_paddr;
+
+	/* on first call, locate the database */
+	if (!UdbInitialized)
+	{
+		extern int _udbx_init();
+
+		if (_udbx_init() == EX_TEMPFAIL)
+			return EX_TEMPFAIL;
+	}
+
+	/* short circuit the process if no chance of a match */
+	if (UdbSpec == NULL || UdbSpec[0] == '\0')
+		return EX_OK;
+
+	/* short circuit name begins with '\\' since it can't possibly match */
+	if (a->q_user[0] == '\\')
+		return EX_OK;
+
+	/* if name is too long, assume it won't match */
+	if (strlen(a->q_user) > sizeof keybuf - 12)
+		return EX_OK;
+
+	/* if name begins with a colon, it indicates our metadata */
+	if (a->q_user[0] == ':')
+		return EX_OK;
+
+	/* build actual database key */
+	(void) strcpy(keybuf, a->q_user);
+	(void) strcat(keybuf, ":maildrop");
+	keylen = strlen(keybuf);
+
+	breakout = FALSE;
+	for (up = UdbEnts; !breakout; up++)
+	{
+		char *user;
+
+		/*
+		**  Select action based on entry type.
+		**
+		**	On dropping out of this switch, "class" should
+		**	explain the type of the data, and "user" should
+		**	contain the user information.
+		*/
+
+		switch (up->udb_type)
+		{
+		  case UDB_DBFETCH:
+			key.data = keybuf;
+			key.size = keylen;
+			if (tTd(28, 80))
+				printf("udbexpand: trying %s (%d) via db\n",
+					keybuf, keylen);
+			i = (*up->udb_dbp->seq)(up->udb_dbp, &key, &info, R_CURSOR);
+			if (i > 0 || info.size <= 0)
+			{
+				if (tTd(28, 2))
+					printf("udbexpand: no match on %s (%d)\n",
+						keybuf, keylen);
+				continue;
+			}
+			if (tTd(28, 80))
+				printf("udbexpand: match %.*s: %.*s\n",
+					key.size, key.data, info.size, info.data);
+
+			naddrs = 0;
+			a->q_flags &= ~QSELFREF;
+			while (i == 0 && key.size == keylen &&
+					bcmp(key.data, keybuf, keylen) == 0)
+			{
+				if (bitset(EF_VRFYONLY, e->e_flags))
+				{
+					a->q_flags |= QVERIFIED;
+					e->e_nrcpts++;
+					return EX_OK;
+				}
+
+				breakout = TRUE;
+				if (info.size < sizeof buf)
+					user = buf;
+				else
+					user = xalloc(info.size + 1);
+				bcopy(info.data, user, info.size);
+				user[info.size] = '\0';
+
+				message("expanded to %s", user);
+#ifdef LOG
+				if (LogLevel >= 10)
+					syslog(LOG_INFO, "%s: expand %s => %s",
+						e->e_id, e->e_to, user);
+#endif
+				AliasLevel++;
+				naddrs += sendtolist(user, a, sendq, e);
+				AliasLevel--;
+
+				if (user != buf)
+					free(user);
+
+				/* get the next record */
+				i = (*up->udb_dbp->seq)(up->udb_dbp, &key, &info, R_NEXT);
+			}
+
+			/* if nothing ever matched, try next database */
+			if (!breakout)
+				continue;
+
+			if (naddrs > 0 && !bitset(QSELFREF, a->q_flags))
+			{
+				if (tTd(28, 5))
+				{
+					printf("udbexpand: QDONTSEND ");
+					printaddr(a, FALSE);
+				}
+				a->q_flags |= QDONTSEND;
+			}
+			if (i < 0)
+			{
+				syserr("udbexpand: db-get %.*s stat %d",
+					key.size, key.data, i);
+				return EX_TEMPFAIL;
+			}
+
+			/*
+			**  If this address has a -request address, reflect
+			**  it into the envelope.
+			*/
+
+			(void) strcpy(keybuf, a->q_user);
+			(void) strcat(keybuf, ":mailsender");
+			keylen = strlen(keybuf);
+			key.data = keybuf;
+			key.size = keylen;
+			i = (*up->udb_dbp->get)(up->udb_dbp, &key, &info, 0);
+			if (i != 0 || info.size <= 0)
+				break;
+			a->q_owner = xalloc(info.size + 1);
+			bcopy(info.data, a->q_owner, info.size);
+			a->q_owner[info.size] = '\0';
+
+			/* announce delivery; NORECEIPT bit set later */
+			if (e->e_xfp != NULL)
+			{
+				fprintf(e->e_xfp,
+					"Message delivered to mailing list %s\n",
+					a->q_paddr);
+				e->e_flags |= EF_SENDRECEIPT;
+			}
+			break;
+
+#ifdef HESIOD
+		  case UDB_HESIOD:
+			key.data = keybuf;
+			key.size = keylen;
+			if (tTd(28, 80))
+				printf("udbexpand: trying %s (%d) via hesiod\n",
+					keybuf, keylen);
+			/* look up the key via hesiod */
+			i = hes_udb_get(&key, &info);
+			if (i > 0 || info.size <= 0)
+			{
+				if (tTd(28, 2))
+				printf("udbexpand: no match on %s (%d)\n",
+					keybuf, keylen);
+				continue;
+			}
+			if (tTd(28, 80))
+				printf("udbexpand: match %.*s: %.*s\n",
+					key.size, key.data, info.size, info.data);
+			a->q_flags &= ~QSELFREF;
+
+			if (bitset(EF_VRFYONLY, e->e_flags))
+			{
+				a->q_flags |= QVERIFIED;
+				e->e_nrcpts++;
+				free(info.data);
+				return EX_OK;
+			}
+
+			breakout = TRUE;
+			if (info.size < sizeof buf)
+				user = buf;
+			else
+				user = xalloc(info.size + 1);
+			bcopy(info.data, user, info.size);
+			user[info.size] = '\0';
+			free(info.data);
+
+			message("hesioded to %s", user);
+#ifdef LOG
+			if (LogLevel >= 10)
+				syslog(LOG_INFO, "%s: hesiod %s => %s",
+					e->e_id, e->e_to, user);
+#endif
+			AliasLevel++;
+			naddrs = sendtolist(user, a, sendq, e);
+			AliasLevel--;
+
+			if (user != buf)
+				free(user);
+
+			if (naddrs > 0 && !bitset(QSELFREF, a->q_flags))
+			{
+				if (tTd(28, 5))
+				{
+					printf("udbexpand: QDONTSEND ");
+					printaddr(a, FALSE);
+				}
+				a->q_flags |= QDONTSEND;
+			}
+			if (i < 0)
+			{
+				syserr("udbexpand: hesiod-get %.*s stat %d",
+					key.size, key.data, i);
+				return EX_TEMPFAIL;
+			}
+
+			/*
+			**  If this address has a -request address, reflect
+			**  it into the envelope.
+			*/
+
+			(void) strcpy(keybuf, a->q_user);
+			(void) strcat(keybuf, ":mailsender");
+			keylen = strlen(keybuf);
+			key.data = keybuf;
+			key.size = keylen;
+			i = hes_udb_get(&key, &info);
+			if (i != 0 || info.size <= 0)
+				break;
+			a->q_owner = xalloc(info.size + 1);
+			bcopy(info.data, a->q_owner, info.size);
+			a->q_owner[info.size] = '\0';
+			free(info.data);
+			break;
+#endif /* HESIOD */
+
+		  case UDB_REMOTE:
+			/* not yet implemented */
+			continue;
+
+		  case UDB_FORWARD:
+			if (bitset(EF_VRFYONLY, e->e_flags))
+				return EX_OK;
+			i = strlen(up->udb_fwdhost) + strlen(a->q_user) + 1;
+			if (i < sizeof buf)
+				user = buf;
+			else
+				user = xalloc(i + 1);
+			(void) sprintf(user, "%s@%s", a->q_user, up->udb_fwdhost);
+			message("expanded to %s", user);
+			a->q_flags &= ~QSELFREF;
+			AliasLevel++;
+			naddrs = sendtolist(user, a, sendq, e);
+			AliasLevel--;
+			if (naddrs > 0 && !bitset(QSELFREF, a->q_flags))
+			{
+				if (tTd(28, 5))
+				{
+					printf("udbexpand: QDONTSEND ");
+					printaddr(a, FALSE);
+				}
+				a->q_flags |= QDONTSEND;
+			}
+			if (user != buf)
+				free(user);
+			breakout = TRUE;
+			break;
+
+		  case UDB_EOLIST:
+			breakout = TRUE;
+			continue;
+
+		  default:
+			/* unknown entry type */
+			continue;
+		}
+	}
+	return EX_OK;
+}
+/*
+**  UDBSENDER -- return canonical external name of sender, given local name
+**
+**	Parameters:
+**		sender -- the name of the sender on the local machine.
+**
+**	Returns:
+**		The external name for this sender, if derivable from the
+**			database.
+**		NULL -- if nothing is changed from the database.
+**
+**	Side Effects:
+**		none.
+*/
+
+char *
+udbsender(sender)
+	char *sender;
+{
+	extern char *udbmatch();
+
+	return udbmatch(sender, "mailname");
+}
+
+
+char *
+udbmatch(user, field)
+	char *user;
+	char *field;
+{
+	register char *p;
+	register struct udbent *up;
+	int i;
+	int keylen;
+	DBT key, info;
+	char keybuf[MAXKEY];
+
+	if (tTd(28, 1))
+		printf("udbmatch(%s, %s)\n", user, field);
+
+	if (!UdbInitialized)
+	{
+		if (_udbx_init() == EX_TEMPFAIL)
+			return NULL;
+	}
+
+	/* short circuit if no spec */
+	if (UdbSpec == NULL || UdbSpec[0] == '\0')
+		return NULL;
+
+	/* short circuit name begins with '\\' since it can't possibly match */
+	if (user[0] == '\\')
+		return NULL;
+
+	/* long names can never match and are a pain to deal with */
+	if ((strlen(user) + strlen(field)) > sizeof keybuf - 4)
+		return NULL;
+
+	/* names beginning with colons indicate metadata */
+	if (user[0] == ':')
+		return NULL;
+
+	/* build database key */
+	(void) strcpy(keybuf, user);
+	(void) strcat(keybuf, ":");
+	(void) strcat(keybuf, field);
+	keylen = strlen(keybuf);
+
+	for (up = UdbEnts; up->udb_type != UDB_EOLIST; up++)
+	{
+		/*
+		**  Select action based on entry type.
+		*/
+
+		switch (up->udb_type)
+		{
+		  case UDB_DBFETCH:
+			key.data = keybuf;
+			key.size = keylen;
+			i = (*up->udb_dbp->get)(up->udb_dbp, &key, &info, 0);
+			if (i != 0 || info.size <= 0)
+			{
+				if (tTd(28, 2))
+					printf("udbmatch: no match on %s (%d) via db\n",
+							keybuf, keylen);
+				continue;
+			}
+
+			p = xalloc(info.size + 1);
+			bcopy(info.data, p, info.size);
+			p[info.size] = '\0';
+			if (tTd(28, 1))
+				printf("udbmatch ==> %s\n", p);
+			return p;
+			break;
+
+#ifdef HESIOD
+		  case UDB_HESIOD:
+			key.data = keybuf;
+			key.size = keylen;
+			i = hes_udb_get(&key, &info); 
+			if (i != 0 || info.size <= 0)
+			{
+				if (tTd(28, 2))
+					printf("udbmatch: no match on %s (%d) via hesiod\n",
+							keybuf, keylen);
+				continue;
+			}
+
+			p = xalloc(info.size + 1);
+			bcopy(info.data, p, info.size);
+			p[info.size] = '\0';
+			free(info.data);
+			if (tTd(28, 1))
+				printf("udbmatch ==> %s\n", p);
+			return p;
+			break;
+#endif /* HESIOD */
+		}
+	}
+
+	if (strcmp(field, "mailname") != 0)
+		return NULL;
+
+	/*
+	**  Nothing yet.  Search again for a default case.  But only
+	**  use it if we also have a forward (:maildrop) pointer already
+	**  in the database.
+	*/
+
+	/* build database key */
+	(void) strcpy(keybuf, user);
+	(void) strcat(keybuf, ":maildrop");
+	keylen = strlen(keybuf);
+
+	for (up = UdbEnts; up->udb_type != UDB_EOLIST; up++)
+	{
+		switch (up->udb_type)
+		{
+		  case UDB_DBFETCH:
+			/* get the default case for this database */
+			if (up->udb_default == NULL)
+			{
+				key.data = ":default:mailname";
+				key.size = strlen(key.data);
+				i = (*up->udb_dbp->get)(up->udb_dbp, &key, &info, 0);
+				if (i != 0 || info.size <= 0)
+				{
+					/* no default case */
+					up->udb_default = "";
+					continue;
+				}
+
+				/* save the default case */
+				up->udb_default = xalloc(info.size + 1);
+				bcopy(info.data, up->udb_default, info.size);
+				up->udb_default[info.size] = '\0';
+			}
+			else if (up->udb_default[0] == '\0')
+				continue;
+
+			/* we have a default case -- verify user:maildrop */
+			key.data = keybuf;
+			key.size = keylen;
+			i = (*up->udb_dbp->get)(up->udb_dbp, &key, &info, 0);
+			if (i != 0 || info.size <= 0)
+			{
+				/* nope -- no aliasing for this user */
+				continue;
+			}
+
+			/* they exist -- build the actual address */
+			p = xalloc(strlen(user) + strlen(up->udb_default) + 2);
+			(void) strcpy(p, user);
+			(void) strcat(p, "@");
+			(void) strcat(p, up->udb_default);
+			if (tTd(28, 1))
+				printf("udbmatch ==> %s\n", p);
+			return p;
+			break;
+
+#ifdef HESIOD
+		  case UDB_HESIOD:
+			/* get the default case for this database */
+			if (up->udb_default == NULL)
+			{
+				key.data = ":default:mailname";
+				key.size = strlen(key.data);
+				i = hes_udb_get(&key, &info); 
+
+				if (i != 0 || info.size <= 0)
+				{
+					/* no default case */
+					up->udb_default = "";
+					continue;
+				}
+
+				/* save the default case */
+				up->udb_default = xalloc(info.size + 1);
+				bcopy(info.data, up->udb_default, info.size);
+				up->udb_default[info.size] = '\0';
+				free(info.data);
+			}
+			else if (up->udb_default[0] == '\0')
+				continue;
+
+			/* we have a default case -- verify user:maildrop */
+			key.data = keybuf;
+			key.size = keylen;
+			i = hes_udb_get(&key, &info);
+			if (i != 0 || info.size <= 0)
+			{
+				/* nope -- no aliasing for this user */
+				continue;
+			}
+
+			free(info.data);
+			/* they exist -- build the actual address */
+			p = xalloc(strlen(user) + strlen(up->udb_default) + 2);
+			(void) strcpy(p, user);
+			(void) strcat(p, "@");
+			(void) strcat(p, up->udb_default);
+			if (tTd(28, 1))
+				printf("udbmatch ==> %s\n", p);
+			return p;
+			break;
+#endif /* HESIOD */
+		}
+	}
+
+	/* still nothing....  too bad */
+	return NULL;
+}
+/*
+**  _UDBX_INIT -- parse the UDB specification, opening any valid entries.
+**
+**	Parameters:
+**		none.
+**
+**	Returns:
+**		EX_TEMPFAIL -- if it appeared it couldn't get hold of a
+**			database due to a host being down or some similar
+**			(recoverable) situation.
+**		EX_OK -- otherwise.
+**
+**	Side Effects:
+**		Fills in the UdbEnts structure from UdbSpec.
+*/
+
+#define MAXUDBOPTS	27
+
+int
+_udbx_init()
+{
+	register char *p;
+	int i;
+	register struct udbent *up;
+	char buf[BUFSIZ];
+
+	if (UdbInitialized)
+		return EX_OK;
+
+# ifdef UDB_DEFAULT_SPEC
+	if (UdbSpec == NULL)
+		UdbSpec = UDB_DEFAULT_SPEC;
+# endif
+
+	p = UdbSpec;
+	up = UdbEnts;
+	while (p != NULL)
+	{
+		char *spec;
+		auto int rcode;
+		int nopts;
+		int nmx;
+		register struct hostent *h;
+		char *mxhosts[MAXMXHOSTS + 1];
+		struct option opts[MAXUDBOPTS + 1];
+
+		while (*p == ' ' || *p == '\t' || *p == ',')
+			p++;
+		if (*p == '\0')
+			break;
+		spec = p;
+		p = strchr(p, ',');
+		if (p != NULL)
+			*p++ = '\0';
+
+		/* extract options */
+		nopts = _udb_parsespec(spec, opts, MAXUDBOPTS);
+
+		/*
+		**  Decode database specification.
+		**
+		**	In the sendmail tradition, the leading character
+		**	defines the semantics of the rest of the entry.
+		**
+		**	+hostname --	send a datagram to the udb server
+		**			on host "hostname" asking for the
+		**			home mail server for this user.
+		**	*hostname --	similar to +hostname, except that the
+		**			hostname is searched as an MX record;
+		**			resulting hosts are searched as for
+		**			+mxhostname.  If no MX host is found,
+		**			this is the same as +hostname.
+		**	@hostname --	forward email to the indicated host.
+		**			This should be the last in the list,
+		**			since it always matches the input.
+		**	/dbname	 --	search the named database on the local
+		**			host using the Berkeley db package.
+		*/
+
+		switch (*spec)
+		{
+		  case '+':	/* search remote database */
+		  case '*':	/* search remote database (expand MX) */
+			if (*spec == '*')
+			{
+#if NAMED_BIND
+				nmx = getmxrr(spec + 1, mxhosts, FALSE, &rcode);
+#else
+				mxhosts[0] = spec + 1;
+				nmx = 1;
+				rcode = 0;
+#endif
+				if (tTd(28, 16))
+				{
+					int i;
+
+					printf("getmxrr(%s): %d", spec + 1, nmx);
+					for (i = 0; i <= nmx; i++)
+						printf(" %s", mxhosts[i]);
+					printf("\n");
+				}
+			}
+			else
+			{
+				nmx = 1;
+				mxhosts[0] = spec + 1;
+			}
+
+			for (i = 0; i < nmx; i++)
+			{
+				h = gethostbyname(mxhosts[i]);
+				if (h == NULL)
+					continue;
+				up->udb_type = UDB_REMOTE;
+				up->udb_addr.sin_family = h->h_addrtype;
+				bcopy(h->h_addr_list[0],
+				      (char *) &up->udb_addr.sin_addr,
+				      sizeof up->udb_addr.sin_addr);
+				up->udb_addr.sin_port = UdbPort;
+				up->udb_timeout = UdbTimeout;
+				up++;
+			}
+
+			/* set up a datagram socket */
+			if (UdbSock < 0)
+			{
+				UdbSock = socket(AF_INET, SOCK_DGRAM, 0);
+				(void) fcntl(UdbSock, F_SETFD, 1);
+			}
+			break;
+
+		  case '@':	/* forward to remote host */
+			up->udb_type = UDB_FORWARD;
+			up->udb_fwdhost = spec + 1;
+			up++;
+			break;
+
+		  case 'h':	/* use hesiod */
+		  case 'H':
+#ifdef HESIOD
+			if (strcasecmp(spec, "hesiod") != 0)
+				break;
+			up->udb_type = UDB_HESIOD;
+			up++;
+#endif /* HESIOD */
+			break;
+
+		  case '/':	/* look up remote name */
+			up->udb_dbname = spec;
+			errno = 0;
+			up->udb_dbp = dbopen(spec, O_RDONLY, 0644, DB_BTREE, NULL);
+			if (up->udb_dbp == NULL)
+			{
+				if (errno != ENOENT && errno != EACCES)
+				{
+#ifdef LOG
+					if (LogLevel > 2)
+						syslog(LOG_ERR, "dbopen(%s): %s",
+							spec, errstring(errno));
+#endif
+					up->udb_type = UDB_EOLIST;
+					goto tempfail;
+				}
+				break;
+			}
+			up->udb_type = UDB_DBFETCH;
+			up++;
+			break;
+		}
+	}
+	up->udb_type = UDB_EOLIST;
+
+	if (tTd(28, 4))
+	{
+		for (up = UdbEnts; up->udb_type != UDB_EOLIST; up++)
+		{
+			switch (up->udb_type)
+			{
+			  case UDB_REMOTE:
+				printf("REMOTE: addr %s, timeo %d\n",
+					anynet_ntoa((SOCKADDR *) &up->udb_addr),
+					up->udb_timeout);
+				break;
+
+			  case UDB_DBFETCH:
+				printf("FETCH: file %s\n",
+					up->udb_dbname);
+				break;
+
+			  case UDB_FORWARD:
+				printf("FORWARD: host %s\n",
+					up->udb_fwdhost);
+				break;
+
+			  case UDB_HESIOD:
+				printf("HESIOD\n");
+				break;
+
+			  default:
+				printf("UNKNOWN\n");
+				break;
+			}
+		}
+	}
+
+	UdbInitialized = TRUE;
+	errno = 0;
+	return EX_OK;
+
+	/*
+	**  On temporary failure, back out anything we've already done
+	*/
+
+  tempfail:
+	for (up = UdbEnts; up->udb_type != UDB_EOLIST; up++)
+	{
+		if (up->udb_type == UDB_DBFETCH)
+		{
+			(*up->udb_dbp->close)(up->udb_dbp);
+		}
+	}
+	return EX_TEMPFAIL;
+}
+
+int
+_udb_parsespec(udbspec, opt, maxopts)
+	char *udbspec;
+	struct option opt[];
+	int maxopts;
+{
+	register char *spec;
+	register char *spec_end;
+	register int optnum;
+
+	spec_end = strchr(udbspec, ':');
+	for (optnum = 0; optnum < maxopts && (spec = spec_end) != NULL; optnum++)
+	{
+		register char *p;
+
+		while (isascii(*spec) && isspace(*spec))
+			spec++;
+		spec_end = strchr(spec, ':');
+		if (spec_end != NULL)
+			*spec_end++ = '\0';
+
+		opt[optnum].name = spec;
+		opt[optnum].val = NULL;
+		p = strchr(spec, '=');
+		if (p != NULL)
+			opt[optnum].val = ++p;
+	}
+	return optnum;
+}
+
+#ifdef HESIOD
+
+int
+hes_udb_get(key, info)
+	DBT *key;
+	DBT *info;
+{
+	char *name, *type;
+	char *p, **hp;
+
+	name = key->data;
+	type = strchr(name, ':');
+	if (type == NULL)
+		return 1;
+
+	*type++ = '\0';
+
+	if (tTd(28, 1))
+		printf("hes_udb_get(%s, %s)\n", name, type);
+
+	/* make the hesiod query */
+	hp = hes_resolve(name, type);
+	if (hp == NULL)
+	{
+		/* network problem or timeout */
+		if (hes_error() == HES_ER_NET)
+			return -1;
+
+		return 1;
+	}
+	else
+	{
+		/*
+		**  If there are multiple matches, just return the
+		**  first one and free the others.
+		**
+		**  XXX These should really be returned; for example,
+		**  XXX it is legal for :maildrop to be multi-valued.
+		*/
+
+		for (p = hp[1]; p; p++)
+			free(p);
+
+		info->data = hp[0];
+		info->size = (size_t) strlen(info->data);
+	}
+
+	return 0;
+}
+#endif /* HESIOD */
+
+#else /* not USERDB */
+
+int
+udbexpand(a, sendq, e)
+	ADDRESS *a;
+	ADDRESS **sendq;
+	ENVELOPE *e;
+{
+	return EX_OK;
+}
+
+#endif /* USERDB */
diff --git a/usr.sbin/sendmail/src/useful.h b/usr.sbin/sendmail/src/useful.h
new file mode 100644
index 00000000000..ba33a792db0
--- /dev/null
+++ b/usr.sbin/sendmail/src/useful.h
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)useful.h	8.2 (Berkeley) 9/24/93
+ */
+
+# include <sys/types.h>
+
+/* support for bool type */
+typedef char	bool;
+# define TRUE	1
+# define FALSE	0
+
+# ifndef NULL
+# define NULL	0
+# endif /* NULL */
+
+/* bit hacking */
+# define bitset(bit, word)	(((word) & (bit)) != 0)
+
+/* some simple functions */
+# ifndef max
+# define max(a, b)	((a) > (b) ? (a) : (b))
+# define min(a, b)	((a) < (b) ? (a) : (b))
+# endif
+
+/* assertions */
+# ifndef NASSERT
+# define ASSERT(expr, msg, parm)\
+	if (!(expr))\
+	{\
+		fprintf(stderr, "assertion botch: %s:%d: ", __FILE__, __LINE__);\
+		fprintf(stderr, msg, parm);\
+	}
+# else /* NASSERT */
+# define ASSERT(expr, msg, parm)
+# endif /* NASSERT */
+
+/* sccs id's */
+# ifndef lint
+#  ifdef __STDC__
+#   define SCCSID(arg)	static char SccsId[] = #arg;
+#  else
+#   define SCCSID(arg)	static char SccsId[] = "arg";
+#  endif
+# else
+#  define SCCSID(arg)
+# endif
diff --git a/usr.sbin/sendmail/src/usersmtp.c b/usr.sbin/sendmail/src/usersmtp.c
new file mode 100644
index 00000000000..06acd3f2fc8
--- /dev/null
+++ b/usr.sbin/sendmail/src/usersmtp.c
@@ -0,0 +1,905 @@
+/*
+ * Copyright (c) 1983 Eric P. Allman
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+# include "sendmail.h"
+
+#ifndef lint
+#ifdef SMTP
+static char sccsid[] = "@(#)usersmtp.c	8.18 (Berkeley) 1/24/94 (with SMTP)";
+#else
+static char sccsid[] = "@(#)usersmtp.c	8.18 (Berkeley) 1/24/94 (without SMTP)";
+#endif
+#endif /* not lint */
+
+# include <sysexits.h>
+# include <errno.h>
+
+# ifdef SMTP
+
+/*
+**  USERSMTP -- run SMTP protocol from the user end.
+**
+**	This protocol is described in RFC821.
+*/
+
+#define REPLYTYPE(r)	((r) / 100)		/* first digit of reply code */
+#define REPLYCLASS(r)	(((r) / 10) % 10)	/* second digit of reply code */
+#define SMTPCLOSING	421			/* "Service Shutting Down" */
+
+char	SmtpMsgBuffer[MAXLINE];		/* buffer for commands */
+char	SmtpReplyBuffer[MAXLINE];	/* buffer for replies */
+char	SmtpError[MAXLINE] = "";	/* save failure error messages */
+int	SmtpPid;			/* pid of mailer */
+bool	SmtpNeedIntro;			/* need "while talking" in transcript */
+
+#ifdef __STDC__
+extern	smtpmessage(char *f, MAILER *m, MCI *mci, ...);
+#endif
+/*
+**  SMTPINIT -- initialize SMTP.
+**
+**	Opens the connection and sends the initial protocol.
+**
+**	Parameters:
+**		m -- mailer to create connection to.
+**		pvp -- pointer to parameter vector to pass to
+**			the mailer.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		creates connection and sends initial protocol.
+*/
+
+smtpinit(m, mci, e)
+	struct mailer *m;
+	register MCI *mci;
+	ENVELOPE *e;
+{
+	register int r;
+	register char *p;
+	extern void esmtp_check();
+	extern void helo_options();
+
+	if (tTd(18, 1))
+	{
+		printf("smtpinit ");
+		mci_dump(mci, FALSE);
+	}
+
+	/*
+	**  Open the connection to the mailer.
+	*/
+
+	SmtpError[0] = '\0';
+	CurHostName = mci->mci_host;		/* XXX UGLY XXX */
+	SmtpNeedIntro = TRUE;
+	switch (mci->mci_state)
+	{
+	  case MCIS_ACTIVE:
+		/* need to clear old information */
+		smtprset(m, mci, e);
+		/* fall through */
+
+	  case MCIS_OPEN:
+		return;
+
+	  case MCIS_ERROR:
+	  case MCIS_SSD:
+		/* shouldn't happen */
+		smtpquit(m, mci, e);
+		/* fall through */
+
+	  case MCIS_CLOSED:
+		syserr("451 smtpinit: state CLOSED");
+		return;
+
+	  case MCIS_OPENING:
+		break;
+	}
+
+	mci->mci_state = MCIS_OPENING;
+
+	/*
+	**  Get the greeting message.
+	**	This should appear spontaneously.  Give it five minutes to
+	**	happen.
+	*/
+
+	SmtpPhase = mci->mci_phase = "client greeting";
+	setproctitle("%s %s: %s", e->e_id, CurHostName, mci->mci_phase);
+	r = reply(m, mci, e, TimeOuts.to_initial, esmtp_check);
+	if (r < 0 || REPLYTYPE(r) == 4)
+		goto tempfail1;
+	if (REPLYTYPE(r) != 2)
+		goto unavailable;
+
+	/*
+	**  Send the HELO command.
+	**	My mother taught me to always introduce myself.
+	*/
+
+	if (bitnset(M_ESMTP, m->m_flags))
+		mci->mci_flags |= MCIF_ESMTP;
+
+tryhelo:
+	if (bitset(MCIF_ESMTP, mci->mci_flags))
+	{
+		smtpmessage("EHLO %s", m, mci, MyHostName);
+		SmtpPhase = mci->mci_phase = "client EHLO";
+	}
+	else
+	{
+		smtpmessage("HELO %s", m, mci, MyHostName);
+		SmtpPhase = mci->mci_phase = "client HELO";
+	}
+	setproctitle("%s %s: %s", e->e_id, CurHostName, mci->mci_phase);
+	r = reply(m, mci, e, TimeOuts.to_helo, helo_options);
+	if (r < 0)
+		goto tempfail1;
+	else if (REPLYTYPE(r) == 5)
+	{
+		if (bitset(MCIF_ESMTP, mci->mci_flags))
+		{
+			/* try old SMTP instead */
+			mci->mci_flags &= ~MCIF_ESMTP;
+			goto tryhelo;
+		}
+		goto unavailable;
+	}
+	else if (REPLYTYPE(r) != 2)
+		goto tempfail1;
+
+	/*
+	**  Check to see if we actually ended up talking to ourself.
+	**  This means we didn't know about an alias or MX, or we managed
+	**  to connect to an echo server.
+	**
+	**	If this code remains at all, "CheckLoopBack" should be
+	**	a mailer flag.  This is a MAYBENEXTRELEASE feature.
+	*/
+
+	p = strchr(&SmtpReplyBuffer[4], ' ');
+	if (p != NULL)
+		*p = '\0';
+	if (CheckLoopBack && strcasecmp(&SmtpReplyBuffer[4], MyHostName) == 0)
+	{
+		syserr("553 %s config error: mail loops back to myself",
+			MyHostName);
+		mci->mci_exitstat = EX_CONFIG;
+		mci->mci_errno = 0;
+		smtpquit(m, mci, e);
+		return;
+	}
+
+	/*
+	**  If this is expected to be another sendmail, send some internal
+	**  commands.
+	*/
+
+	if (bitnset(M_INTERNAL, m->m_flags))
+	{
+		/* tell it to be verbose */
+		smtpmessage("VERB", m, mci);
+		r = reply(m, mci, e, TimeOuts.to_miscshort, NULL);
+		if (r < 0)
+			goto tempfail2;
+	}
+
+	if (mci->mci_state != MCIS_CLOSED)
+	{
+		mci->mci_state = MCIS_OPEN;
+		return;
+	}
+
+	/* got a 421 error code during startup */
+
+  tempfail1:
+  tempfail2:
+	mci->mci_exitstat = EX_TEMPFAIL;
+	if (mci->mci_errno == 0)
+		mci->mci_errno = errno;
+	if (mci->mci_state != MCIS_CLOSED)
+		smtpquit(m, mci, e);
+	return;
+
+  unavailable:
+	mci->mci_exitstat = EX_UNAVAILABLE;
+	mci->mci_errno = errno;
+	smtpquit(m, mci, e);
+	return;
+}
+/*
+**  ESMTP_CHECK -- check to see if this implementation likes ESMTP protocol
+**
+**
+**	Parameters:
+**		line -- the response line.
+**		m -- the mailer.
+**		mci -- the mailer connection info.
+**		e -- the envelope.
+**
+**	Returns:
+**		none.
+*/
+
+void
+esmtp_check(line, m, mci, e)
+	char *line;
+	MAILER *m;
+	register MCI *mci;
+	ENVELOPE *e;
+{
+	if (strlen(line) < 5)
+		return;
+	line += 4;
+	if (strncmp(line, "ESMTP ", 6) == 0)
+		mci->mci_flags |= MCIF_ESMTP;
+}
+/*
+**  HELO_OPTIONS -- process the options on a HELO line.
+**
+**	Parameters:
+**		line -- the response line.
+**		m -- the mailer.
+**		mci -- the mailer connection info.
+**		e -- the envelope.
+**
+**	Returns:
+**		none.
+*/
+
+void
+helo_options(line, m, mci, e)
+	char *line;
+	MAILER *m;
+	register MCI *mci;
+	ENVELOPE *e;
+{
+	register char *p;
+
+	if (strlen(line) < 5)
+		return;
+	line += 4;
+	p = strchr(line, ' ');
+	if (p != NULL)
+		*p++ = '\0';
+	if (strcasecmp(line, "size") == 0)
+	{
+		mci->mci_flags |= MCIF_SIZE;
+		if (p != NULL)
+			mci->mci_maxsize = atol(p);
+	}
+	else if (strcasecmp(line, "8bitmime") == 0)
+	{
+		mci->mci_flags |= MCIF_8BITMIME;
+		mci->mci_flags &= ~MCIF_7BIT;
+	}
+	else if (strcasecmp(line, "expn") == 0)
+		mci->mci_flags |= MCIF_EXPN;
+}
+/*
+**  SMTPMAILFROM -- send MAIL command
+**
+**	Parameters:
+**		m -- the mailer.
+**		mci -- the mailer connection structure.
+**		e -- the envelope (including the sender to specify).
+*/
+
+smtpmailfrom(m, mci, e)
+	struct mailer *m;
+	MCI *mci;
+	ENVELOPE *e;
+{
+	int r;
+	char *bufp;
+	char buf[MAXNAME];
+	char optbuf[MAXLINE];
+
+	if (tTd(18, 2))
+		printf("smtpmailfrom: CurHost=%s\n", CurHostName);
+
+	/* set up appropriate options to include */
+	if (bitset(MCIF_SIZE, mci->mci_flags) && e->e_msgsize > 0)
+		sprintf(optbuf, " SIZE=%ld", e->e_msgsize);
+	else
+		strcpy(optbuf, "");
+
+	/*
+	**  Send the MAIL command.
+	**	Designates the sender.
+	*/
+
+	mci->mci_state = MCIS_ACTIVE;
+
+	if (bitset(EF_RESPONSE, e->e_flags) &&
+	    !bitnset(M_NO_NULL_FROM, m->m_flags))
+		(void) strcpy(buf, "");
+	else
+		expand("\201g", buf, &buf[sizeof buf - 1], e);
+	if (buf[0] == '<')
+	{
+		/* strip off <angle brackets> (put back on below) */
+		bufp = &buf[strlen(buf) - 1];
+		if (*bufp == '>')
+			*bufp = '\0';
+		bufp = &buf[1];
+	}
+	else
+		bufp = buf;
+	if (e->e_from.q_mailer == LocalMailer ||
+	    !bitnset(M_FROMPATH, m->m_flags))
+	{
+		smtpmessage("MAIL From:<%s>%s", m, mci, bufp, optbuf);
+	}
+	else
+	{
+		smtpmessage("MAIL From:<@%s%c%s>%s", m, mci, MyHostName,
+			*bufp == '@' ? ',' : ':', bufp, optbuf);
+	}
+	SmtpPhase = mci->mci_phase = "client MAIL";
+	setproctitle("%s %s: %s", e->e_id, CurHostName, mci->mci_phase);
+	r = reply(m, mci, e, TimeOuts.to_mail, NULL);
+	if (r < 0 || REPLYTYPE(r) == 4)
+	{
+		mci->mci_exitstat = EX_TEMPFAIL;
+		mci->mci_errno = errno;
+		smtpquit(m, mci, e);
+		return EX_TEMPFAIL;
+	}
+	else if (r == 250)
+	{
+		mci->mci_exitstat = EX_OK;
+		return EX_OK;
+	}
+	else if (r == 552)
+	{
+		/* signal service unavailable */
+		mci->mci_exitstat = EX_UNAVAILABLE;
+		smtpquit(m, mci, e);
+		return EX_UNAVAILABLE;
+	}
+
+#ifdef LOG
+	if (LogLevel > 1)
+	{
+		syslog(LOG_CRIT, "%s: SMTP MAIL protocol error: %s",
+			e->e_id, SmtpReplyBuffer);
+	}
+#endif
+
+	/* protocol error -- close up */
+	smtpquit(m, mci, e);
+	mci->mci_exitstat = EX_PROTOCOL;
+	return EX_PROTOCOL;
+}
+/*
+**  SMTPRCPT -- designate recipient.
+**
+**	Parameters:
+**		to -- address of recipient.
+**		m -- the mailer we are sending to.
+**		mci -- the connection info for this transaction.
+**		e -- the envelope for this transaction.
+**
+**	Returns:
+**		exit status corresponding to recipient status.
+**
+**	Side Effects:
+**		Sends the mail via SMTP.
+*/
+
+smtprcpt(to, m, mci, e)
+	ADDRESS *to;
+	register MAILER *m;
+	MCI *mci;
+	ENVELOPE *e;
+{
+	register int r;
+
+	smtpmessage("RCPT To:<%s>", m, mci, to->q_user);
+
+	SmtpPhase = mci->mci_phase = "client RCPT";
+	setproctitle("%s %s: %s", e->e_id, CurHostName, mci->mci_phase);
+	r = reply(m, mci, e, TimeOuts.to_rcpt, NULL);
+	if (r < 0 || REPLYTYPE(r) == 4)
+		return (EX_TEMPFAIL);
+	else if (REPLYTYPE(r) == 2)
+		return (EX_OK);
+	else if (r == 550 || r == 551 || r == 553)
+		return (EX_NOUSER);
+	else if (r == 552 || r == 554)
+		return (EX_UNAVAILABLE);
+
+#ifdef LOG
+	if (LogLevel > 1)
+	{
+		syslog(LOG_CRIT, "%s: SMTP RCPT protocol error: %s",
+			e->e_id, SmtpReplyBuffer);
+	}
+#endif
+
+	return (EX_PROTOCOL);
+}
+/*
+**  SMTPDATA -- send the data and clean up the transaction.
+**
+**	Parameters:
+**		m -- mailer being sent to.
+**		e -- the envelope for this message.
+**
+**	Returns:
+**		exit status corresponding to DATA command.
+**
+**	Side Effects:
+**		none.
+*/
+
+static jmp_buf	CtxDataTimeout;
+static int	datatimeout();
+
+smtpdata(m, mci, e)
+	struct mailer *m;
+	register MCI *mci;
+	register ENVELOPE *e;
+{
+	register int r;
+	register EVENT *ev;
+	time_t timeout;
+
+	/*
+	**  Send the data.
+	**	First send the command and check that it is ok.
+	**	Then send the data.
+	**	Follow it up with a dot to terminate.
+	**	Finally get the results of the transaction.
+	*/
+
+	/* send the command and check ok to proceed */
+	smtpmessage("DATA", m, mci);
+	SmtpPhase = mci->mci_phase = "client DATA 354";
+	setproctitle("%s %s: %s", e->e_id, CurHostName, mci->mci_phase);
+	r = reply(m, mci, e, TimeOuts.to_datainit, NULL);
+	if (r < 0 || REPLYTYPE(r) == 4)
+	{
+		smtpquit(m, mci, e);
+		return (EX_TEMPFAIL);
+	}
+	else if (r == 554)
+	{
+		smtprset(m, mci, e);
+		return (EX_UNAVAILABLE);
+	}
+	else if (r != 354)
+	{
+#ifdef LOG
+		if (LogLevel > 1)
+		{
+			syslog(LOG_CRIT, "%s: SMTP DATA-1 protocol error: %s",
+				e->e_id, SmtpReplyBuffer);
+		}
+#endif
+		smtprset(m, mci, e);
+		return (EX_PROTOCOL);
+	}
+
+	/*
+	**  Set timeout around data writes.  Make it at least large
+	**  enough for DNS timeouts on all recipients plus some fudge
+	**  factor.  The main thing is that it should not be infinite.
+	*/
+
+	if (setjmp(CtxDataTimeout) != 0)
+	{
+		mci->mci_errno = errno;
+		mci->mci_exitstat = EX_TEMPFAIL;
+		mci->mci_state = MCIS_ERROR;
+		syserr("451 timeout writing message to %s", mci->mci_host);
+		smtpquit(m, mci, e);
+		return EX_TEMPFAIL;
+	}
+
+	timeout = e->e_msgsize / 16;
+	if (timeout < (time_t) 60)
+		timeout = (time_t) 60;
+	timeout += e->e_nrcpts * 90;
+	ev = setevent(timeout, datatimeout, 0);
+
+	/* now output the actual message */
+	(*e->e_puthdr)(mci, e);
+	putline("\n", mci);
+	(*e->e_putbody)(mci, e, NULL);
+
+	clrevent(ev);
+
+	if (ferror(mci->mci_out))
+	{
+		/* error during processing -- don't send the dot */
+		mci->mci_errno = EIO;
+		mci->mci_exitstat = EX_IOERR;
+		mci->mci_state = MCIS_ERROR;
+		smtpquit(m, mci, e);
+		return EX_IOERR;
+	}
+
+	/* terminate the message */
+	fprintf(mci->mci_out, ".%s", m->m_eol);
+	if (TrafficLogFile != NULL)
+		fprintf(TrafficLogFile, "%05d >>> .\n", getpid());
+	if (Verbose)
+		nmessage(">>> .");
+
+	/* check for the results of the transaction */
+	SmtpPhase = mci->mci_phase = "client DATA 250";
+	setproctitle("%s %s: %s", e->e_id, CurHostName, mci->mci_phase);
+	r = reply(m, mci, e, TimeOuts.to_datafinal, NULL);
+	if (r < 0)
+	{
+		smtpquit(m, mci, e);
+		return (EX_TEMPFAIL);
+	}
+	mci->mci_state = MCIS_OPEN;
+	e->e_statmsg = newstr(&SmtpReplyBuffer[4]);
+	if (REPLYTYPE(r) == 4)
+		return (EX_TEMPFAIL);
+	else if (r == 250)
+		return (EX_OK);
+	else if (r == 552 || r == 554)
+		return (EX_UNAVAILABLE);
+#ifdef LOG
+	if (LogLevel > 1)
+	{
+		syslog(LOG_CRIT, "%s: SMTP DATA-2 protocol error: %s",
+			e->e_id, SmtpReplyBuffer);
+	}
+#endif
+	return (EX_PROTOCOL);
+}
+
+
+static int
+datatimeout()
+{
+	longjmp(CtxDataTimeout, 1);
+}
+/*
+**  SMTPQUIT -- close the SMTP connection.
+**
+**	Parameters:
+**		m -- a pointer to the mailer.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		sends the final protocol and closes the connection.
+*/
+
+smtpquit(m, mci, e)
+	register MAILER *m;
+	register MCI *mci;
+	ENVELOPE *e;
+{
+	bool oldSuprErrs = SuprErrs;
+
+	/*
+	**	Suppress errors here -- we may be processing a different
+	**	job when we do the quit connection, and we don't want the 
+	**	new job to be penalized for something that isn't it's
+	**	problem.
+	*/
+
+	SuprErrs = TRUE;
+
+	/* send the quit message if we haven't gotten I/O error */
+	if (mci->mci_state != MCIS_ERROR)
+	{
+		SmtpPhase = "client QUIT";
+		smtpmessage("QUIT", m, mci);
+		(void) reply(m, mci, e, TimeOuts.to_quit, NULL);
+		SuprErrs = oldSuprErrs;
+		if (mci->mci_state == MCIS_CLOSED)
+		{
+			SuprErrs = oldSuprErrs;
+			return;
+		}
+	}
+
+	/* now actually close the connection and pick up the zombie */
+	(void) endmailer(mci, e, NULL);
+
+	SuprErrs = oldSuprErrs;
+}
+/*
+**  SMTPRSET -- send a RSET (reset) command
+*/
+
+smtprset(m, mci, e)
+	register MAILER *m;
+	register MCI *mci;
+	ENVELOPE *e;
+{
+	int r;
+
+	SmtpPhase = "client RSET";
+	smtpmessage("RSET", m, mci);
+	r = reply(m, mci, e, TimeOuts.to_rset, NULL);
+	if (r < 0)
+		mci->mci_state = MCIS_ERROR;
+	else if (REPLYTYPE(r) == 2)
+	{
+		mci->mci_state = MCIS_OPEN;
+		return;
+	}
+	smtpquit(m, mci, e);
+}
+/*
+**  SMTPPROBE -- check the connection state
+*/
+
+smtpprobe(mci)
+	register MCI *mci;
+{
+	int r;
+	MAILER *m = mci->mci_mailer;
+	extern ENVELOPE BlankEnvelope;
+	ENVELOPE *e = &BlankEnvelope;
+
+	SmtpPhase = "client probe";
+	smtpmessage("RSET", m, mci);
+	r = reply(m, mci, e, TimeOuts.to_miscshort, NULL);
+	if (r < 0 || REPLYTYPE(r) != 2)
+		smtpquit(m, mci, e);
+	return r;
+}
+/*
+**  REPLY -- read arpanet reply
+**
+**	Parameters:
+**		m -- the mailer we are reading the reply from.
+**		mci -- the mailer connection info structure.
+**		e -- the current envelope.
+**		timeout -- the timeout for reads.
+**		pfunc -- processing function for second and subsequent
+**			lines of response -- if null, no special
+**			processing is done.
+**
+**	Returns:
+**		reply code it reads.
+**
+**	Side Effects:
+**		flushes the mail file.
+*/
+
+reply(m, mci, e, timeout, pfunc)
+	MAILER *m;
+	MCI *mci;
+	ENVELOPE *e;
+	time_t timeout;
+	void (*pfunc)();
+{
+	register char *bufp;
+	register int r;
+	bool firstline = TRUE;
+	char junkbuf[MAXLINE];
+
+	if (mci->mci_out != NULL)
+		(void) fflush(mci->mci_out);
+
+	if (tTd(18, 1))
+		printf("reply\n");
+
+	/*
+	**  Read the input line, being careful not to hang.
+	*/
+
+	for (bufp = SmtpReplyBuffer;; bufp = junkbuf)
+	{
+		register char *p;
+		extern time_t curtime();
+
+		/* actually do the read */
+		if (e->e_xfp != NULL)
+			(void) fflush(e->e_xfp);	/* for debugging */
+
+		/* if we are in the process of closing just give the code */
+		if (mci->mci_state == MCIS_CLOSED)
+			return (SMTPCLOSING);
+
+		if (mci->mci_out != NULL)
+			fflush(mci->mci_out);
+
+		/* get the line from the other side */
+		p = sfgets(bufp, MAXLINE, mci->mci_in, timeout, SmtpPhase);
+		mci->mci_lastuse = curtime();
+
+		if (p == NULL)
+		{
+			bool oldholderrs;
+			extern char MsgBuf[];		/* err.c */
+
+			/* if the remote end closed early, fake an error */
+			if (errno == 0)
+# ifdef ECONNRESET
+				errno = ECONNRESET;
+# else /* ECONNRESET */
+				errno = EPIPE;
+# endif /* ECONNRESET */
+
+			mci->mci_errno = errno;
+			mci->mci_exitstat = EX_TEMPFAIL;
+			oldholderrs = HoldErrs;
+			HoldErrs = TRUE;
+			usrerr("451 reply: read error from %s", mci->mci_host);
+
+			/* if debugging, pause so we can see state */
+			if (tTd(18, 100))
+				pause();
+			mci->mci_state = MCIS_ERROR;
+			smtpquit(m, mci, e);
+#ifdef XDEBUG
+			{
+				char wbuf[MAXLINE];
+				char *p = wbuf;
+				if (e->e_to != NULL)
+				{
+					sprintf(p, "%s... ", e->e_to);
+					p += strlen(p);
+				}
+				sprintf(p, "reply(%s) during %s",
+					mci->mci_host, SmtpPhase);
+				checkfd012(wbuf);
+			}
+#endif
+			HoldErrs = oldholderrs;
+			return (-1);
+		}
+		fixcrlf(bufp, TRUE);
+
+		/* EHLO failure is not a real error */
+		if (e->e_xfp != NULL && (bufp[0] == '4' ||
+		    (bufp[0] == '5' && strncmp(SmtpMsgBuffer, "EHLO", 4) != 0)))
+		{
+			/* serious error -- log the previous command */
+			if (SmtpNeedIntro)
+			{
+				/* inform user who we are chatting with */
+				fprintf(CurEnv->e_xfp,
+					"... while talking to %s:\n",
+					CurHostName);
+				SmtpNeedIntro = FALSE;
+			}
+			if (SmtpMsgBuffer[0] != '\0')
+				fprintf(e->e_xfp, ">>> %s\n", SmtpMsgBuffer);
+			SmtpMsgBuffer[0] = '\0';
+
+			/* now log the message as from the other side */
+			fprintf(e->e_xfp, "<<< %s\n", bufp);
+		}
+
+		/* display the input for verbose mode */
+		if (Verbose)
+			nmessage("050 %s", bufp);
+
+		/* process the line */
+		if (pfunc != NULL && !firstline)
+			(*pfunc)(bufp, m, mci, e);
+
+		firstline = FALSE;
+
+		/* if continuation is required, we can go on */
+		if (bufp[3] == '-')
+			continue;
+
+		/* ignore improperly formated input */
+		if (!(isascii(bufp[0]) && isdigit(bufp[0])))
+			continue;
+
+		/* decode the reply code */
+		r = atoi(bufp);
+
+		/* extra semantics: 0xx codes are "informational" */
+		if (r >= 100)
+			break;
+	}
+
+	/*
+	**  Now look at SmtpReplyBuffer -- only care about the first
+	**  line of the response from here on out.
+	*/
+
+	/* save temporary failure messages for posterity */
+	if (SmtpReplyBuffer[0] == '4' && SmtpError[0] == '\0')
+		(void) strcpy(SmtpError, SmtpReplyBuffer);
+
+	/* reply code 421 is "Service Shutting Down" */
+	if (r == SMTPCLOSING && mci->mci_state != MCIS_SSD)
+	{
+		/* send the quit protocol */
+		mci->mci_state = MCIS_SSD;
+		smtpquit(m, mci, e);
+	}
+
+	return (r);
+}
+/*
+**  SMTPMESSAGE -- send message to server
+**
+**	Parameters:
+**		f -- format
+**		m -- the mailer to control formatting.
+**		a, b, c -- parameters
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		writes message to mci->mci_out.
+*/
+
+/*VARARGS1*/
+#ifdef __STDC__
+smtpmessage(char *f, MAILER *m, MCI *mci, ...)
+#else
+smtpmessage(f, m, mci, va_alist)
+	char *f;
+	MAILER *m;
+	MCI *mci;
+	va_dcl
+#endif
+{
+	VA_LOCAL_DECL
+
+	VA_START(mci);
+	(void) vsprintf(SmtpMsgBuffer, f, ap);
+	VA_END;
+
+	if (tTd(18, 1) || Verbose)
+		nmessage(">>> %s", SmtpMsgBuffer);
+	if (TrafficLogFile != NULL)
+		fprintf(TrafficLogFile, "%05d >>> %s\n", getpid(), SmtpMsgBuffer);
+	if (mci->mci_out != NULL)
+	{
+		fprintf(mci->mci_out, "%s%s", SmtpMsgBuffer,
+			m == NULL ? "\r\n" : m->m_eol);
+	}
+	else if (tTd(18, 1))
+	{
+		printf("smtpmessage: NULL mci_out\n");
+	}
+}
+
+# endif /* SMTP */
diff --git a/usr.sbin/sendmail/src/util.c b/usr.sbin/sendmail/src/util.c
new file mode 100644
index 00000000000..3f6e1828855
--- /dev/null
+++ b/usr.sbin/sendmail/src/util.c
@@ -0,0 +1,1558 @@
+/*
+ * Copyright (c) 1983 Eric P. Allman
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)util.c	8.39.1.5 (Berkeley) 3/5/95";
+#endif /* not lint */
+
+# include "sendmail.h"
+# include <sysexits.h>
+/*
+**  STRIPQUOTES -- Strip quotes & quote bits from a string.
+**
+**	Runs through a string and strips off unquoted quote
+**	characters and quote bits.  This is done in place.
+**
+**	Parameters:
+**		s -- the string to strip.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		none.
+**
+**	Called By:
+**		deliver
+*/
+
+stripquotes(s)
+	char *s;
+{
+	register char *p;
+	register char *q;
+	register char c;
+
+	if (s == NULL)
+		return;
+
+	p = q = s;
+	do
+	{
+		c = *p++;
+		if (c == '\\')
+			c = *p++;
+		else if (c == '"')
+			continue;
+		*q++ = c;
+	} while (c != '\0');
+}
+/*
+**  XALLOC -- Allocate memory and bitch wildly on failure.
+**
+**	THIS IS A CLUDGE.  This should be made to give a proper
+**	error -- but after all, what can we do?
+**
+**	Parameters:
+**		sz -- size of area to allocate.
+**
+**	Returns:
+**		pointer to data region.
+**
+**	Side Effects:
+**		Memory is allocated.
+*/
+
+char *
+xalloc(sz)
+	register int sz;
+{
+	register char *p;
+
+	/* some systems can't handle size zero mallocs */
+	if (sz <= 0)
+		sz = 1;
+
+	p = malloc((unsigned) sz);
+	if (p == NULL)
+	{
+		syserr("Out of memory!!");
+		abort();
+		/* exit(EX_UNAVAILABLE); */
+	}
+	return (p);
+}
+/*
+**  COPYPLIST -- copy list of pointers.
+**
+**	This routine is the equivalent of newstr for lists of
+**	pointers.
+**
+**	Parameters:
+**		list -- list of pointers to copy.
+**			Must be NULL terminated.
+**		copycont -- if TRUE, copy the contents of the vector
+**			(which must be a string) also.
+**
+**	Returns:
+**		a copy of 'list'.
+**
+**	Side Effects:
+**		none.
+*/
+
+char **
+copyplist(list, copycont)
+	char **list;
+	bool copycont;
+{
+	register char **vp;
+	register char **newvp;
+
+	for (vp = list; *vp != NULL; vp++)
+		continue;
+
+	vp++;
+
+	newvp = (char **) xalloc((int) (vp - list) * sizeof *vp);
+	bcopy((char *) list, (char *) newvp, (int) (vp - list) * sizeof *vp);
+
+	if (copycont)
+	{
+		for (vp = newvp; *vp != NULL; vp++)
+			*vp = newstr(*vp);
+	}
+
+	return (newvp);
+}
+/*
+**  COPYQUEUE -- copy address queue.
+**
+**	This routine is the equivalent of newstr for address queues
+**	addresses marked with QDONTSEND aren't copied
+**
+**	Parameters:
+**		addr -- list of address structures to copy.
+**
+**	Returns:
+**		a copy of 'addr'.
+**
+**	Side Effects:
+**		none.
+*/
+
+ADDRESS *
+copyqueue(addr)
+	ADDRESS *addr;
+{
+	register ADDRESS *newaddr;
+	ADDRESS *ret;
+	register ADDRESS **tail = &ret;
+
+	while (addr != NULL)
+	{
+		if (!bitset(QDONTSEND, addr->q_flags))
+		{
+			newaddr = (ADDRESS *) xalloc(sizeof(ADDRESS));
+			STRUCTCOPY(*addr, *newaddr);
+			*tail = newaddr;
+			tail = &newaddr->q_next;
+		}
+		addr = addr->q_next;
+	}
+	*tail = NULL;
+	
+	return ret;
+}
+/*
+**  PRINTAV -- print argument vector.
+**
+**	Parameters:
+**		av -- argument vector.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		prints av.
+*/
+
+printav(av)
+	register char **av;
+{
+	while (*av != NULL)
+	{
+		if (tTd(0, 44))
+			printf("\n\t%08x=", *av);
+		else
+			(void) putchar(' ');
+		xputs(*av++);
+	}
+	(void) putchar('\n');
+}
+/*
+**  LOWER -- turn letter into lower case.
+**
+**	Parameters:
+**		c -- character to turn into lower case.
+**
+**	Returns:
+**		c, in lower case.
+**
+**	Side Effects:
+**		none.
+*/
+
+char
+lower(c)
+	register char c;
+{
+	return((isascii(c) && isupper(c)) ? tolower(c) : c);
+}
+/*
+**  XPUTS -- put string doing control escapes.
+**
+**	Parameters:
+**		s -- string to put.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		output to stdout
+*/
+
+xputs(s)
+	register char *s;
+{
+	register int c;
+	register struct metamac *mp;
+	extern struct metamac MetaMacros[];
+
+	if (s == NULL)
+	{
+		printf("<null>");
+		return;
+	}
+	while ((c = (*s++ & 0377)) != '\0')
+	{
+		if (!isascii(c))
+		{
+			if (c == MATCHREPL || c == MACROEXPAND)
+			{
+				putchar('$');
+				continue;
+			}
+			for (mp = MetaMacros; mp->metaname != '\0'; mp++)
+			{
+				if ((mp->metaval & 0377) == c)
+				{
+					printf("$%c", mp->metaname);
+					break;
+				}
+			}
+			if (mp->metaname != '\0')
+				continue;
+			(void) putchar('\\');
+			c &= 0177;
+		}
+		if (isprint(c))
+		{
+			putchar(c);
+			continue;
+		}
+
+		/* wasn't a meta-macro -- find another way to print it */
+		switch (c)
+		{
+		  case '\0':
+			continue;
+
+		  case '\n':
+			c = 'n';
+			break;
+
+		  case '\r':
+			c = 'r';
+			break;
+
+		  case '\t':
+			c = 't';
+			break;
+
+		  default:
+			(void) putchar('^');
+			(void) putchar(c ^ 0100);
+			continue;
+		}
+	}
+	(void) fflush(stdout);
+}
+/*
+**  MAKELOWER -- Translate a line into lower case
+**
+**	Parameters:
+**		p -- the string to translate.  If NULL, return is
+**			immediate.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		String pointed to by p is translated to lower case.
+**
+**	Called By:
+**		parse
+*/
+
+makelower(p)
+	register char *p;
+{
+	register char c;
+
+	if (p == NULL)
+		return;
+	for (; (c = *p) != '\0'; p++)
+		if (isascii(c) && isupper(c))
+			*p = tolower(c);
+}
+/*
+**  BUILDFNAME -- build full name from gecos style entry.
+**
+**	This routine interprets the strange entry that would appear
+**	in the GECOS field of the password file.
+**
+**	Parameters:
+**		p -- name to build.
+**		login -- the login name of this user (for &).
+**		buf -- place to put the result.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		none.
+*/
+
+buildfname(gecos, login, buf)
+	register char *gecos;
+	char *login;
+	char *buf;
+{
+	register char *p;
+	register char *bp = buf;
+	int l;
+
+	if (*gecos == '*')
+		gecos++;
+
+	/* find length of final string */
+	l = 0;
+	for (p = gecos; *p != '\0' && *p != ',' && *p != ';' && *p != '%'; p++)
+	{
+		if (*p == '&')
+			l += strlen(login);
+		else
+			l++;
+	}
+
+	/* now fill in buf */
+	for (p = gecos; *p != '\0' && *p != ',' && *p != ';' && *p != '%'; p++)
+	{
+		if (*p == '&')
+		{
+			(void) strcpy(bp, login);
+			*bp = toupper(*bp);
+			while (*bp != '\0')
+				bp++;
+		}
+		else
+			*bp++ = *p;
+	}
+	*bp = '\0';
+}
+/*
+**  SAFEFILE -- return true if a file exists and is safe for a user.
+**
+**	Parameters:
+**		fn -- filename to check.
+**		uid -- user id to compare against.
+**		gid -- group id to compare against.
+**		uname -- user name to compare against (used for group
+**			sets).
+**		flags -- modifiers:
+**			SFF_MUSTOWN -- "uid" must own this file.
+**			SFF_NOSLINK -- file cannot be a symbolic link.
+**		mode -- mode bits that must match.
+**
+**	Returns:
+**		0 if fn exists, is owned by uid, and matches mode.
+**		An errno otherwise.  The actual errno is cleared.
+**
+**	Side Effects:
+**		none.
+*/
+
+#include <grp.h>
+
+#ifndef S_IXOTH
+# define S_IXOTH	(S_IEXEC >> 6)
+#endif
+
+#ifndef S_IXGRP
+# define S_IXGRP	(S_IEXEC >> 3)
+#endif
+
+#ifndef S_IXUSR
+# define S_IXUSR	(S_IEXEC)
+#endif
+
+int
+safefile(fn, uid, gid, uname, flags, mode)
+	char *fn;
+	uid_t uid;
+	gid_t gid;
+	char *uname;
+	int flags;
+	int mode;
+{
+	register char *p;
+	register struct group *gr = NULL;
+	struct stat stbuf;
+
+	if (tTd(54, 4))
+		printf("safefile(%s, uid=%d, gid=%d, flags=%x, mode=%o):\n",
+			fn, uid, gid, flags, mode);
+	errno = 0;
+
+	for (p = fn; (p = strchr(++p, '/')) != NULL; *p = '/')
+	{
+		*p = '\0';
+		if (stat(fn, &stbuf) < 0)
+			break;
+		if (uid == 0 && !bitset(SFF_ROOTOK, flags))
+		{
+			if (bitset(S_IXOTH, stbuf.st_mode))
+				continue;
+			break;
+		}
+		if (stbuf.st_uid == uid && bitset(S_IXUSR, stbuf.st_mode))
+			continue;
+		if (stbuf.st_gid == gid && bitset(S_IXGRP, stbuf.st_mode))
+			continue;
+#ifndef NO_GROUP_SET
+		if (uname != NULL &&
+		    ((gr != NULL && gr->gr_gid == stbuf.st_gid) ||
+		     (gr = getgrgid(stbuf.st_gid)) != NULL))
+		{
+			register char **gp;
+
+			for (gp = gr->gr_mem; *gp != NULL; gp++)
+				if (strcmp(*gp, uname) == 0)
+					break;
+			if (*gp != NULL && bitset(S_IXGRP, stbuf.st_mode))
+				continue;
+		}
+#endif
+		if (!bitset(S_IXOTH, stbuf.st_mode))
+			break;
+	}
+	if (p != NULL)
+	{
+		int ret = errno;
+
+		if (ret == 0)
+			ret = EACCES;
+		if (tTd(54, 4))
+			printf("\t[dir %s] %s\n", fn, errstring(ret));
+		*p = '/';
+		return ret;
+	}
+
+#ifdef HASLSTAT
+	if ((bitset(SFF_NOSLINK, flags) ? lstat(fn, &stbuf)
+					: stat(fn, &stbuf)) < 0)
+#else
+	if (stat(fn, &stbuf) < 0)
+#endif
+	{
+		int ret = errno;
+
+		if (tTd(54, 4))
+			printf("\t%s\n", errstring(ret));
+
+		errno = 0;
+		return ret;
+	}
+
+#ifdef S_ISLNK
+	if (bitset(SFF_NOSLINK, flags) && S_ISLNK(stbuf.st_mode))
+	{
+		if (tTd(54, 4))
+			printf("\t[slink mode %o]\tEPERM\n", stbuf.st_mode);
+		return EPERM;
+	}
+#endif
+
+	if (uid == 0 && !bitset(SFF_ROOTOK, flags))
+		mode >>= 6;
+	else if (stbuf.st_uid != uid)
+	{
+		mode >>= 3;
+		if (stbuf.st_gid == gid)
+			;
+#ifndef NO_GROUP_SET
+		else if (uname != NULL &&
+			 ((gr != NULL && gr->gr_gid == stbuf.st_gid) ||
+			  (gr = getgrgid(stbuf.st_gid)) != NULL))
+		{
+			register char **gp;
+
+			for (gp = gr->gr_mem; *gp != NULL; gp++)
+				if (strcmp(*gp, uname) == 0)
+					break;
+			if (*gp == NULL)
+				mode >>= 3;
+		}
+#endif
+		else
+			mode >>= 3;
+	}
+	if (tTd(54, 4))
+		printf("\t[uid %d, stat %o, mode %o] ",
+			stbuf.st_uid, stbuf.st_mode, mode);
+	if ((stbuf.st_uid == uid || stbuf.st_uid == 0 ||
+	     !bitset(SFF_MUSTOWN, flags)) &&
+	    (stbuf.st_mode & mode) == mode)
+	{
+		if (tTd(54, 4))
+			printf("\tOK\n");
+		return 0;
+	}
+	if (tTd(54, 4))
+		printf("\tEACCES\n");
+	return EACCES;
+}
+/*
+**  FIXCRLF -- fix <CR><LF> in line.
+**
+**	Looks for the <CR><LF> combination and turns it into the
+**	UNIX canonical <NL> character.  It only takes one line,
+**	i.e., it is assumed that the first <NL> found is the end
+**	of the line.
+**
+**	Parameters:
+**		line -- the line to fix.
+**		stripnl -- if true, strip the newline also.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		line is changed in place.
+*/
+
+fixcrlf(line, stripnl)
+	char *line;
+	bool stripnl;
+{
+	register char *p;
+
+	p = strchr(line, '\n');
+	if (p == NULL)
+		return;
+	if (p > line && p[-1] == '\r')
+		p--;
+	if (!stripnl)
+		*p++ = '\n';
+	*p = '\0';
+}
+/*
+**  DFOPEN -- determined file open
+**
+**	This routine has the semantics of fopen, except that it will
+**	keep trying a few times to make this happen.  The idea is that
+**	on very loaded systems, we may run out of resources (inodes,
+**	whatever), so this tries to get around it.
+*/
+
+#ifndef O_ACCMODE
+# define O_ACCMODE	(O_RDONLY|O_WRONLY|O_RDWR)
+#endif
+
+struct omodes
+{
+	int	mask;
+	int	mode;
+	char	*farg;
+} OpenModes[] =
+{
+	O_ACCMODE,		O_RDONLY,		"r",
+	O_ACCMODE|O_APPEND,	O_WRONLY,		"w",
+	O_ACCMODE|O_APPEND,	O_WRONLY|O_APPEND,	"a",
+	O_TRUNC,		0,			"w+",
+	O_APPEND,		O_APPEND,		"a+",
+	0,			0,			"r+",
+};
+
+FILE *
+dfopen(filename, omode, cmode)
+	char *filename;
+	int omode;
+	int cmode;
+{
+	register int tries;
+	int fd;
+	register struct omodes *om;
+	struct stat st;
+
+	for (om = OpenModes; om->mask != 0; om++)
+		if ((omode & om->mask) == om->mode)
+			break;
+
+	for (tries = 0; tries < 10; tries++)
+	{
+		sleep((unsigned) (10 * tries));
+		errno = 0;
+		fd = open(filename, omode, cmode);
+		if (fd >= 0)
+			break;
+		switch (errno)
+		{
+		  case ENFILE:		/* system file table full */
+		  case EINTR:		/* interrupted syscall */
+#ifdef ETXTBSY
+		  case ETXTBSY:		/* Apollo: net file locked */
+#endif
+			continue;
+		}
+		break;
+	}
+	if (fd >= 0 && fstat(fd, &st) >= 0 && S_ISREG(st.st_mode))
+	{
+		int locktype;
+
+		/* lock the file to avoid accidental conflicts */
+		if ((omode & O_ACCMODE) != O_RDONLY)
+			locktype = LOCK_EX;
+		else
+			locktype = LOCK_SH;
+		(void) lockfile(fd, filename, NULL, locktype);
+		errno = 0;
+	}
+	if (fd < 0)
+		return NULL;
+	else
+		return fdopen(fd, om->farg);
+}
+/*
+**  PUTLINE -- put a line like fputs obeying SMTP conventions
+**
+**	This routine always guarantees outputing a newline (or CRLF,
+**	as appropriate) at the end of the string.
+**
+**	Parameters:
+**		l -- line to put.
+**		mci -- the mailer connection information.
+**
+**	Returns:
+**		none
+**
+**	Side Effects:
+**		output of l to fp.
+*/
+
+putline(l, mci)
+	register char *l;
+	register MCI *mci;
+{
+	register char *p;
+	register char svchar;
+	int slop = 0;
+
+	/* strip out 0200 bits -- these can look like TELNET protocol */
+	if (bitset(MCIF_7BIT, mci->mci_flags))
+	{
+		for (p = l; (svchar = *p) != '\0'; ++p)
+			if (bitset(0200, svchar))
+				*p = svchar &~ 0200;
+	}
+
+	do
+	{
+		/* find the end of the line */
+		p = strchr(l, '\n');
+		if (p == NULL)
+			p = &l[strlen(l)];
+
+		if (TrafficLogFile != NULL)
+			fprintf(TrafficLogFile, "%05d >>> ", getpid());
+
+		/* check for line overflow */
+		while (mci->mci_mailer->m_linelimit > 0 &&
+		       (p - l + slop) > mci->mci_mailer->m_linelimit)
+		{
+			register char *q = &l[mci->mci_mailer->m_linelimit - slop - 1];
+
+			svchar = *q;
+			*q = '\0';
+			if (l[0] == '.' && slop == 0 &&
+			    bitnset(M_XDOT, mci->mci_mailer->m_flags))
+			{
+				(void) putc('.', mci->mci_out);
+				if (TrafficLogFile != NULL)
+					(void) putc('.', TrafficLogFile);
+			}
+			fputs(l, mci->mci_out);
+			(void) putc('!', mci->mci_out);
+			fputs(mci->mci_mailer->m_eol, mci->mci_out);
+			(void) putc(' ', mci->mci_out);
+			if (TrafficLogFile != NULL)
+				fprintf(TrafficLogFile, "%s!\n%05d >>>  ",
+					l, getpid());
+			*q = svchar;
+			l = q;
+			slop = 1;
+		}
+
+		/* output last part */
+		if (l[0] == '.' && slop == 0 &&
+		    bitnset(M_XDOT, mci->mci_mailer->m_flags))
+		{
+			(void) putc('.', mci->mci_out);
+			if (TrafficLogFile != NULL)
+				(void) putc('.', TrafficLogFile);
+		}
+		if (TrafficLogFile != NULL)
+			fprintf(TrafficLogFile, "%.*s\n", p - l, l);
+		for ( ; l < p; ++l)
+			(void) putc(*l, mci->mci_out);
+		fputs(mci->mci_mailer->m_eol, mci->mci_out);
+		if (*l == '\n')
+			++l;
+	} while (l[0] != '\0');
+}
+/*
+**  XUNLINK -- unlink a file, doing logging as appropriate.
+**
+**	Parameters:
+**		f -- name of file to unlink.
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		f is unlinked.
+*/
+
+xunlink(f)
+	char *f;
+{
+	register int i;
+
+# ifdef LOG
+	if (LogLevel > 98)
+		syslog(LOG_DEBUG, "%s: unlink %s", CurEnv->e_id, f);
+# endif /* LOG */
+
+	i = unlink(f);
+# ifdef LOG
+	if (i < 0 && LogLevel > 97)
+		syslog(LOG_DEBUG, "%s: unlink-fail %d", f, errno);
+# endif /* LOG */
+}
+/*
+**  XFCLOSE -- close a file, doing logging as appropriate.
+**
+**	Parameters:
+**		fp -- file pointer for the file to close
+**		a, b -- miscellaneous crud to print for debugging
+**
+**	Returns:
+**		none.
+**
+**	Side Effects:
+**		fp is closed.
+*/
+
+xfclose(fp, a, b)
+	FILE *fp;
+	char *a, *b;
+{
+	if (tTd(53, 99))
+		printf("xfclose(%x) %s %s\n", fp, a, b);
+#ifdef XDEBUG
+	if (fileno(fp) == 1)
+		syserr("xfclose(%s %s): fd = 1", a, b);
+#endif
+	if (fclose(fp) < 0 && tTd(53, 99))
+		printf("xfclose FAILURE: %s\n", errstring(errno));
+}
+/*
+**  SFGETS -- "safe" fgets -- times out and ignores random interrupts.
+**
+**	Parameters:
+**		buf -- place to put the input line.
+**		siz -- size of buf.
+**		fp -- file to read from.
+**		timeout -- the timeout before error occurs.
+**		during -- what we are trying to read (for error messages).
+**
+**	Returns:
+**		NULL on error (including timeout).  This will also leave
+**			buf containing a null string.
+**		buf otherwise.
+**
+**	Side Effects:
+**		none.
+*/
+
+static jmp_buf	CtxReadTimeout;
+static int	readtimeout();
+static EVENT	*GlobalTimeout = NULL;
+static bool	EnableTimeout = FALSE;
+static int	ReadProgress;
+
+char *
+sfgets(buf, siz, fp, timeout, during)
+	char *buf;
+	int siz;
+	FILE *fp;
+	time_t timeout;
+	char *during;
+{
+	register EVENT *ev = NULL;
+	register char *p;
+
+	if (fp == NULL)
+	{
+		buf[0] = '\0';
+		return NULL;
+	}
+
+	/* set the timeout */
+	if (timeout != 0)
+	{
+		if (setjmp(CtxReadTimeout) != 0)
+		{
+# ifdef LOG
+			syslog(LOG_NOTICE,
+			    "timeout waiting for input from %s during %s\n",
+			    CurHostName? CurHostName: "local", during);
+# endif
+			errno = 0;
+			usrerr("451 timeout waiting for input during %s",
+				during);
+			buf[0] = '\0';
+#ifdef XDEBUG
+			checkfd012(during);
+#endif
+			return (NULL);
+		}
+		if (GlobalTimeout == NULL)
+			ev = setevent(timeout, readtimeout, 0);
+		else
+			EnableTimeout = TRUE;
+	}
+
+	/* try to read */
+	p = NULL;
+	while (!feof(fp) && !ferror(fp))
+	{
+		errno = 0;
+		p = fgets(buf, siz, fp);
+		if (p != NULL || errno != EINTR)
+			break;
+		clearerr(fp);
+	}
+
+	/* clear the event if it has not sprung */
+	if (GlobalTimeout == NULL)
+		clrevent(ev);
+	else
+		EnableTimeout = FALSE;
+
+	/* clean up the books and exit */
+	LineNumber++;
+	if (p == NULL)
+	{
+		buf[0] = '\0';
+		if (TrafficLogFile != NULL)
+			fprintf(TrafficLogFile, "%05d <<< [EOF]\n", getpid());
+		return (NULL);
+	}
+	if (TrafficLogFile != NULL)
+		fprintf(TrafficLogFile, "%05d <<< %s", getpid(), buf);
+	if (SevenBit)
+		for (p = buf; *p != '\0'; p++)
+			*p &= ~0200;
+	return (buf);
+}
+
+void
+sfgetset(timeout)
+	time_t timeout;
+{
+	/* cancel pending timer */
+	if (GlobalTimeout != NULL)
+	{
+		clrevent(GlobalTimeout);
+		GlobalTimeout = NULL;
+	}
+
+	/* schedule fresh one if so requested */
+	if (timeout != 0)
+	{
+		ReadProgress = LineNumber;
+		GlobalTimeout = setevent(timeout, readtimeout, timeout);
+	}
+}
+
+static
+readtimeout(timeout)
+	time_t timeout;
+{
+	/* terminate if ordinary timeout */
+	if (GlobalTimeout == NULL)
+		longjmp(CtxReadTimeout, 1);
+
+	/* terminate if no progress was made -- reset state */
+	if (EnableTimeout && (LineNumber <= ReadProgress))
+	{
+		EnableTimeout = FALSE;
+		GlobalTimeout = NULL;
+		longjmp(CtxReadTimeout, 2);
+	}
+
+	/* schedule a new timeout */
+	GlobalTimeout = NULL;
+	sfgetset(timeout);
+}
+/*
+**  FGETFOLDED -- like fgets, but know about folded lines.
+**
+**	Parameters:
+**		buf -- place to put result.
+**		n -- bytes available.
+**		f -- file to read from.
+**
+**	Returns:
+**		input line(s) on success, NULL on error or EOF.
+**		This will normally be buf -- unless the line is too
+**			long, when it will be xalloc()ed.
+**
+**	Side Effects:
+**		buf gets lines from f, with continuation lines (lines
+**		with leading white space) appended.  CRLF's are mapped
+**		into single newlines.  Any trailing NL is stripped.
+*/
+
+char *
+fgetfolded(buf, n, f)
+	char *buf;
+	register int n;
+	FILE *f;
+{
+	register char *p = buf;
+	char *bp = buf;
+	register int i;
+
+	n--;
+	while ((i = getc(f)) != EOF)
+	{
+		if (i == '\r')
+		{
+			i = getc(f);
+			if (i != '\n')
+			{
+				if (i != EOF)
+					(void) ungetc(i, f);
+				i = '\r';
+			}
+		}
+		if (--n <= 0)
+		{
+			/* allocate new space */
+			char *nbp;
+			int nn;
+
+			nn = (p - bp);
+			if (nn < MEMCHUNKSIZE)
+				nn *= 2;
+			else
+				nn += MEMCHUNKSIZE;
+			nbp = xalloc(nn);
+			bcopy(bp, nbp, p - bp);
+			p = &nbp[p - bp];
+			if (bp != buf)
+				free(bp);
+			bp = nbp;
+			n = nn - (p - bp);
+		}
+		*p++ = i;
+		if (i == '\n')
+		{
+			LineNumber++;
+			i = getc(f);
+			if (i != EOF)
+				(void) ungetc(i, f);
+			if (i != ' ' && i != '\t')
+				break;
+		}
+	}
+	if (p == bp)
+		return (NULL);
+	*--p = '\0';
+	return (bp);
+}
+/*
+**  CURTIME -- return current time.
+**
+**	Parameters:
+**		none.
+**
+**	Returns:
+**		the current time.
+**
+**	Side Effects:
+**		none.
+*/
+
+time_t
+curtime()
+{
+	auto time_t t;
+
+	(void) time(&t);
+	return (t);
+}
+/*
+**  ATOBOOL -- convert a string representation to boolean.
+**
+**	Defaults to "TRUE"
+**
+**	Parameters:
+**		s -- string to convert.  Takes "tTyY" as true,
+**			others as false.
+**
+**	Returns:
+**		A boolean representation of the string.
+**
+**	Side Effects:
+**		none.
+*/
+
+bool
+atobool(s)
+	register char *s;
+{
+	if (s == NULL || *s == '\0' || strchr("tTyY", *s) != NULL)
+		return (TRUE);
+	return (FALSE);
+}
+/*
+**  ATOOCT -- convert a string representation to octal.
+**
+**	Parameters:
+**		s -- string to convert.
+**
+**	Returns:
+**		An integer representing the string interpreted as an
+**		octal number.
+**
+**	Side Effects:
+**		none.
+*/
+
+atooct(s)
+	register char *s;
+{
+	register int i = 0;
+
+	while (*s >= '0' && *s <= '7')
+		i = (i << 3) | (*s++ - '0');
+	return (i);
+}
+/*
+**  WAITFOR -- wait for a particular process id.
+**
+**	Parameters:
+**		pid -- process id to wait for.
+**
+**	Returns:
+**		status of pid.
+**		-1 if pid never shows up.
+**
+**	Side Effects:
+**		none.
+*/
+
+int
+waitfor(pid)
+	int pid;
+{
+#ifdef WAITUNION
+	union wait st;
+#else
+	auto int st;
+#endif
+	int i;
+
+	do
+	{
+		errno = 0;
+		i = wait(&st);
+	} while ((i >= 0 || errno == EINTR) && i != pid);
+	if (i < 0)
+		return -1;
+#ifdef WAITUNION
+	return st.w_status;
+#else
+	return st;
+#endif
+}
+/*
+**  BITINTERSECT -- tell if two bitmaps intersect
+**
+**	Parameters:
+**		a, b -- the bitmaps in question
+**
+**	Returns:
+**		TRUE if they have a non-null intersection
+**		FALSE otherwise
+**
+**	Side Effects:
+**		none.
+*/
+
+bool
+bitintersect(a, b)
+	BITMAP a;
+	BITMAP b;
+{
+	int i;
+
+	for (i = BITMAPBYTES / sizeof (int); --i >= 0; )
+		if ((a[i] & b[i]) != 0)
+			return (TRUE);
+	return (FALSE);
+}
+/*
+**  BITZEROP -- tell if a bitmap is all zero
+**
+**	Parameters:
+**		map -- the bit map to check
+**
+**	Returns:
+**		TRUE if map is all zero.
+**		FALSE if there are any bits set in map.
+**
+**	Side Effects:
+**		none.
+*/
+
+bool
+bitzerop(map)
+	BITMAP map;
+{
+	int i;
+
+	for (i = BITMAPBYTES / sizeof (int); --i >= 0; )
+		if (map[i] != 0)
+			return (FALSE);
+	return (TRUE);
+}
+/*
+**  STRCONTAINEDIN -- tell if one string is contained in another
+**
+**	Parameters:
+**		a -- possible substring.
+**		b -- possible superstring.
+**
+**	Returns:
+**		TRUE if a is contained in b.
+**		FALSE otherwise.
+*/
+
+bool
+strcontainedin(a, b)
+	register char *a;
+	register char *b;
+{
+	int la;
+	int lb;
+	int c;
+
+	la = strlen(a);
+	lb = strlen(b);
+	c = *a;
+	if (isascii(c) && isupper(c))
+		c = tolower(c);
+	for (; lb-- >= la; b++)
+	{
+		if (*b != c && isascii(*b) && isupper(*b) && tolower(*b) != c)
+			continue;
+		if (strncasecmp(a, b, la) == 0)
+			return TRUE;
+	}
+	return FALSE;
+}
+/*
+**  CHECKFD012 -- check low numbered file descriptors
+**
+**	File descriptors 0, 1, and 2 should be open at all times.
+**	This routine verifies that, and fixes it if not true.
+**
+**	Parameters:
+**		where -- a tag printed if the assertion failed
+**
+**	Returns:
+**		none
+*/
+
+checkfd012(where)
+	char *where;
+{
+#ifdef XDEBUG
+	register int i;
+	struct stat stbuf;
+
+	for (i = 0; i < 3; i++)
+	{
+		if (fstat(i, &stbuf) < 0 && errno != EOPNOTSUPP)
+		{
+			/* oops.... */
+			int fd;
+
+			syserr("%s: fd %d not open", where, i);
+			fd = open("/dev/null", i == 0 ? O_RDONLY : O_WRONLY, 0666);
+			if (fd != i)
+			{
+				(void) dup2(fd, i);
+				(void) close(fd);
+			}
+		}
+	}
+#endif /* XDEBUG */
+}
+/*
+**  PRINTOPENFDS -- print the open file descriptors (for debugging)
+**
+**	Parameters:
+**		logit -- if set, send output to syslog; otherwise
+**			print for debugging.
+**
+**	Returns:
+**		none.
+*/
+
+#include <netdb.h>
+#include <arpa/inet.h>
+
+printopenfds(logit)
+	bool logit;
+{
+	register int fd;
+	extern int DtableSize;
+
+	for (fd = 0; fd < DtableSize; fd++)
+		dumpfd(fd, FALSE, logit);
+}
+/*
+**  DUMPFD -- dump a file descriptor
+**
+**	Parameters:
+**		fd -- the file descriptor to dump.
+**		printclosed -- if set, print a notification even if
+**			it is closed; otherwise print nothing.
+**		logit -- if set, send output to syslog instead of stdout.
+*/
+
+dumpfd(fd, printclosed, logit)
+	int fd;
+	bool printclosed;
+	bool logit;
+{
+	register struct hostent *hp;
+	register char *p;
+	char *fmtstr;
+	struct sockaddr_in sin;
+	auto int slen;
+	struct stat st;
+	char buf[200];
+
+	p = buf;
+	sprintf(p, "%3d: ", fd);
+	p += strlen(p);
+
+	if (fstat(fd, &st) < 0)
+	{
+		if (printclosed || errno != EBADF)
+		{
+			sprintf(p, "CANNOT STAT (%s)", errstring(errno));
+			goto printit;
+		}
+		return;
+	}
+
+	slen = fcntl(fd, F_GETFL, NULL);
+	if (slen != -1)
+	{
+		sprintf(p, "fl=0x%x, ", slen);
+		p += strlen(p);
+	}
+
+	sprintf(p, "mode=%o: ", st.st_mode);
+	p += strlen(p);
+	switch (st.st_mode & S_IFMT)
+	{
+#ifdef S_IFSOCK
+	  case S_IFSOCK:
+		sprintf(p, "SOCK ");
+		p += strlen(p);
+		slen = sizeof sin;
+		if (getsockname(fd, (struct sockaddr *) &sin, &slen) < 0)
+			sprintf(p, "(badsock)");
+		else
+		{
+			hp = gethostbyaddr((char *) &sin.sin_addr, slen, AF_INET);
+			sprintf(p, "%s/%d", hp == NULL ? inet_ntoa(sin.sin_addr)
+						   : hp->h_name, ntohs(sin.sin_port));
+		}
+		p += strlen(p);
+		sprintf(p, "->");
+		p += strlen(p);
+		slen = sizeof sin;
+		if (getpeername(fd, (struct sockaddr *) &sin, &slen) < 0)
+			sprintf(p, "(badsock)");
+		else
+		{
+			hp = gethostbyaddr((char *) &sin.sin_addr, slen, AF_INET);
+			sprintf(p, "%s/%d", hp == NULL ? inet_ntoa(sin.sin_addr)
+						   : hp->h_name, ntohs(sin.sin_port));
+		}
+		break;
+#endif
+
+	  case S_IFCHR:
+		sprintf(p, "CHR: ");
+		p += strlen(p);
+		goto defprint;
+
+	  case S_IFBLK:
+		sprintf(p, "BLK: ");
+		p += strlen(p);
+		goto defprint;
+
+#if defined(S_IFIFO) && (!defined(S_IFSOCK) || S_IFIFO != S_IFSOCK)
+	  case S_IFIFO:
+		sprintf(p, "FIFO: ");
+		p += strlen(p);
+		goto defprint;
+#endif
+
+#ifdef S_IFDIR
+	  case S_IFDIR:
+		sprintf(p, "DIR: ");
+		p += strlen(p);
+		goto defprint;
+#endif
+
+#ifdef S_IFLNK
+	  case S_IFLNK:
+		sprintf(p, "LNK: ");
+		p += strlen(p);
+		goto defprint;
+#endif
+
+	  default:
+defprint:
+		if (sizeof st.st_size > sizeof (long))
+			fmtstr = "dev=%d/%d, ino=%d, nlink=%d, u/gid=%d/%d, size=%qd";
+		else
+			fmtstr = "dev=%d/%d, ino=%d, nlink=%d, u/gid=%d/%d, size=%ld";
+		sprintf(p, fmtstr,
+			major(st.st_dev), minor(st.st_dev), st.st_ino,
+			st.st_nlink, st.st_uid, st.st_gid, st.st_size);
+		break;
+	}
+
+printit:
+#ifdef LOG
+	if (logit)
+		syslog(LOG_DEBUG, "%s", buf);
+	else
+#endif
+		printf("%s\n", buf);
+}
+/*
+**  SHORTENSTRING -- return short version of a string
+**
+**	If the string is already short, just return it.  If it is too
+**	long, return the head and tail of the string.
+**
+**	Parameters:
+**		s -- the string to shorten.
+**		m -- the max length of the string.
+**
+**	Returns:
+**		Either s or a short version of s.
+*/
+
+#ifndef MAXSHORTSTR
+# define MAXSHORTSTR	203
+#endif
+
+char *
+shortenstring(s, m)
+	register char *s;
+	int m;
+{
+	int l;
+	static char buf[MAXSHORTSTR + 1];
+
+	l = strlen(s);
+	if (l < m)
+		return s;
+	if (m > MAXSHORTSTR)
+		m = MAXSHORTSTR;
+	else if (m < 10)
+	{
+		if (m < 5)
+		{
+			strncpy(buf, s, m);
+			buf[m] = '\0';
+			return buf;
+		}
+		strncpy(buf, s, m - 3);
+		strcpy(buf + m - 3, "...");
+		return buf;
+	}
+	m = (m - 3) / 2;
+	strncpy(buf, s, m);
+	strcpy(buf + m, "...");
+	strcpy(buf + m + 3, s + l - m);
+	return buf;
+}
+/*
+**  CLEANSTRCPY -- copy string keeping out bogus characters
+**
+**	Parameters:
+**		t -- "to" string.
+**		f -- "from" string.
+**		l -- length of space available in "to" string.
+**
+**	Returns:
+**		none.
+*/
+
+void
+cleanstrcpy(t, f, l)
+	register char *t;
+	register char *f;
+	int l;
+{
+#ifdef LOG
+	/* check for newlines and log if necessary */
+	(void) denlstring(f, TRUE, TRUE);
+#endif
+
+	l--;
+	while (l > 0 && *f != '\0')
+	{
+		if (isascii(*f) &&
+		    (isalnum(*f) || strchr("!#$%&'*+-./^_`{|}~", *f) != NULL))
+		{
+			l--;
+			*t++ = *f;
+		}
+		f++;
+	}
+	*t = '\0';
+}
+/*
+**  DENLSTRING -- convert newlines in a string to spaces
+**
+**	Parameters:
+**		s -- the input string
+**		strict -- if set, don't permit continuation lines.
+**		logattacks -- if set, log attempted attacks.
+**
+**	Returns:
+**		A pointer to a version of the string with newlines
+**		mapped to spaces.  This should be copied.
+*/
+
+char *
+denlstring(s, strict, logattacks)
+	char *s;
+	int strict;
+	int logattacks;
+{
+	register char *p;
+	int l;
+	static char *bp = NULL;
+	static int bl = 0;
+
+	p = s;
+	while ((p = strchr(p, '\n')) != NULL)
+		if (strict || (*++p != ' ' && *p != '\t'))
+			break;
+	if (p == NULL)
+		return s;
+
+	l = strlen(s) + 1;
+	if (bl < l)
+	{
+		/* allocate more space */
+		if (bp != NULL)
+			free(bp);
+		bp = xalloc(l);
+		bl = l;
+	}
+	strcpy(bp, s);
+	for (p = bp; (p = strchr(p, '\n')) != NULL; )
+		*p++ = ' ';
+
+#ifdef LOG
+	if (logattacks)
+	{
+		syslog(LOG_NOTICE, "POSSIBLE ATTACK from %s: newline in string \"%s\"",
+			RealHostName == NULL ? "[UNKNOWN]" : RealHostName,
+			shortenstring(bp, 80));
+	}
+#endif
+
+	return bp;
+}
diff --git a/usr.sbin/sendmail/src/version.c b/usr.sbin/sendmail/src/version.c
new file mode 100644
index 00000000000..ad4dd520c80
--- /dev/null
+++ b/usr.sbin/sendmail/src/version.c
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 1983 Eric P. Allman
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)version.c	8.6.12.1 (Berkeley) 3/28/95";
+#endif /* not lint */
+
+char	Version[] = "8.6.12";
diff --git a/usr.sbin/sendmail/test/Results b/usr.sbin/sendmail/test/Results
new file mode 100644
index 00000000000..37a1bb2c363
--- /dev/null
+++ b/usr.sbin/sendmail/test/Results
@@ -0,0 +1,53 @@
+The following are results of running t_setreuid on various architectures.
+
+OPSYS	VERSION	STATUS	DATE	  TESTER/NOTES
+=====	=======	======	====	  ============
+
+SunOS	4.1	OK	93.07.19  eric
+SunOS	4.1.2	OK	93.07.19  eric
+SunOS	4.1.3	OK	93.09.25  Robert Elz
+
+BSD	4.4	OK	93.07.19  eric	(wierd results, but functional)
+BSD	4.3Utah	OK	93.07.19  eric
+
+Ultrix	4.2A	OK	93.07.19  eric
+Ultrix	4.3A	OK	93.07.19  Allan Johannesen
+
+HP-UX	8.07	OK	93.07.19  eric (on 7xx series)
+HP-UX	8.02	OK	93.07.19  Michael Corrigan (on 8xx series)
+HP-UX	8.00	OK	93.07.21  Michael Corrigan (on 3xx/4xx series)
+HP-UX	9.01	OK	93.11.19  Cassidy (on 7xx series)
+
+Solaris	2.1
+Solaris	2.2	FAIL	93.07.19  Bill Wisner
+
+OSF/1	T1.3-4	OK	93.07.19  eric (on DEC Alpha)
+OSF/1	1.3	OK	94.12.10  Jeff A. Earickson (on Intel Paragon)
+
+CxOS	11.0	OK	93.01.21  Eric Schnoebelen (CxOS 11.0 beta 1)
+CxOS	10.x	OK	93.01.21  Eric Schnoebelen
+
+AIX	3.1.5	FAIL	93.08.07  David J. N. Begley
+AIX	3.2.3e	FAIL	93.07.26  Steve Bauer <sbauer@silver.sdsmt.edu>
+AIX	3.2.4	FAIL	93.10.07  David J. N. Begley
+AIX	3.2.5	FAIL	94.05.17  Steve Bauer <sbauer@hpcmmib.hpc.sdsmt.edu>
+
+IRIX	4.0.4	OK	93.09.25  Robert Elz
+IRIX	5.2	OK	94.12.06  Mark Andrews <mandrews@alias.com>
+IRIX	5.3	OK	94.12.06  Mark Andrews <mandrews@alias.com>
+
+SCO	3.2v4.0	OK	93.10.02  Peter Wemm (with -lsocket from 3.2v4 devsys)
+
+NeXT	2.1	OK	93.07.28  eric
+NeXT	3.0	OK	34.05.05  Kevin John Wang <kwang@lore.acs.calpoly.edu>
+
+Linux	0.99p10	OK	93.08.08  Karl London
+Linux	0.99p13	OK	93.09.27  Christian Kuhtz
+Linux	0.99p14	OK	93.11.30  Christian Kuhtz <chk@data-hh.Hanse.DE>
+Linux	1.0	OK	94.03.19  Shayne Smith <snsmith@rastus.brisnet.org.au>
+
+BSD/386	1.0	OK	93.11.13  Tony Sanders
+
+DELL	2.2	OK	93.11.15  Peter Wemm (using -DSETEUID)
+
+Pyramid	5.0d	OK	95.01.14  David Miller <davem@nadzieja.rutgers.edu>
diff --git a/usr.sbin/sendmail/test/t_setreuid.c b/usr.sbin/sendmail/test/t_setreuid.c
new file mode 100644
index 00000000000..2d087c3c36e
--- /dev/null
+++ b/usr.sbin/sendmail/test/t_setreuid.c
@@ -0,0 +1,82 @@
+/*
+**  This program checks to see if your version of setreuid works.
+**  Compile it, make it setuid root, and run it as yourself (NOT as
+**  root).  If it won't compile or outputs any MAYDAY messages, don't
+**  define HASSETREUID in conf.h.
+**
+**  Compilation is trivial -- just "cc t_setreuid.c".
+*/
+
+#include <sys/types.h>
+#include <unistd.h>
+#include <stdio.h>
+
+#ifdef __hpux
+#define setreuid(r, e)	setresuid(r, e, -1)
+#endif
+
+main()
+{
+	uid_t realuid = getuid();
+
+	printuids("initial uids", realuid, 0);
+
+	if (geteuid() != 0)
+	{
+		printf("re-run setuid root\n");
+		exit(1);
+	}
+
+	if (setreuid(0, 1) < 0)
+		printf("setreuid(0, 1) failure\n");
+	printuids("after setreuid(0, 1)", 0, 1);
+
+	if (geteuid() != 1)
+		printf("MAYDAY!  Wrong effective uid\n");
+
+	/* do activity here */
+
+	if (setreuid(-1, 0) < 0)
+		printf("setreuid(-1, 0) failure\n");
+	printuids("after setreuid(-1, 0)", 0, 0);
+	if (setreuid(realuid, 0) < 0)
+		printf("setreuid(%d, 0) failure\n", realuid);
+	printuids("after setreuid(realuid, 0)", realuid, 0);
+
+	if (geteuid() != 0)
+		printf("MAYDAY!  Wrong effective uid\n");
+	if (getuid() != realuid)
+		printf("MAYDAY!  Wrong real uid\n");
+	printf("\n");
+
+	if (setreuid(0, 2) < 0)
+		printf("setreuid(0, 2) failure\n");
+	printuids("after setreuid(0, 2)", 0, 2);
+
+	if (geteuid() != 2)
+		printf("MAYDAY!  Wrong effective uid\n");
+
+	/* do activity here */
+
+	if (setreuid(-1, 0) < 0)
+		printf("setreuid(-1, 0) failure\n");
+	printuids("after setreuid(-1, 0)", 0, 0);
+	if (setreuid(realuid, 0) < 0)
+		printf("setreuid(%d, 0) failure\n", realuid);
+	printuids("after setreuid(realuid, 0)", realuid, 0);
+
+	if (geteuid() != 0)
+		printf("MAYDAY!  Wrong effective uid\n");
+	if (getuid() != realuid)
+		printf("MAYDAY!  Wrong real uid\n");
+
+	exit(0);
+}
+
+printuids(str, r, e)
+	char *str;
+	int r, e;
+{
+	printf("%s (should be %d/%d): r/euid=%d/%d\n", str, r, e,
+		getuid(), geteuid());
+}