Module Name:	src
Committed By:	heas
Date:		Tue Apr 27 05:07:48 UTC 2004

Modified Files:
	src/gnu/dist/postfix: makedefs
	src/gnu/dist/postfix/README_FILES: INSTALL RELEASE_NOTES
	src/gnu/dist/postfix/conf: main.cf master.cf post-install
	src/gnu/dist/postfix/man/man5: canonical.5 virtual.5
	src/gnu/dist/postfix/man/man8: cleanup.8 lmtp.8 local.8
	src/gnu/dist/postfix/src/cleanup: cleanup.c cleanup.h
	    cleanup_envelope.c cleanup_init.c
	src/gnu/dist/postfix/src/dns: dns_lookup.c
	src/gnu/dist/postfix/src/global: Makefile.in mail_params.h
	src/gnu/dist/postfix/src/master: master.h
	src/gnu/dist/postfix/src/qmgr: qmgr_message.c
	src/gnu/dist/postfix/src/smtp: smtp_addr.c smtp_connect.c
	src/gnu/dist/postfix/src/smtpd: smtpd.c smtpd_check.c smtpd_peer.c
	src/gnu/dist/postfix/src/util: Makefile.in inet_addr_list.c
	    match_list.c match_ops.c sys_defs.h valid_hostname.c
Removed Files:
	src/gnu/dist/postfix: 0README
	src/gnu/dist/postfix/README_FILES: MACOSX_README
	src/gnu/dist/postfix/conf: pcre_table regexp_table sample-aliases.cf
	    sample-auth.cf sample-canonical.cf sample-compatibility.cf
	    sample-debug.cf sample-filter.cf sample-flush.cf sample-ldap.cf
	    sample-lmtp.cf sample-local.cf sample-mime.cf sample-misc.cf
	    sample-pcre-access.cf sample-pcre-body.cf sample-pcre-header.cf
	    sample-qmqpd.cf sample-rate.cf sample-regexp-access.cf
	    sample-regexp-body.cf sample-regexp-header.cf sample-relocated.cf
	    sample-resource.cf sample-rewrite.cf sample-smtp.cf sample-smtpd.cf
	    sample-transport.cf sample-virtual.cf
	src/gnu/dist/postfix/examples/virtual-setup: BSDI2 FREEBSD2 LINUX2
	src/gnu/dist/postfix/html: architecture.html backstage.html basic.html
	    big-picture.fig big-picture.gif big-picture.html commands.html
	    delivering.html faq.html flow.fig goals.html inbound.fig
	    inbound.gif motivation.html nqmgr.8.html outbound.fig outbound.gif
	    queuing.html rate.html receiving.html resource.html rewrite.html
	    security.html small-picture.fig small-picture.gif uce.html
	src/gnu/dist/postfix/man/man8: nqmgr.8
	src/gnu/dist/postfix/src/global: peer_name.c peer_name.h
	src/gnu/dist/postfix/src/nqmgr: .indent.pro .printfck Makefile.in
	    qmgr.c qmgr.h qmgr_active.c qmgr_bounce.c qmgr_defer.c
	    qmgr_deliver.c qmgr_enable.c qmgr_entry.c qmgr_job.c qmgr_message.c
	    qmgr_move.c qmgr_peer.c qmgr_queue.c qmgr_rcpt_list.c qmgr_scan.c
	    qmgr_transport.c
	src/gnu/dist/postfix/src/postconf: smtp_table.h smtp_vars.h
	src/gnu/dist/postfix/src/util: dict_ldap.c dict_ldap.h dict_mysql.c
	    dict_mysql.h intv.c intv.h

Log Message:
resolve conflicts


To generate a diff of this commit:
cvs rdiff -r1.1.1.4 -r0 src/gnu/dist/postfix/0README
cvs rdiff -r1.10 -r1.11 src/gnu/dist/postfix/makedefs
cvs rdiff -r1.3 -r1.4 src/gnu/dist/postfix/README_FILES/INSTALL \
    src/gnu/dist/postfix/README_FILES/RELEASE_NOTES
