Import of sendmail version 8.11.0 into vendor branch SENDMAIL with

release tag v8_11_0.

Obtained from: ftp://ftp.sendmail.org/pub/sendmail/

5 files changed, 195 insertions, 728 deletions

diff --git a/contrib/sendmail/mailstats/Build b/contrib/sendmail/mailstats/Build
index ab8a49d..3c8e03f 100755
--- a/contrib/sendmail/mailstats/Build
+++ b/contrib/sendmail/mailstats/Build
@@ -1,513 +1,13 @@
 #!/bin/sh
 
-# Copyright (c) 1998 Sendmail, Inc.  All rights reserved.
-# Copyright (c) 1993, 1996-1997 Eric P. Allman.  All rights reserved.
-# Copyright (c) 1993
-#	The Regents of the University of California.  All rights reserved.
+# Copyright (c) 1999 Sendmail, Inc. and its suppliers.
+#	All rights reserved.
 #
 # By using this file, you agree to the terms and conditions set
 # forth in the LICENSE file which can be found at the top level of
 # the sendmail distribution.
 #
 #
-#       @(#)Build	8.93 (Berkeley) 6/24/98
-#
-
-#
-#  A quick-and-dirty script to compile sendmail and related programs
-#  in the presence of multiple architectures.  To use, just use
-#  "sh Build".
-#
-
-trap "rm -f $obj/.settings$$; exit" 1 2 3 15
-
-cflag=""
-mflag=""
-sflag=""
-makeargs=""
-libdirs=""
-incdirs=""
-libsrch=""
-siteconfig=""
-EX_USAGE=64
-EX_NOINPUT=66
-EX_UNAVAILABLE=69
-
-while [ ! -z "$1" ]
-do
-	case $1
-	in
-	  -c)	# clean out existing $obj tree
-		cflag=1
-		shift
-		;;
-
-	  -m)	# show Makefile name only
-		mflag=1
-		shift
-		;;
-
-	  -E*)	# environment variables to pass into Build
-		arg=`echo $1 | sed 's/^-E//'`
-		if [ -z "$arg" ]
-		then
-		    shift   # move to argument
-		    arg=$1
-		fi
-		if [ -z "$arg" ]
-		then
-			echo "Empty -E flag" >&2
-			exit $EX_USAGE
-		else
-			case $arg
-			in
-			  *=*)	# check format
-				eval $arg
-				export `echo $arg | sed 's;=.*;;'`
-				;;
-			  *)	# bad format
-				echo "Bad format for -E argument ($arg)" >&2
-				exit $EX_USAGE
-				;;
-			esac
-			shift
-		fi
-		;;
-
-	  -L*)	# set up LIBDIRS
-		libdirs="$libdirs $1"
-		shift
-		;;
-
-	  -I*)	# set up INCDIRS
-		incdirs="$incdirs $1"
-		shift
-		;;
-
-	  -f*)	# select site config file
-		arg=`echo $1 | sed 's/^-f//'`
-		if [ -z "$arg" ]
-		then
-		    shift   # move to argument
-		    arg=$1
-		fi
-		if [ "$siteconfig" ]
-		then
-			echo "Only one -f flag allowed" >&2
-			exit $EX_USAGE
-		else
-			siteconfig=$arg
-			if [ -z "$siteconfig" ]
-			then
-				echo "Missing argument for -f flag" >&2
-				exit $EX_USAGE
-			elif [ ! -f "$siteconfig" ]
-			then
-				echo "${siteconfig}: File not found"
-				exit $EX_NOINPUT
-			else
-				shift	# move past argument
-			fi
-		fi
-		;;
-
-	  -S)	# skip auto-configure
-		sflag="-s"
-		shift
-		;;
-
-	  *)	# pass argument to make
-		makeargs="$makeargs \"$1\""
-		shift
-		;;
-	esac
-done
-
-#
-#  Do heuristic guesses !ONLY! for machines that do not have uname
-#
-if [ -d /NextApps -a ! -f /bin/uname -a ! -f /usr/bin/uname ]
-then
-	# probably a NeXT box
-	arch=`hostinfo | sed -n 's/.*Processor type: \([^ ]*\).*/\1/p'`
-	os=NeXT
-	rel=`hostinfo | sed -n 's/.*NeXT Mach \([0-9\.]*\).*/\1/p'`
-elif [ -f /usr/sony/bin/machine -a -f /etc/osversion ]
-then
-	# probably a Sony NEWS 4.x
-	os=NEWS-OS
-	rel=`awk '{ print $3}' /etc/osversion`
-	arch=`/usr/sony/bin/machine`
-elif [ -d /usr/omron -a -f /bin/luna ]
-then
-	# probably a Omron LUNA
-	os=LUNA
-	if [ -f /bin/luna1 ] && /bin/luna1
-	then
-		rel=unios-b
-		arch=luna1
-	elif [ -f /bin/luna2 ] && /bin/luna2
-	then
-		rel=Mach
-		arch=luna2
-	elif [ -f /bin/luna88k ] && /bin/luna88k
-	then
-		rel=Mach
-		arch=luna88k
-	fi
-elif [ -d /usr/apollo -a -d \`node_data ]
-then
-	# probably a Apollo/DOMAIN
-	os=DomainOS
-	arch=$ISP
-	rel=`/usr/apollo/bin/bldt | grep Domain | awk '{ print $4 }' | sed -e 's/,//g'`
-fi
-
-if [ ! "$arch" -a ! "$os" -a ! "$rel" ]
-then
-	arch=`uname -m | sed -e 's/ //g'`
-	os=`uname -s | sed -e 's/\//-/g' -e 's/ //g'`
-	rel=`uname -r | sed -e 's/(/-/g' -e 's/)//g'`
-fi
-
-#
-#  Tweak the values we have already got.  PLEASE LIMIT THESE to
-#  tweaks that are absolutely necessary because your system uname
-#  routine doesn't return something sufficiently unique.  Don't do
-#  it just because you don't like the name that is returned.  You
-#  can combine the architecture name with the os name to create a
-#  unique Makefile name.
-#
-
-# tweak machine architecture
-case $arch
-in
-  sun4*)	arch=sun4;;
-
-  9000/*)	arch=`echo $arch | sed -e 's/9000.//' -e 's/..$/xx/'`;;
-
-  DS/907000)	arch=ds90;;
-
-  NILE*)	arch=NILE
-		os=`uname -v`;;
-esac
-
-# tweak operating system type and release
-node=`uname -n | sed -e 's/\//-/g' -e 's/ //g'`
-if [ "$os" = "$node" -a "$arch" = "i386" -a "$rel" = 3.2 -a "`uname -v`" = 2 ]
-then
-	# old versions of SCO UNIX set uname -s the same as uname -n
-	os=SCO_SV
-fi
-if [ "$rel" = 4.0 ]
-then
-	case $arch in
-	  3[34]??|3[34]??,*)
-		if [ -d /usr/sadm/sysadm/add-ons/WIN-TCP ]
-		then
-			os=NCR.MP-RAS.2.x
-		elif [ -d /usr/sadm/sysadm/add-ons/inet ]
-		then
-			os=NCR.MP-RAS.3.x
-		fi
-		;;
-	esac
-fi
-
-case $os
-in
-  DYNIX-ptx)	os=PTX;;
-  Paragon*)	os=Paragon;;
-  HP-UX)	rel=`echo $rel | sed -e 's/^[^.]*\.0*//'`;;
-  AIX)		rela=$rel
-		rel=`uname -v`
-		case $rel in
-		  2)	arch=""
-			;;
-		  4)	if [ "$rela" = "3" ]
-			then
-				arch=$rela
-			fi
-			;;
-		esac
-		rel=$rel.$rela
-		;;
-  BSD-386)	os=BSD-OS;;
-  SCO_SV)	os=SCO; rel=`uname -X | sed -n 's/Release = 3.2v//p'`;;
-  UNIX_System_V) if [ "$arch" = "ds90" ]
-		then
-			os="UXPDS"
-			rel=`uname -v | sed -e 's/\(V.*\)L.*/\1/'`
-		fi;;
-  SINIX-?)	os=SINIX;;
-  DomainOS)	case $rel in
-		  10.4*)	rel=10.4;;
-		esac
-		;;
-esac
-
-# get "base part" of operating system release
-rroot=`echo $rel | sed -e 's/\.[^.]*$//'`
-rbase=`echo $rel | sed -e 's/\..*//'`
-if [ "$rroot" = "$rbase" ]
-then
-	rroot=$rel
-fi
-
-# heuristic tweaks to clean up names -- PLEASE LIMIT THESE!
-if [ "$os" = "unix" ]
-then
-	# might be Altos System V
-	case $rel
-	in
-	  5.3*)		os=Altos;;
-	esac
-elif [ -r /unix -a -r /usr/lib/libseq.a -a -r /lib/cpp ]
-then
-	# might be a DYNIX/ptx 2.x system, which has a broken uname
-	if strings /lib/cpp | grep _SEQUENT_ > /dev/null
-	then
-		os=PTX
-	fi
-elif [ -d /usr/nec ]
-then
-	# NEC machine -- what is it running?
-	if [ "$os" = "UNIX_System_V" ]
-	then
-		os=EWS-UX_V
-	elif [ "$os" = "UNIX_SV" ]
-	then
-		os=UX4800
-	fi
-elif [ "$arch" = "mips" ]
-then
-	case $rel
-	in
-	  4_*)
-		if [ `uname -v` = "UMIPS" ]
-		then
-			os=RISCos
-		fi;;
-	esac
-fi
-
-# see if there is a "user suffix" specified
-if [ "${SENDMAIL_SUFFIX-}x" = "x" ]
-then
-	sfx=""
-else
-	sfx=".${SENDMAIL_SUFFIX}"
-fi
-
-echo "Configuration: os=$os, rel=$rel, rbase=$rbase, rroot=$rroot, arch=$arch, sfx=$sfx"
-
-
-SMROOT=${SMROOT-..}
-BUILDTOOLS=${BUILDTOOLS-$SMROOT/BuildTools}
-export SMROOT BUILDTOOLS
-
-# see if we are in a Build-able directory
-if [ ! -f Makefile.m4 ]; then
-	echo "Makefile.m4 not found.  Build can only be run from a source directory."
-	exit $EX_UNAVAILABLE
-fi
-
-# now try to find a reasonable object directory
-if [ -r obj.$os.$rel.$arch$sfx ]; then
-	obj=obj.$os.$rel.$arch$sfx
-elif [ -r obj.$os.$rroot.$arch$sfx ]; then
-	obj=obj.$os.$rroot.$arch$sfx
-elif [ -r obj.$os.$rbase.x.$arch$sfx ]; then
-	obj=obj.$os.$rbase.x.$arch$sfx
-elif [ -r obj.$os.$rel$sfx ]; then
-	obj=obj.$os.$rel$sfx
-elif [ -r obj.$os.$rbase.x$sfx ]; then
-	obj=obj.$os.$rbase.x$sfx
-elif [ -r obj.$os.$arch$sfx ]; then
-	obj=obj.$os.$arch$sfx
-elif [ -r obj.$rel.$arch$sfx ]; then
-	obj=obj.$rel.$arch$sfx
-elif [ -r obj.$rbase.x.$arch$sfx ]; then
-	obj=obj.$rbase.x.$arch$sfx
-elif [ -r obj.$os$sfx ]; then
-	obj=obj.$os$sfx
-elif [ -r obj.$arch$sfx ]; then
-	obj=obj.$arch$sfx
-elif [ -r obj.$rel$sfx ]; then
-	obj=obj.$rel$sfx
-elif [ -r obj$sfx ]; then
-	obj=obj$sfx
-fi
-if [ -z "$obj" -o "$cflag" ]
-then
-	if [ -n "$obj" ]
-	then
-		echo "Clearing out existing $obj tree"
-		rm -rf $obj
-	else
-		# no existing obj directory -- try to create one if Makefile found
-		obj=obj.$os.$rel.$arch$sfx
-	fi
-	if [ -r $BUILDTOOLS/OS/$os.$rel.$arch$sfx ]; then
-		oscf=$os.$rel.$arch$sfx
-	elif [ -r $BUILDTOOLS/OS/$os.$rel.$arch ]; then
-		oscf=$os.$rel.$arch
-	elif [ -r $BUILDTOOLS/OS/$os.$rroot.$arch$sfx ]; then
-		oscf=$os.$rroot.$arch$sfx
-	elif [ -r $BUILDTOOLS/OS/$os.$rroot.$arch ]; then
-		oscf=$os.$rroot.$arch
-	elif [ -r $BUILDTOOLS/OS/$os.$rbase.x.$arch$sfx ]; then
-		oscf=$os.$rbase.x.$arch$sfx
-	elif [ -r $BUILDTOOLS/OS/$os.$rbase.x.$arch ]; then
-		oscf=$os.$rbase.x.$arch
-	elif [ -r $BUILDTOOLS/OS/$os.$rel$sfx ]; then
-		oscf=$os.$rel$sfx
-	elif [ -r $BUILDTOOLS/OS/$os.$rel ]; then
-		oscf=$os.$rel
-	elif [ -r $BUILDTOOLS/OS/$os.$rroot$sfx ]; then
-		oscf=$os.$rroot$sfx
-	elif [ -r $BUILDTOOLS/OS/$os.$rroot ]; then
-		oscf=$os.$rroot
-	elif [ -r $BUILDTOOLS/OS/$os.$rbase.x$sfx ]; then
-		oscf=$os.$rbase.x$sfx
-	elif [ -r $BUILDTOOLS/OS/$os.$rbase.x ]; then
-		oscf=$os.$rbase.x
-	elif [ -r $BUILDTOOLS/OS/$os.$arch$sfx ]; then
-		oscf=$os.$arch$sfx
-	elif [ -r $BUILDTOOLS/OS/$os.$arch ]; then
-		oscf=$os.$arch
-	elif [ -r $BUILDTOOLS/OS/$rel.$arch$sfx ]; then
-		oscf=$rel.$arch$sfx
-	elif [ -r $BUILDTOOLS/OS/$rel.$arch ]; then
-		oscf=$rel.$arch
-	elif [ -r $BUILDTOOLS/OS/$rroot.$arch$sfx ]; then
-		oscf=$rroot.$arch$sfx
-	elif [ -r $BUILDTOOLS/OS/$rroot.$arch ]; then
-		oscf=$rroot.$arch
-	elif [ -r $BUILDTOOLS/OS/$rbase.x.$arch$sfx ]; then
-		oscf=$rbase.x.$arch$sfx
-	elif [ -r $BUILDTOOLS/OS/$rbase.x.$arch ]; then
-		oscf=$rbase.x.$arch
-	elif [ -r $BUILDTOOLS/OS/$os$sfx ]; then
-		oscf=$os$sfx
-	elif [ -r $BUILDTOOLS/OS/$os ]; then
-		oscf=$os
-	elif [ -r $BUILDTOOLS/OS/$arch$sfx ]; then
-		oscf=$arch$sfx
-	elif [ -r $BUILDTOOLS/OS/$arch ]; then
-		oscf=$arch
-	elif [ -r $BUILDTOOLS/OS/$rel$sfx ]; then
-		oscf=$rel$sfx
-	elif [ -r $BUILDTOOLS/OS/$rel ]; then
-		oscf=$rel
-	elif [ -r $BUILDTOOLS/OS/$rel$sfx ]; then
-		oscf=$rel$sfx
-	else
-		echo "Cannot determine how to support $arch.$os.$rel" >&2
-		exit $EX_UNAVAILABLE
-	fi
-	M4=`sh $BUILDTOOLS/bin/find_m4.sh`
-	ret=$?
-	if [ $ret -ne 0 ]
-	then
-		exit $ret
-	fi
-	echo "Using M4=$M4"
-	export M4
-	if [ "$mflag" ]
-	then
-		echo "Will run in virgin $obj using $BUILDTOOLS/OS/$oscf"
-		exit 0
-	fi
-	if [ "$ABI" ]
-	then
-		echo "Using ABI $ABI"
-	fi
-	echo "Creating $obj using $BUILDTOOLS/OS/$oscf"
-	mkdir $obj
-	(cd $obj; ln -s ../*.[ch158] .)
-	if [ -f sendmail.hf ]
-	then
-		(cd $obj; ln -s ../sendmail.hf .)
-	fi
-
-	rm -f $obj/.settings$$
-	echo 'divert(-1)' > $obj/.settings$$
-	cat $BUILDTOOLS/M4/header.m4 >> $obj/.settings$$
-	if [ "$ABI" ]
-	then
-		echo "define(\`confABI', \`$ABI')" >> $obj/.settings$$
-	fi
-	cat $BUILDTOOLS/OS/$oscf >> $obj/.settings$$
-
-	if [ -z "$siteconfig" ]
-	then
-		# none specified, use defaults
-		if [ -f $BUILDTOOLS/Site/site.$oscf$sfx.m4 ]
-		then
-			siteconfig=$BUILDTOOLS/Site/site.$oscf$sfx.m4
-		elif [ -f $BUILDTOOLS/Site/site.$oscf.m4 ]
-		then
-			siteconfig=$BUILDTOOLS/Site/site.$oscf.m4
-		fi
-		if [ -f $BUILDTOOLS/Site/site.config.m4 ]
-		then
-			siteconfig="$BUILDTOOLS/Site/site.config.m4 $siteconfig"
-		fi
-	fi
-	if [ ! -z "$siteconfig" ]
-	then
-		echo "Including $siteconfig"
-		cat $siteconfig >> $obj/.settings$$
-	fi
-	if [ "$libdirs" ]
-	then
-		echo "define(\`confLIBDIRS', confLIBDIRS \`\`$libdirs'')" >> $obj/.settings$$
-	fi
-	if [ "$incdirs" ]
-	then
-		echo "define(\`confINCDIRS', confINCDIRS \`\`$incdirs'')" >> $obj/.settings$$
-	fi
-	echo 'divert(0)dnl' >> $obj/.settings$$
-	libdirs=`(cat $obj/.settings$$; echo "_SRIDBIL_= confLIBDIRS" ) | \
-		sed -e 's/\(.\)include/\1_include_/g' -e 's/#define/#_define_/g' | \
-		${M4} -DconfBUILDTOOLSDIR=$BUILDTOOLS - | \
-		grep "^_SRIDBIL_=" | \
-		sed -e 's/#_define_/#define/g' -e 's/_include_/include/g' -e "s/^_SRIDBIL_=//"`
-	libsrch=`(cat $obj/.settings$$; echo "_HCRSBIL_= confLIBSEARCH" ) | \
-		sed -e 's/\(.\)include/\1_include_/g' -e 's/#define/#_define_/g' | \
-		${M4} -DconfBUILDTOOLSDIR=$BUILDTOOLS - | \
-		grep "^_HCRSBIL_=" | \
-		sed -e 's/#_define_/#define/g' -e 's/_include_/include/g' -e "s/^_HCRSBIL_=//"`
-	echo 'divert(-1)' >> $obj/.settings$$
-	LIBDIRS="$libdirs" LIBSRCH="$libsrch" SITECONFIG="$siteconfig" sh $BUILDTOOLS/bin/configure.sh $sflag $oscf >> $obj/.settings$$
-	echo 'divert(0)dnl' >> $obj/.settings$$
-	sed -e 's/\(.\)include/\1_include_/g' -e 's/#define/#_define_/g' $obj/.settings$$ | \
-		${M4} -DconfBUILDTOOLSDIR=$BUILDTOOLS - Makefile.m4 | \
-		sed -e 's/#_define_/#define/g' -e 's/_include_/include/g' > $obj/Makefile
-	if [ $? -ne 0 -o ! -s $obj/Makefile ]
-	then
-		echo "ERROR: ${M4} failed; You may need a newer version of M4, at least as new as System V or GNU" 1>&2
-		rm -rf $obj
-		exit $EX_UNAVAILABLE
-	fi
-	rm -f $obj/.settings$$
-	echo "Making dependencies in $obj"
-	(cd $obj; ${MAKE-make} depend)
-fi
-
-if [ "$mflag" ]
-then
-	makefile=`ls -l $obj/Makefile | sed 's/.* //'`
-	if [ -z "$makefile" ]
-	then
-		echo "ERROR: $obj exists but has no Makefile" >&2
-		exit $EX_NOINPUT
-	fi
-	echo "Will run in existing $obj using $makefile"
-	exit 0
-fi
+#	$Id: Build,v 8.4 1999/03/02 02:33:27 peterh Exp $
 
-echo "Making in $obj"
-cd $obj
-eval exec ${MAKE-make} $makeargs
+exec ../devtools/bin/Build $*
diff --git a/contrib/sendmail/mailstats/Makefile b/contrib/sendmail/mailstats/Makefile
new file mode 100644
index 0000000..6dbcb62
--- /dev/null
+++ b/contrib/sendmail/mailstats/Makefile
@@ -0,0 +1,17 @@
+#       $Id: Makefile,v 8.5 1999/09/23 22:36:36 ca Exp $
+
+SHELL= /bin/sh
+BUILD=   ./Build
+OPTIONS= $(CONFIG) $(FLAGS)
+
+all: FRC
+	$(SHELL) $(BUILD) $(OPTIONS) $@
+clean: FRC
+	$(SHELL) $(BUILD) $(OPTIONS) $@
+install: FRC
+	$(SHELL) $(BUILD) $(OPTIONS) $@
+
+fresh: FRC
+	$(SHELL) $(BUILD) $(OPTIONS) -c
+
+FRC:
diff --git a/contrib/sendmail/mailstats/Makefile.m4 b/contrib/sendmail/mailstats/Makefile.m4
index 2de9904..5a9259d 100644
--- a/contrib/sendmail/mailstats/Makefile.m4
+++ b/contrib/sendmail/mailstats/Makefile.m4
@@ -1,97 +1,20 @@
-#
-#  This Makefile is designed to work on the old "make" program.
-#
-#	@(#)Makefile.m4	8.15	(Berkeley)	7/12/1998
-#
+include(confBUILDTOOLSDIR`/M4/switch.m4')
 
-# C compiler
-CC=	confCC
+# sendmail dir
+SMSRCDIR=	ifdef(`confSMSRCDIR', `confSMSRCDIR', `${SRCDIR}/sendmail')
+PREPENDDEF(`confENVDEF', `confMAPDEF')
+PREPENDDEF(`confINCDIRS', `-I${SMSRCDIR} ')
 
-# Shell
-SHELL=	confSHELL
+bldPRODUCT_START(`executable', `mailstats')
+define(`bldINSTALL_DIR', `S')
+define(`bldSOURCES', `mailstats.c ')
+bldPUSH_SMLIB(`smutil')
+APPENDDEF(`confENVDEF', `-DNOT_SENDMAIL')
+bldPRODUCT_END
 
-# use O=-O (usual) or O=-g (debugging)
-O=	ifdef(`confOPTIMIZE', `confOPTIMIZE', `-O')
+bldPRODUCT_START(`manpage', `mailstats')
+define(`bldSOURCES', `mailstats.8')
+bldPRODUCT_END
 
-# location of sendmail source directory
-SRCDIR=	ifdef(`confSRCDIR', `confSRCDIR', `../../src')
+bldFINISH
 
-# environment definitions (e.g., -D_AIX3)
-ENVDEF=	ifdef(`confENVDEF', `confENVDEF')
-
-# see also conf.h for additional compilation flags
-
-# include directories
-INCDIRS=-I${SRCDIR} confINCDIRS
-
-# loader options
-LDOPTS=	ifdef(`confLDOPTS', `confLDOPTS')
-
-# library directories
-LIBDIRS=confLIBDIRS
-
-# libraries required on your system
-LIBS=	ifdef(`confLIBS', `confLIBS')
-
-# location of mailstats binary (usually /usr/sbin or /usr/etc)
-SBINDIR=${DESTDIR}ifdef(`confSBINDIR', `confSBINDIR', `/usr/sbin')
-
-# additional .o files needed
-OBJADD=	ifdef(`confOBJADD', `confOBJADD')
-
-undivert(1)
-
-###################  end of user configuration flags  ######################
-
-BUILDBIN=confBUILDBIN
-COPTS=	-I. ${INCDIRS} ${ENVDEF}
-CFLAGS=	$O ${COPTS}
-
-BEFORE= confBEFORE
-OBJS=	mailstats.o ${OBJADD}
-
-NROFF=	ifdef(`confNROFF', `confNROFF', `groff -Tascii')
-MANDOC=	ifdef(`confMANDOC', `confMANDOC', `-mandoc')
-
-INSTALL=ifdef(`confINSTALL', `confINSTALL', `install')
-BINOWN=	ifdef(`confUBINOWN', `confUBINOWN', `bin')
-BINGRP=	ifdef(`confUBINGRP', `confUBINGRP', `bin')
-BINMODE=ifdef(`confUBINMODE', `confUBINMODE', `555')
-
-MANOWN=	ifdef(`confMANOWN', `confMANOWN', `bin')
-MANGRP=	ifdef(`confMANGRP', `confMANGRP', `bin')
-MANMODE=ifdef(`confMANMODE', `confMANMODE', `444')
-
-MANROOT=${DESTDIR}ifdef(`confMANROOT', `confMANROOT', `/usr/share/man/cat')
-MAN8=	${MANROOT}ifdef(`confMAN8', `confMAN8', `8')
-MAN8EXT=ifdef(`confMAN8EXT', `confMAN8EXT', `8')
-MAN8SRC=ifdef(`confMAN8SRC', `confMAN8SRC', `0')
-
-ALL=	mailstats mailstats.${MAN8SRC}
-
-all: ${ALL}
-
-mailstats: ${BEFORE} ${OBJS}
-	${CC} -o mailstats ${LDOPTS} ${OBJS} ${LIBDIRS} ${LIBS}
-
-undivert(3)
-
-mailstats.${MAN8SRC}: mailstats.8
-	${NROFF} ${MANDOC} mailstats.8 > mailstats.${MAN8SRC}
-
-install: install-mailstats install-docs
-
-install-mailstats: mailstats
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} mailstats ${SBINDIR}
-
-install-docs: mailstats.${MAN8SRC}
-ifdef(`confNO_MAN_INSTALL', `dnl',
-`	${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} mailstats.${MAN8SRC} ${MAN8}/mailstats.${MAN8EXT}')
-
-clean:
-	rm -f ${OBJS} mailstats mailstats.${MAN8SRC}
-
-################  Dependency scripts
-include(confBUILDTOOLSDIR/M4/depend/ifdef(`confDEPEND_TYPE', `confDEPEND_TYPE',
-`generic').m4)dnl
-################  End of dependency scripts
diff --git a/contrib/sendmail/mailstats/mailstats.8 b/contrib/sendmail/mailstats/mailstats.8
index be2203d..2fab81d 100644
--- a/contrib/sendmail/mailstats/mailstats.8
+++ b/contrib/sendmail/mailstats/mailstats.8
@@ -1,100 +1,107 @@
-.\" Copyright (c) 1998 Sendmail, Inc.  All rights reserved.
+.\" Copyright (c) 1998-2000 Sendmail, Inc. and its suppliers.
+.\"	 All rights reserved.
 .\"
 .\" By using this file, you agree to the terms and conditions set
 .\" forth in the LICENSE file which can be found at the top level of
 .\" the sendmail distribution.
 .\"
 .\"
-.\"	@(#)mailstats.8	8.8 (Berkeley) 11/13/1998
+.\"	$Id: mailstats.8,v 8.17 2000/03/11 20:18:21 gshapiro Exp $
 .\"
-.Dd April 25, 1996
-.Dt MAILSTATS 1
-.Os BSD 3
-.Sh NAME
-.Nm mailstats
-.Nd display mail statistics
-.Sh SYNOPSIS
-.Nm mailstats
-.Op Fl o
-.if \nP .Op Fl p
-.Op Fl C Ar cffile
-.Op Fl f Ar stfile
-.Sh DESCRIPTION
+.TH MAILSTATS 1 "April 25, 1996"
+.SH NAME
+.B mailstats
+\- display mail statistics
+.SH SYNOPSIS
+.B mailstats
+.RB [ \-o "] [" \-p ]
+.RB [ \-C 
+.IR cffile ]
+.RB [ \-f
+.IR stfile ]
+.SH DESCRIPTION
 The
-.Nm mailstats
+.B mailstats
 utility displays the current mail statistics.
-.Pp
+.PP
 First, the time at which statistics started being kept is displayed,
-in the format specified by
-.Xr ctime 3 .
-Then,
-the statistics for each mailer are displayed on a single line,
-each with the following whitespace separated fields:
-.Pp
-.Bl -tag -width 10n -offset indent -compact
-.It Sy M
+in the format specified by 
+ctime(3).  
+Then, 
+the statistics for each mailer are displayed on a single line, 
+each with the following white space separated fields:
+.sp
+.RS
+.PD 0.2v
+.TP 1.2i
+.B M
 The mailer number.
-.It Sy msgsfr
+.TP 
+.B msgsfr
 Number of messages from the mailer.
-.It Sy bytes_from
+.TP
+.B bytes_from
 Kbytes from the mailer.
-.It Sy msgsto
+.TP
+.B msgsto
 Number of messages to the mailer.
-.It Sy bytes_to
+.TP
+.B bytes_to
 Kbytes to the mailer.
-.It Sy msgsrej
+.TP
+.B msgsrej
 Number of messages rejected.
-.It Sy msgsdis
+.TP
+.B msgsdis
 Number of messages discarded.
-.It Sy Mailer
+.TP
+.B Mailer
 The name of the mailer.
-.El
-.Pp
-After this display, a line totaling the values for all of the mailers
-is displayed,
-separated from the previous information by a line containing only equals
-.Pq Dq \&=
+.PD
+.RE
+.PP
+After this display, a line totaling the values for all of the mailers 
+is displayed (preceeded with a ``T''),
+separated from the previous information by a line containing only equals 
+(``='') 
 characters.
-.Pp
+Another line preceeded with a ``C'' lists the number of connections.
+.PP
 The options are as follows:
-.Bl -tag -width Ds
-.It Fl C
+.TP 
+.B \-C
 Read the specified file instead of the default
-.Nm sendmail
-.Dq cf
-file.
-.It Fl f
+.B sendmail
+``cf'' file.
+.TP
+.B \-f
 Read the specified statistics file instead of the statistics file
 specified in the
-.Nm sendmail
-.Dq cf
-file.
-.if \nP \
-\{
-.It Fl p
+.B sendmail 
+``cf'' file.
+.TP 
+.B \-p
 Output information in program-readable mode and clear statistics.
-.\}
-.It Fl o
+.TP
+.B \-o
 Don't display the name of the mailer in the output.
-.El
-.Pp
+.PP
 The
-.Nm mailstats
+.B mailstats
 utility exits 0 on success, and >0 if an error occurs.
-.Sh FILES
-.Bl -tag -width /var/log/sendmail.stXX -compact
-.ie \nP .It Pa /etc/mail/sendmail.cf
-.el .It Pa /etc/sendmail.cf
+.SH FILES
+.PD 0.2v
+.TP 2.5i
+/etc/mail/sendmail.cf
 The default
-.Nm sendmail
-.Dq cf
-file.
-.ie \nP .It Pa /etc/mail/statistics
-.el .It Pa /var/log/sendmail.st
+.B sendmail
+``cf'' file.
+.TP
+/etc/mail/statistics
 The default
-.Nm sendmail
+.B sendmail
 statistics file.
-.El
-.Sh SEE ALSO
-.Xr mailq 1 ,
-.Xr sendmail 8
+.PD
+.SH SEE ALSO
+mailq(1), 
+sendmail(8)
diff --git a/contrib/sendmail/mailstats/mailstats.c b/contrib/sendmail/mailstats/mailstats.c
index 56e9357..b655727 100644
--- a/contrib/sendmail/mailstats/mailstats.c
+++ b/contrib/sendmail/mailstats/mailstats.c
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 1998 Sendmail, Inc.  All rights reserved.
+ * Copyright (c) 1998-2000 Sendmail, Inc. and its suppliers.
+ *	All rights reserved.
  * Copyright (c) 1983 Eric P. Allman.  All rights reserved.
  * Copyright (c) 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -13,33 +14,43 @@
 
 #ifndef lint
 static char copyright[] =
-"@(#) Copyright (c) 1988, 1993\n\
+"@(#) Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers.\n\
+	All rights reserved.\n\
+     Copyright (c) 1988, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
-#endif /* not lint */
+#endif /* ! lint */
 
 #ifndef lint
-static char sccsid[] = "@(#)mailstats.c	8.29 (Berkeley) 1/25/1999";
-#endif /* not lint */
+static char id[] = "@(#)$Id: mailstats.c,v 8.53.16.10 2000/07/18 05:51:15 gshapiro Exp $";
+#endif /* ! lint */
+
+#include <unistd.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <string.h>
+#include <time.h>
+#ifdef EX_OK
+# undef EX_OK		/* unistd.h may have another use for this */
+#endif /* EX_OK */
+#include <sysexits.h>
+
+#include <sendmail/sendmail.h>
+#include <sendmail/mailstats.h>
+#include <sendmail/pathnames.h>
 
-#ifndef NOT_SENDMAIL
-# define NOT_SENDMAIL
-#endif
-#include <sendmail.h>
-#include <mailstats.h>
-#include <pathnames.h>
 
 #define MNAMELEN	20	/* max length of mailer name */
 
+
 int
 main(argc, argv)
 	int argc;
 	char **argv;
 {
-	extern char *optarg;
-	extern int optind;
-	struct statistics stat;
 	register int i;
 	int mno;
+	int save_errno;
 	int ch, fd;
 	char *sfile;
 	char *cfile;
@@ -48,17 +59,21 @@ main(argc, argv)
 	bool progmode;
 	long frmsgs = 0, frbytes = 0, tomsgs = 0, tobytes = 0, rejmsgs = 0;
 	long dismsgs = 0;
-	char mtable[MAXMAILERS][MNAMELEN+1];
+	time_t now;
+	char mtable[MAXMAILERS][MNAMELEN + 1];
 	char sfilebuf[MAXLINE];
 	char buf[MAXLINE];
-	time_t now;
+	struct statistics stats;
 	extern char *ctime();
+	extern char *optarg;
+	extern int optind;
+
 
 	cfile = _PATH_SENDMAILCF;
 	sfile = NULL;
 	mnames = TRUE;
 	progmode = FALSE;
-	while ((ch = getopt(argc, argv, "C:f:op")) != EOF)
+	while ((ch = getopt(argc, argv, "C:f:op")) != -1)
 	{
 		switch (ch)
 		{
@@ -74,22 +89,15 @@ main(argc, argv)
 			mnames = FALSE;
 			break;
 
-#if _FFR_MAILSTATS_PROGMODE
 		  case 'p':
 			progmode = TRUE;
 			break;
-#endif
 
 		  case '?':
 		  default:
   usage:
-#if _FFR_MAILSTATS_PROGMODE
-			fputs("usage: mailstats [-C cffile] [-f stfile] -o -p\n",
-				stderr);
-#else
-			fputs("usage: mailstats [-C cffile] [-f stfile] -o \n",
-				stderr);
-#endif
+			(void) fputs("usage: mailstats [-C cffile] [-f stfile] [-o] [-p]\n",
+				     stderr);
 			exit(EX_USAGE);
 		}
 	}
@@ -101,15 +109,17 @@ main(argc, argv)
 
 	if ((cfp = fopen(cfile, "r")) == NULL)
 	{
+		save_errno = errno;
 		fprintf(stderr, "mailstats: ");
+		errno = save_errno;
 		perror(cfile);
 		exit(EX_NOINPUT);
 	}
 
 	mno = 0;
-	(void) strcpy(mtable[mno++], "prog");
-	(void) strcpy(mtable[mno++], "*file*");
-	(void) strcpy(mtable[mno++], "*include*");
+	(void) strlcpy(mtable[mno++], "prog", MNAMELEN + 1);
+	(void) strlcpy(mtable[mno++], "*file*", MNAMELEN + 1);
+	(void) strlcpy(mtable[mno++], "*include*", MNAMELEN + 1);
 
 	while (fgets(buf, sizeof(buf), cfp) != NULL)
 	{
@@ -141,14 +151,14 @@ main(argc, argv)
 			}
 
 			/* this is the S or StatusFile option -- save it */
-			if (strlen(b) >= sizeof sfilebuf)
+			if (strlcpy(sfilebuf, b, sizeof sfilebuf) >=
+			    sizeof sfilebuf)
 			{
 				fprintf(stderr,
 					"StatusFile filename too long: %.30s...\n",
 					b);
 				exit(EX_CONFIG);
 			}
-			strcpy(sfilebuf, b);
 			b = strchr(sfilebuf, '#');
 			if (b == NULL)
 				b = strchr(sfilebuf, '\n');
@@ -172,7 +182,7 @@ main(argc, argv)
 			exit(EX_SOFTWARE);
 		}
 		m = mtable[mno];
-		s = m + MNAMELEN;		/* is [MNAMELEN+1] */
+		s = m + MNAMELEN;		/* is [MNAMELEN + 1] */
 		while (*b != ',' && !(isascii(*b) && isspace(*b)) &&
 		       *b != '\0' && m < s)
 			*m++ = *b++;
@@ -195,66 +205,70 @@ main(argc, argv)
 		exit (EX_OSFILE);
 	}
 
-	if ((fd = open(sfile, O_RDONLY)) < 0 ||
-	    (i = read(fd, &stat, sizeof stat)) < 0)
+	fd = open(sfile, O_RDONLY);
+	if ((fd < 0) || (i = read(fd, &stats, sizeof stats)) < 0)
 	{
-		fputs("mailstats: ", stderr);
+		save_errno = errno;
+		(void) fputs("mailstats: ", stderr);
+		errno = save_errno;
 		perror(sfile);
 		exit(EX_NOINPUT);
 	}
 	if (i == 0)
 	{
-		sleep(1);
-		if ((i = read(fd, &stat, sizeof stat)) < 0)
+		(void) sleep(1);
+		if ((i = read(fd, &stats, sizeof stats)) < 0)
 		{
-			fputs("mailstats: ", stderr);
+			save_errno = errno;
+			(void) fputs("mailstats: ", stderr);
+			errno = save_errno;
 			perror(sfile);
 			exit(EX_NOINPUT);
 		}
 		else if (i == 0)
 		{
-			bzero((ARBPTR_T) &stat, sizeof stat);
-			(void) time(&stat.stat_itime);
+			memset((ARBPTR_T) &stats, '\0', sizeof stats);
+			(void) time(&stats.stat_itime);
 		}
 	}
 	if (i != 0)
 	{
-		if (stat.stat_magic != STAT_MAGIC)
+		if (stats.stat_magic != STAT_MAGIC)
 		{
 			fprintf(stderr,
 				"mailstats: incorrect magic number in %s\n",
 				sfile);
 			exit(EX_OSERR);
 		}
-		else if (stat.stat_version != STAT_VERSION)
+		else if (stats.stat_version != STAT_VERSION)
 		{
 			fprintf(stderr,
-				"mailstats version (%d) incompatible with %s version(%d)\n",
-				STAT_VERSION, sfile, stat.stat_version);
+				"mailstats version (%d) incompatible with %s version (%d)\n",
+				STAT_VERSION, sfile, stats.stat_version);
 			exit(EX_OSERR);
 		}
-		else if (i != sizeof stat || stat.stat_size != sizeof(stat))
+		else if (i != sizeof stats || stats.stat_size != sizeof(stats))
 		{
-			fputs("mailstats: file size changed.\n", stderr);
+			(void) fputs("mailstats: file size changed.\n", stderr);
 			exit(EX_OSERR);
 		}
 	}
 
 	if (progmode)
 	{
-		time(&now);
-		printf("%ld %ld\n", (long) stat.stat_itime, (long) now);
+		(void) time(&now);
+		printf("%ld %ld\n", (long) stats.stat_itime, (long) now);
 	}
 	else
 	{
-		printf("Statistics from %s", ctime(&stat.stat_itime));
+		printf("Statistics from %s", ctime(&stats.stat_itime));
 		printf(" M   msgsfr  bytes_from   msgsto    bytes_to  msgsrej msgsdis%s\n",
 			mnames ? "  Mailer" : "");
 	}
 	for (i = 0; i < MAXMAILERS; i++)
 	{
-		if (stat.stat_nf[i] || stat.stat_nt[i] ||
-		    stat.stat_nr[i] || stat.stat_nd[i])
+		if (stats.stat_nf[i] || stats.stat_nt[i] ||
+		    stats.stat_nr[i] || stats.stat_nd[i])
 		{
 			char *format;
 
@@ -263,34 +277,40 @@ main(argc, argv)
 			else
 				format = "%2d %8ld %10ldK %8ld %10ldK   %6ld  %6ld";
 			printf(format, i,
-			    stat.stat_nf[i], stat.stat_bf[i],
-			    stat.stat_nt[i], stat.stat_bt[i],
-			    stat.stat_nr[i], stat.stat_nd[i]);
+			    stats.stat_nf[i], stats.stat_bf[i],
+			    stats.stat_nt[i], stats.stat_bt[i],
+			    stats.stat_nr[i], stats.stat_nd[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];
-			rejmsgs += stat.stat_nr[i];
-			dismsgs += stat.stat_nd[i];
+			frmsgs += stats.stat_nf[i];
+			frbytes += stats.stat_bf[i];
+			tomsgs += stats.stat_nt[i];
+			tobytes += stats.stat_bt[i];
+			rejmsgs += stats.stat_nr[i];
+			dismsgs += stats.stat_nd[i];
 		}
 	}
 	if (progmode)
 	{
 		printf(" T %8ld %10ld %8ld %10ld   %6ld  %6ld\n",
 		       frmsgs, frbytes, tomsgs, tobytes, rejmsgs, dismsgs);
-		close(fd);
+		printf(" C %8ld %8ld %6ld\n",
+		       stats.stat_cf, stats.stat_ct, stats.stat_cr);
+		(void) close(fd);
 		fd = open(sfile, O_RDWR | O_TRUNC);
 		if (fd >= 0)
-			close(fd);
+			(void) close(fd);
 	}
 	else
 	{
 		printf("=============================================================\n");
 		printf(" T %8ld %10ldK %8ld %10ldK   %6ld  %6ld\n",
 			frmsgs, frbytes, tomsgs, tobytes, rejmsgs, dismsgs);
+		printf(" C %8ld %10s  %8ld %10s    %6ld\n",
+		       stats.stat_cf, "", stats.stat_ct, "", stats.stat_cr);
 	}
 	exit(EX_OK);
+	/* NOTREACHED */
+	return EX_OK;
 }