From owner-cvs-usrsbin  Sun Jan 26 23:43:36 1997
Return-Path: <owner-cvs-usrsbin>
Received: (from root@localhost)
          by freefall.freebsd.org (8.8.5/8.8.5) id XAA24387
          for cvs-usrsbin-outgoing; Sun, 26 Jan 1997 23:43:36 -0800 (PST)
Received: (from peter@localhost)
          by freefall.freebsd.org (8.8.5/8.8.5) id XAA24380;
          Sun, 26 Jan 1997 23:43:34 -0800 (PST)
Date: Sun, 26 Jan 1997 23:43:34 -0800 (PST)
From: Peter Wemm <peter>
Message-Id: <199701270743.XAA24380@freefall.freebsd.org>
To: CVS-committers, cvs-all, cvs-usrsbin
Subject: cvs commit:  src/usr.sbin/sendmail/cf/cf Makefile src/usr.sbin/sendmail/src collect.c conf.c conf.h daemon.c deliver.c headers.c main.c mime.c readcf.c savemail.c sendmail.8 sendmail.h srvrsmtp.c udb.c usersmtp.c util.c
Sender: owner-cvs-usrsbin@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

peter       97/01/26 23:43:34

  Modified:    usr.sbin/sendmail/cf/cf  Makefile
               usr.sbin/sendmail/src  collect.c conf.c conf.h daemon.c
                        deliver.c headers.c main.c  mime.c readcf.c
                        savemail.c sendmail.8 sendmail.h srvrsmtp.c  udb.c
                        usersmtp.c util.c
  Log:
  Merge 8.8.4 -> 8.8.5 changes onto mainline
  
  Revision  Changes    Path
  1.9       +3 -3      src/usr.sbin/sendmail/cf/cf/Makefile
  1.7       +16 -1     src/usr.sbin/sendmail/src/collect.c
  1.16      +32 -22    src/usr.sbin/sendmail/src/conf.c
  1.14      +84 -18    src/usr.sbin/sendmail/src/conf.h
  1.13      +5 -4      src/usr.sbin/sendmail/src/daemon.c
  1.13      +21 -13    src/usr.sbin/sendmail/src/deliver.c
  1.8       +6 -2      src/usr.sbin/sendmail/src/headers.c
  1.11      +72 -35    src/usr.sbin/sendmail/src/main.c
  1.5       +22 -20    src/usr.sbin/sendmail/src/mime.c
  1.9       +22 -1     src/usr.sbin/sendmail/src/readcf.c
  1.7       +4 -3      src/usr.sbin/sendmail/src/savemail.c
  1.7       +3 -3      src/usr.sbin/sendmail/src/sendmail.8
  1.8       +7 -4      src/usr.sbin/sendmail/src/sendmail.h
  1.7       +83 -29    src/usr.sbin/sendmail/src/srvrsmtp.c
  1.8       +3 -3      src/usr.sbin/sendmail/src/udb.c
  1.8       +19 -7     src/usr.sbin/sendmail/src/usersmtp.c
  1.12      +5 -3      src/usr.sbin/sendmail/src/util.c