cvs rdiff -r1.1.1.1 -r0 src/gnu/dist/postfix/README_FILES/MACOSX_README
cvs rdiff -r1.8 -r1.9 src/gnu/dist/postfix/conf/main.cf
cvs rdiff -r1.7 -r1.8 src/gnu/dist/postfix/conf/master.cf
cvs rdiff -r1.1.1.4 -r0 src/gnu/dist/postfix/conf/pcre_table
cvs rdiff -r1.4 -r1.5 src/gnu/dist/postfix/conf/post-install
cvs rdiff -r1.1.1.5 -r0 src/gnu/dist/postfix/conf/regexp_table
cvs rdiff -r1.2 -r0 src/gnu/dist/postfix/conf/sample-aliases.cf \
    src/gnu/dist/postfix/conf/sample-auth.cf \
    src/gnu/dist/postfix/conf/sample-canonical.cf \
    src/gnu/dist/postfix/conf/sample-compatibility.cf \
    src/gnu/dist/postfix/conf/sample-debug.cf \
    src/gnu/dist/postfix/conf/sample-flush.cf \
    src/gnu/dist/postfix/conf/sample-ldap.cf \
    src/gnu/dist/postfix/conf/sample-lmtp.cf \
    src/gnu/dist/postfix/conf/sample-qmqpd.cf \
    src/gnu/dist/postfix/conf/sample-rate.cf \
    src/gnu/dist/postfix/conf/sample-relocated.cf \
    src/gnu/dist/postfix/conf/sample-rewrite.cf \
    src/gnu/dist/postfix/conf/sample-smtp.cf \
    src/gnu/dist/postfix/conf/sample-transport.cf \
    src/gnu/dist/postfix/conf/sample-virtual.cf
cvs rdiff -r1.3 -r0 src/gnu/dist/postfix/conf/sample-filter.cf \
    src/gnu/dist/postfix/conf/sample-local.cf \
    src/gnu/dist/postfix/conf/sample-mime.cf \
    src/gnu/dist/postfix/conf/sample-pcre-access.cf \
    src/gnu/dist/postfix/conf/sample-regexp-access.cf \
    src/gnu/dist/postfix/conf/sample-resource.cf
cvs rdiff -r1.4 -r0 src/gnu/dist/postfix/conf/sample-misc.cf \
    src/gnu/dist/postfix/conf/sample-pcre-body.cf \
    src/gnu/dist/postfix/conf/sample-pcre-header.cf \
    src/gnu/dist/postfix/conf/sample-regexp-body.cf \
    src/gnu/dist/postfix/conf/sample-regexp-header.cf \
    src/gnu/dist/postfix/conf/sample-smtpd.cf
cvs rdiff -r1.1.1.1 -r0 src/gnu/dist/postfix/examples/virtual-setup/BSDI2 \
    src/gnu/dist/postfix/examples/virtual-setup/FREEBSD2 \
    src/gnu/dist/postfix/examples/virtual-setup/LINUX2
cvs rdiff -r1.1.1.1 -r0 src/gnu/dist/postfix/html/architecture.html \
    src/gnu/dist/postfix/html/big-picture.fig \
    src/gnu/dist/postfix/html/big-picture.gif \
    src/gnu/dist/postfix/html/big-picture.html \
    src/gnu/dist/postfix/html/flow.fig src/gnu/dist/postfix/html/goals.html \
    src/gnu/dist/postfix/html/inbound.fig \
    src/gnu/dist/postfix/html/inbound.gif \
    src/gnu/dist/postfix/html/outbound.fig \
    src/gnu/dist/postfix/html/outbound.gif \
    src/gnu/dist/postfix/html/small-picture.fig \
    src/gnu/dist/postfix/html/small-picture.gif
cvs rdiff -r1.1.1.4 -r0 src/gnu/dist/postfix/html/backstage.html \
    src/gnu/dist/postfix/html/rewrite.html
cvs rdiff -r1.1.1.6 -r0 src/gnu/dist/postfix/html/basic.html
cvs rdiff -r1.1.1.2 -r0 src/gnu/dist/postfix/html/commands.html \
    src/gnu/dist/postfix/html/delivering.html \
    src/gnu/dist/postfix/html/motivation.html \
    src/gnu/dist/postfix/html/queuing.html \
    src/gnu/dist/postfix/html/rate.html \
    src/gnu/dist/postfix/html/receiving.html \
    src/gnu/dist/postfix/html/security.html
cvs rdiff -r1.1.1.12 -r0 src/gnu/dist/postfix/html/faq.html
cvs rdiff -r1.1.1.3 -r0 src/gnu/dist/postfix/html/nqmgr.8.html \
    src/gnu/dist/postfix/html/resource.html
cvs rdiff -r1.1.1.7 -r0 src/gnu/dist/postfix/html/uce.html
cvs rdiff -r1.3 -r1.4 src/gnu/dist/postfix/man/man5/canonical.5
cvs rdiff -r1.4 -r1.5 src/gnu/dist/postfix/man/man5/virtual.5
cvs rdiff -r1.3 -r1.4 src/gnu/dist/postfix/man/man8/cleanup.8 \
    src/gnu/dist/postfix/man/man8/lmtp.8 \
    src/gnu/dist/postfix/man/man8/local.8
cvs rdiff -r1.1.1.3 -r0 src/gnu/dist/postfix/man/man8/nqmgr.8
cvs rdiff -r1.5 -r1.6 src/gnu/dist/postfix/src/cleanup/cleanup.c \
    src/gnu/dist/postfix/src/cleanup/cleanup_envelope.c
