Module Name:	src
Committed By:	heas
Date:		Sat Nov 13 05:45:33 UTC 2004

Modified Files:
	src/gnu/dist/postfix/src/dns: dns_lookup.c
	src/gnu/dist/postfix/src/smtp: smtp_addr.c
	src/gnu/dist/postfix/src/smtpd: smtpd.c smtpd_check.c
	src/gnu/dist/postfix/src/util: sys_defs.h

Log Message:
Resolve conflicts


To generate a diff of this commit:
cvs rdiff -r1.8 -r1.9 src/gnu/dist/postfix/src/dns/dns_lookup.c
cvs rdiff -r1.8 -r1.9 src/gnu/dist/postfix/src/smtp/smtp_addr.c
cvs rdiff -r1.11 -r1.12 src/gnu/dist/postfix/src/smtpd/smtpd.c
cvs rdiff -r1.15 -r1.16 src/gnu/dist/postfix/src/smtpd/smtpd_check.c
cvs rdiff -r1.14 -r1.15 src/gnu/dist/postfix/src/util/sys_defs.h

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