From owner-cvs-all  Mon May 28 10:10:48 2001
Delivered-To: cvs-all@freebsd.org
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP
	id 5C44B37B630; Mon, 28 May 2001 10:10:36 -0700 (PDT)
	(envelope-from gshapiro@FreeBSD.org)
Received: (from gshapiro@localhost)
	by freefall.freebsd.org (8.11.1/8.11.1) id f4SHAaP82622;
	Mon, 28 May 2001 10:10:36 -0700 (PDT)
	(envelope-from gshapiro)
Message-Id: <200105281710.f4SHAaP82622@freefall.freebsd.org>
From: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
Date: Mon, 28 May 2001 10:10:36 -0700 (PDT)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/contrib/sendmail/cf/m4 cfhead.m4 src/contrib/sendmail/mailstats
         mailstats.c src/contrib/sendmail/praliases praliases.c
         src/contrib/sendmail/rmail rmail.c src/contrib/sendmail/smrsh
         smrsh.c src/contrib/sendmail/src conf.c conf.h err.c headers.c ...
X-FreeBSD-CVS-Branch: HEAD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
List-ID: <cvs-all.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo?subject=subscribe%20cvs-all>
List-Unsubscribe: <mailto:majordomo?subject=unsubscribe%20cvs-all>
X-Loop: FreeBSD.ORG

gshapiro    2001/05/28 10:10:36 PDT

  Modified files:
    contrib/sendmail/cf/m4 cfhead.m4 
    contrib/sendmail/mailstats mailstats.c 
    contrib/sendmail/praliases praliases.c 
    contrib/sendmail/rmail rmail.c 
    contrib/sendmail/smrsh smrsh.c 
    contrib/sendmail/src conf.c conf.h err.c headers.c mci.c 
                         savemail.c 
  Log:
  Resolve conflicts from 8.11.4 import
  
  Revision  Changes    Path
  1.8       +2 -3      src/contrib/sendmail/cf/m4/cfhead.m4
  1.9       +4 -4      src/contrib/sendmail/mailstats/mailstats.c
  1.7       +13 -5     src/contrib/sendmail/praliases/praliases.c
  1.9       +3 -3      src/contrib/sendmail/rmail/rmail.c
  1.8       +4 -3      src/contrib/sendmail/smrsh/smrsh.c
  1.10      +115 -47   src/contrib/sendmail/src/conf.c
  1.13      +12 -6     src/contrib/sendmail/src/conf.h
  1.5       +10 -10    src/contrib/sendmail/src/err.c
  1.9       +3 -3      src/contrib/sendmail/src/headers.c
  1.7       +10 -5     src/contrib/sendmail/src/mci.c
  1.9       +4 -4      src/contrib/sendmail/src/savemail.c


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message