Date: Sun, 17 Nov 1996 18:34:38 -0800 (PST) From: Peter Wemm <peter> 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 domain.c main.c mime.c readcf.c sendmail.h srvrsmtp.c usersmtp.c util.c Message-ID: <199611180234.SAA02421@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
peter 96/11/17 18:34:37
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 domain.c main.c mime.c readcf.c
sendmail.h srvrsmtp.c usersmtp.c util.c
Log:
Merge conflicts from 8.8.3 import onto mainline.
Revision Changes Path
1.4 +2 -2 src/usr.sbin/sendmail/mail.local/mail.local.c
1.5 +27 -3 src/usr.sbin/sendmail/makemap/makemap.c
1.5 +3 -2 src/usr.sbin/sendmail/src/collect.c
1.14 +125 -12 src/usr.sbin/sendmail/src/conf.c
1.12 +35 -8 src/usr.sbin/sendmail/src/conf.h
1.11 +29 -19 src/usr.sbin/sendmail/src/daemon.c
1.11 +86 -24 src/usr.sbin/sendmail/src/deliver.c
1.8 +25 -4 src/usr.sbin/sendmail/src/domain.c
1.9 +16 -23 src/usr.sbin/sendmail/src/main.c
1.3 +1 -1 src/usr.sbin/sendmail/src/mime.c
1.7 +6 -2 src/usr.sbin/sendmail/src/readcf.c
1.6 +6 -5 src/usr.sbin/sendmail/src/sendmail.h
1.5 +18 -3 src/usr.sbin/sendmail/src/srvrsmtp.c
1.6 +138 -30 src/usr.sbin/sendmail/src/usersmtp.c
1.10 +58 -2 src/usr.sbin/sendmail/src/util.c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199611180234.SAA02421>