From owner-cvs-src@FreeBSD.ORG  Sat Mar 29 11:18:08 2003
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 7B93B37B401; Sat, 29 Mar 2003 11:18:08 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 10CAE43F93; Sat, 29 Mar 2003 11:18:08 -0800 (PST)
	(envelope-from gshapiro@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h2TJI70U095165;
	Sat, 29 Mar 2003 11:18:07 -0800 (PST)
	(envelope-from gshapiro@repoman.freebsd.org)
Received: (from gshapiro@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h2TJI7Rf095164;
	Sat, 29 Mar 2003 11:18:07 -0800 (PST)
Message-Id: <200303291918.h2TJI7Rf095164@repoman.freebsd.org>
From: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
Date: Sat, 29 Mar 2003 11:18:07 -0800 (PST)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/contrib/sendmail/cf/m4 cfhead.m4
 src/contrib/sendmail/mail.local
 mail.local.c src/contrib/sendmail/src conf.c headers.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 29 Mar 2003 19:18:10 -0000

gshapiro    2003/03/29 11:18:07 PST

  FreeBSD src repository

  Modified files:
    contrib/sendmail/cf/m4 cfhead.m4 
    contrib/sendmail/mail.local mail.local.c 
    contrib/sendmail/src conf.c headers.c 
  Log:
  Fix conflicts from sendmail 8.12.9 import
  
  Revision  Changes    Path
  1.14      +3 -1      src/contrib/sendmail/cf/m4/cfhead.m4
  1.23      +3 -3      src/contrib/sendmail/mail.local/mail.local.c
  1.22      +125 -5    src/contrib/sendmail/src/conf.c
  1.16      +9 -1      src/contrib/sendmail/src/headers.c