Module Name:	src
Committed By:	atatat
Date:		Thu Mar 25 19:14:31 UTC 2004

Modified Files:
	src/gnu/dist/sendmail: LICENSE PGPKEYS RELEASE_NOTES
	src/gnu/dist/sendmail/cf: README
	src/gnu/dist/sendmail/cf/cf: generic-bsd4.4.cf generic-hpux10.cf
	    generic-hpux9.cf generic-linux.cf generic-nextstep3.3.cf
	    generic-osf1.cf generic-sunos4.1.cf generic-ultrix4.cf
	src/gnu/dist/sendmail/cf/m4: cfhead.m4 proto.m4 version.m4
	src/gnu/dist/sendmail/contrib: expn.pl
	src/gnu/dist/sendmail/devtools/OS: AIX.4.3 FreeBSD
	src/gnu/dist/sendmail/devtools/bin: Build configure.sh
	src/gnu/dist/sendmail/doc/op: op.me
	src/gnu/dist/sendmail/include/libmilter: mfapi.h milter.h
	src/gnu/dist/sendmail/include/sm: cdefs.h conf.h
	src/gnu/dist/sendmail/libmilter: README engine.c libmilter.h listener.c
	    main.c signal.c
	src/gnu/dist/sendmail/libsmdb: smdb2.c
	src/gnu/dist/sendmail/mail.local: mail.local.0 mail.local.c
	src/gnu/dist/sendmail/rmail: rmail.0
	src/gnu/dist/sendmail/sendmail: README TRACEFLAGS alias.c aliases.0
	    collect.c conf.c control.c daemon.c deliver.c domain.c headers.c
	    helpfile mailq.0 main.c map.c mci.c milter.c mime.c newaliases.0
	    parseaddr.c queue.c readcf.c recipient.c sendmail.0 sendmail.8
	    sendmail.h sfsasl.c srvrsmtp.c stab.c udb.c usersmtp.c util.c
	    version.c
	src/gnu/dist/sendmail/smrsh: README smrsh.8 smrsh.c
	src/gnu/dist/sendmail/vacation: vacation.0

Log Message:
resolve conflicts, pull 8.12.11 to head


To generate a diff of this commit:
cvs rdiff -r1.4 -r1.5 src/gnu/dist/sendmail/LICENSE
cvs rdiff -r1.5 -r1.6 src/gnu/dist/sendmail/PGPKEYS
cvs rdiff -r1.12 -r1.13 src/gnu/dist/sendmail/RELEASE_NOTES
cvs rdiff -r1.11 -r1.12 src/gnu/dist/sendmail/cf/README
cvs rdiff -r1.12 -r1.13 src/gnu/dist/sendmail/cf/cf/generic-bsd4.4.cf \
    src/gnu/dist/sendmail/cf/cf/generic-hpux10.cf \
    src/gnu/dist/sendmail/cf/cf/generic-hpux9.cf \
    src/gnu/dist/sendmail/cf/cf/generic-linux.cf \
    src/gnu/dist/sendmail/cf/cf/generic-osf1.cf \
    src/gnu/dist/sendmail/cf/cf/generic-sunos4.1.cf \
    src/gnu/dist/sendmail/cf/cf/generic-ultrix4.cf
cvs rdiff -r1.6 -r1.7 src/gnu/dist/sendmail/cf/cf/generic-nextstep3.3.cf
cvs rdiff -r1.8 -r1.9 src/gnu/dist/sendmail/cf/m4/cfhead.m4
cvs rdiff -r1.9 -r1.10 src/gnu/dist/sendmail/cf/m4/proto.m4
cvs rdiff -r1.12 -r1.13 src/gnu/dist/sendmail/cf/m4/version.m4
cvs rdiff -r1.2 -r1.3 src/gnu/dist/sendmail/contrib/expn.pl
cvs rdiff -r1.4 -r1.5 src/gnu/dist/sendmail/devtools/OS/AIX.4.3
cvs rdiff -r1.5 -r1.6 src/gnu/dist/sendmail/devtools/OS/FreeBSD
cvs rdiff -r1.9 -r1.10 src/gnu/dist/sendmail/devtools/bin/Build
cvs rdiff -r1.5 -r1.6 src/gnu/dist/sendmail/devtools/bin/configure.sh
cvs rdiff -r1.11 -r1.12 src/gnu/dist/sendmail/doc/op/op.me
cvs rdiff -r1.6 -r1.7 src/gnu/dist/sendmail/include/libmilter/mfapi.h
cvs rdiff -r1.8 -r1.9 src/gnu/dist/sendmail/include/libmilter/milter.h
cvs rdiff -r1.3 -r1.4 src/gnu/dist/sendmail/include/sm/cdefs.h \
    src/gnu/dist/sendmail/include/sm/conf.h