cvs rdiff -r1.4 -r1.5 src/gnu/dist/postfix/src/cleanup/cleanup.h
cvs rdiff -r1.3 -r1.4 src/gnu/dist/postfix/src/cleanup/cleanup_init.c
cvs rdiff -r1.6 -r1.7 src/gnu/dist/postfix/src/dns/dns_lookup.c
cvs rdiff -r1.8 -r1.9 src/gnu/dist/postfix/src/global/Makefile.in
cvs rdiff -r1.6 -r1.7 src/gnu/dist/postfix/src/global/mail_params.h
cvs rdiff -r1.3 -r0 src/gnu/dist/postfix/src/global/peer_name.c \
    src/gnu/dist/postfix/src/global/peer_name.h
cvs rdiff -r1.5 -r1.6 src/gnu/dist/postfix/src/master/master.h
cvs rdiff -r1.1.1.1 -r0 src/gnu/dist/postfix/src/nqmgr/.indent.pro \
    src/gnu/dist/postfix/src/nqmgr/.printfck \
    src/gnu/dist/postfix/src/nqmgr/qmgr_enable.c \
    src/gnu/dist/postfix/src/nqmgr/qmgr_job.c \
    src/gnu/dist/postfix/src/nqmgr/qmgr_move.c \
    src/gnu/dist/postfix/src/nqmgr/qmgr_peer.c \
    src/gnu/dist/postfix/src/nqmgr/qmgr_scan.c \
    src/gnu/dist/postfix/src/nqmgr/qmgr_transport.c
cvs rdiff -r1.1.1.2 -r0 src/gnu/dist/postfix/src/nqmgr/Makefile.in \
    src/gnu/dist/postfix/src/nqmgr/qmgr.h \
    src/gnu/dist/postfix/src/nqmgr/qmgr_active.c \
    src/gnu/dist/postfix/src/nqmgr/qmgr_bounce.c \
    src/gnu/dist/postfix/src/nqmgr/qmgr_defer.c \
    src/gnu/dist/postfix/src/nqmgr/qmgr_entry.c \
    src/gnu/dist/postfix/src/nqmgr/qmgr_queue.c \
    src/gnu/dist/postfix/src/nqmgr/qmgr_rcpt_list.c
cvs rdiff -r1.1.1.3 -r0 src/gnu/dist/postfix/src/nqmgr/qmgr.c
cvs rdiff -r1.1.1.4 -r0 src/gnu/dist/postfix/src/nqmgr/qmgr_deliver.c
cvs rdiff -r1.1.1.6 -r0 src/gnu/dist/postfix/src/nqmgr/qmgr_message.c
cvs rdiff -r1.1.1.1 -r0 src/gnu/dist/postfix/src/postconf/smtp_table.h \
    src/gnu/dist/postfix/src/postconf/smtp_vars.h
cvs rdiff -r1.9 -r1.10 src/gnu/dist/postfix/src/qmgr/qmgr_message.c
cvs rdiff -r1.6 -r1.7 src/gnu/dist/postfix/src/smtp/smtp_addr.c
cvs rdiff -r1.9 -r1.10 src/gnu/dist/postfix/src/smtp/smtp_connect.c
cvs rdiff -r1.8 -r1.9 src/gnu/dist/postfix/src/smtpd/smtpd.c
cvs rdiff -r1.13 -r1.14 src/gnu/dist/postfix/src/smtpd/smtpd_check.c
cvs rdiff -r1.10 -r1.11 src/gnu/dist/postfix/src/smtpd/smtpd_peer.c
cvs rdiff -r1.9 -r1.10 src/gnu/dist/postfix/src/util/Makefile.in \
    src/gnu/dist/postfix/src/util/sys_defs.h
cvs rdiff -r1.1.1.9 -r0 src/gnu/dist/postfix/src/util/dict_ldap.c
cvs rdiff -r1.1.1.1 -r0 src/gnu/dist/postfix/src/util/dict_ldap.h \
    src/gnu/dist/postfix/src/util/dict_mysql.h \
    src/gnu/dist/postfix/src/util/intv.c src/gnu/dist/postfix/src/util/intv.h
cvs rdiff -r1.1.1.4 -r0 src/gnu/dist/postfix/src/util/dict_mysql.c
cvs rdiff -r1.5 -r1.6 src/gnu/dist/postfix/src/util/inet_addr_list.c \
    src/gnu/dist/postfix/src/util/match_ops.c
cvs rdiff -r1.4 -r1.5 src/gnu/dist/postfix/src/util/match_list.c \
    src/gnu/dist/postfix/src/util/valid_hostname.c

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