From owner-cvs-usrsbin  Mon Dec  2 22:16:16 1996
Return-Path: owner-cvs-usrsbin
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id WAA13323
          for cvs-usrsbin-outgoing; Mon, 2 Dec 1996 22:16:16 -0800 (PST)
Received: (from peter@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id WAA13292;
          Mon, 2 Dec 1996 22:16:02 -0800 (PST)
Date: Mon, 2 Dec 1996 22:16:02 -0800 (PST)
From: Peter Wemm <peter>
Message-Id: <199612030616.WAA13292@freefall.freebsd.org>
To: CVS-committers, cvs-all, cvs-usrsbin
Subject: cvs commit:  src/usr.sbin/sendmail/mail.local mail.local.c src/usr.sbin/sendmail/makemap makemap.c src/usr.sbin/sendmail/src collect.c conf.c conf.h daemon.c deliver.c headers.c main.c mime.c parseaddr.c readcf.c recipient.c savemail.c sendmail.h srvrsmtp.c udb.c usersmtp.c util.c
Sender: owner-cvs-usrsbin@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

peter       96/12/02 22:16:00

  Modified:    usr.sbin/sendmail/mail.local  mail.local.c
               usr.sbin/sendmail/makemap  makemap.c
               usr.sbin/sendmail/src  collect.c conf.c conf.h daemon.c
                        deliver.c headers.c main.c  mime.c parseaddr.c
                        readcf.c recipient.c savemail.c sendmail.h 
                        srvrsmtp.c udb.c usersmtp.c util.c
  Log:
  Merge 8.8.3->8.8.4 changes onto our mainline where we've edited the
  file at some point in the past.
  
  Obtained from: Eric Allman <eric@sendmail.org>
  
  Revision  Changes    Path
  1.5       +3 -3      src/usr.sbin/sendmail/mail.local/mail.local.c
  1.7       +2 -1      src/usr.sbin/sendmail/makemap/makemap.c
  1.6       +14 -14    src/usr.sbin/sendmail/src/collect.c
  1.15      +115 -14   src/usr.sbin/sendmail/src/conf.c
  1.13      +17 -15    src/usr.sbin/sendmail/src/conf.h
  1.12      +177 -108  src/usr.sbin/sendmail/src/daemon.c
  1.12      +81 -51    src/usr.sbin/sendmail/src/deliver.c
  1.7       +17 -5     src/usr.sbin/sendmail/src/headers.c
  1.10      +31 -25    src/usr.sbin/sendmail/src/main.c
  1.4       +3 -4      src/usr.sbin/sendmail/src/mime.c
  1.7       +6 -5      src/usr.sbin/sendmail/src/parseaddr.c
  1.8       +7 -7      src/usr.sbin/sendmail/src/readcf.c
  1.6       +14 -11    src/usr.sbin/sendmail/src/recipient.c
  1.6       +3 -3      src/usr.sbin/sendmail/src/savemail.c
  1.7       +13 -6     src/usr.sbin/sendmail/src/sendmail.h
  1.6       +17 -17    src/usr.sbin/sendmail/src/srvrsmtp.c
  1.7       +29 -9     src/usr.sbin/sendmail/src/udb.c
  1.7       +20 -17    src/usr.sbin/sendmail/src/usersmtp.c
  1.11      +38 -13    src/usr.sbin/sendmail/src/util.c