From owner-cvs-usrsbin  Wed Sep 18 20:12:51 1996
Return-Path: owner-cvs-usrsbin
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id UAA24837
          for cvs-usrsbin-outgoing; Wed, 18 Sep 1996 20:12:51 -0700 (PDT)
Received: (from peter@localhost)
          by freefall.freebsd.org (8.7.5/8.7.3) id UAA24675;
          Wed, 18 Sep 1996 20:12:22 -0700 (PDT)
Date: Wed, 18 Sep 1996 20:12:22 -0700 (PDT)
From: Peter Wemm <peter>
Message-Id: <199609190312.UAA24675@freefall.freebsd.org>
To: CVS-committers, cvs-all, cvs-usrsbin
Subject: cvs commit:  src/usr.sbin/sendmail/src conf.c daemon.c deliver.c domain.c headers.c main.c parseaddr.c recipient.c savemail.c sendmail.h udb.c usersmtp.c util.c
Sender: owner-cvs-usrsbin@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

peter       96/09/18 20:12:20

  Modified:    usr.sbin/sendmail/src  conf.c daemon.c deliver.c domain.c
                        headers.c main.c  parseaddr.c recipient.c
                        savemail.c sendmail.h udb.c usersmtp.c  util.c
  Log:
  Merge import conflicts
  
  Revision  Changes    Path
  1.12      +295 -40   src/usr.sbin/sendmail/src/conf.c
  1.9       +35 -27    src/usr.sbin/sendmail/src/daemon.c
  1.9       +58 -46    src/usr.sbin/sendmail/src/deliver.c
  1.6       +12 -5     src/usr.sbin/sendmail/src/domain.c
  1.5       +25 -18    src/usr.sbin/sendmail/src/headers.c
  1.6       +14 -5     src/usr.sbin/sendmail/src/main.c
  1.5       +3 -2      src/usr.sbin/sendmail/src/parseaddr.c
  1.4       +4 -4      src/usr.sbin/sendmail/src/recipient.c
  1.4       +53 -38    src/usr.sbin/sendmail/src/savemail.c
  1.4       +15 -6     src/usr.sbin/sendmail/src/sendmail.h
  1.5       +7 -4      src/usr.sbin/sendmail/src/udb.c
  1.4       +24 -10    src/usr.sbin/sendmail/src/usersmtp.c
  1.6       +42 -31    src/usr.sbin/sendmail/src/util.c