CVS commit: src/gnu/dist/postfix/src/smtpd

[Rui Paulo <rpaulo%netbsd.org@localhost>]

Module Name:    src
Committed By:   rpaulo
Date:           Thu Aug 18 22:08:21 UTC 2005

Modified Files:
        src/gnu/dist/postfix/src/smtpd: smtpd.c smtpd_check.c smtpd_peer.c

Log Message:
Resolve conflicts.


To generate a diff of this commit:
cvs rdiff -r1.12 -r1.13 src/gnu/dist/postfix/src/smtpd/smtpd.c \
    src/gnu/dist/postfix/src/smtpd/smtpd_peer.c
cvs rdiff -r1.16 -r1.17 src/gnu/dist/postfix/src/smtpd/smtpd_check.c

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