cvs rdiff -r1.9 -r1.10 src/gnu/dist/sendmail/libmilter/README \
    src/gnu/dist/sendmail/libmilter/engine.c \
    src/gnu/dist/sendmail/libmilter/libmilter.h
cvs rdiff -r1.10 -r1.11 src/gnu/dist/sendmail/libmilter/listener.c
cvs rdiff -r1.7 -r1.8 src/gnu/dist/sendmail/libmilter/main.c \
    src/gnu/dist/sendmail/libmilter/signal.c
cvs rdiff -r1.8 -r1.9 src/gnu/dist/sendmail/libsmdb/smdb2.c
cvs rdiff -r1.6 -r1.7 src/gnu/dist/sendmail/mail.local/mail.local.0
cvs rdiff -r1.9 -r1.10 src/gnu/dist/sendmail/mail.local/mail.local.c
cvs rdiff -r1.5 -r1.6 src/gnu/dist/sendmail/rmail/rmail.0
cvs rdiff -r1.11 -r1.12 src/gnu/dist/sendmail/sendmail/README \
    src/gnu/dist/sendmail/sendmail/deliver.c \
    src/gnu/dist/sendmail/sendmail/headers.c \
    src/gnu/dist/sendmail/sendmail/map.c \
    src/gnu/dist/sendmail/sendmail/milter.c
cvs rdiff -r1.5 -r1.6 src/gnu/dist/sendmail/sendmail/TRACEFLAGS \
    src/gnu/dist/sendmail/sendmail/mime.c \
    src/gnu/dist/sendmail/sendmail/newaliases.0
cvs rdiff -r1.8 -r1.9 src/gnu/dist/sendmail/sendmail/alias.c \
    src/gnu/dist/sendmail/sendmail/helpfile \
    src/gnu/dist/sendmail/sendmail/stab.c
cvs rdiff -r1.6 -r1.7 src/gnu/dist/sendmail/sendmail/aliases.0 \
    src/gnu/dist/sendmail/sendmail/sendmail.0 \
    src/gnu/dist/sendmail/sendmail/udb.c
cvs rdiff -r1.10 -r1.11 src/gnu/dist/sendmail/sendmail/collect.c \
    src/gnu/dist/sendmail/sendmail/queue.c \
    src/gnu/dist/sendmail/sendmail/sfsasl.c \
    src/gnu/dist/sendmail/sendmail/srvrsmtp.c \
    src/gnu/dist/sendmail/sendmail/usersmtp.c \
    src/gnu/dist/sendmail/sendmail/util.c
cvs rdiff -r1.17 -r1.18 src/gnu/dist/sendmail/sendmail/conf.c
cvs rdiff -r1.9 -r1.10 src/gnu/dist/sendmail/sendmail/control.c \
    src/gnu/dist/sendmail/sendmail/domain.c \
    src/gnu/dist/sendmail/sendmail/recipient.c
cvs rdiff -r1.12 -r1.13 src/gnu/dist/sendmail/sendmail/daemon.c \
    src/gnu/dist/sendmail/sendmail/main.c
cvs rdiff -r1.7 -r1.8 src/gnu/dist/sendmail/sendmail/mailq.0 \
    src/gnu/dist/sendmail/sendmail/mci.c \
    src/gnu/dist/sendmail/sendmail/sendmail.8
cvs rdiff -r1.13 -r1.14 src/gnu/dist/sendmail/sendmail/parseaddr.c \
    src/gnu/dist/sendmail/sendmail/readcf.c \
    src/gnu/dist/sendmail/sendmail/sendmail.h
cvs rdiff -r1.14 -r1.15 src/gnu/dist/sendmail/sendmail/version.c
cvs rdiff -r1.4 -r1.5 src/gnu/dist/sendmail/smrsh/README
cvs rdiff -r1.5 -r1.6 src/gnu/dist/sendmail/smrsh/smrsh.8
cvs rdiff -r1.11 -r1.12 src/gnu/dist/sendmail/smrsh/smrsh.c
cvs rdiff -r1.6 -r1.7 src/gnu/dist/sendmail/vacation/vacation.0

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.