From 4afebb4e8d3f57c9ace2a236ced1ebd5cbf167aa Mon Sep 17 00:00:00 2001 From: Wietse Venema Date: Fri, 29 Apr 2005 00:00:00 -0500 Subject: [PATCH] postfix-2.3-20050429 --- postfix/HISTORY | 6 + postfix/man/Makefile.in.snapshot | 283 ------------------------------ postfix/man/Makefile.in.stable | 283 ------------------------------ postfix/src/global/ehlo_mask.c | 4 +- postfix/src/global/ehlo_mask.h | 3 +- postfix/src/global/mail_version.h | 2 +- postfix/src/smtpd/smtpd.c | 2 + 7 files changed, 14 insertions(+), 569 deletions(-) delete mode 100644 postfix/man/Makefile.in.snapshot delete mode 100644 postfix/man/Makefile.in.stable diff --git a/postfix/HISTORY b/postfix/HISTORY index 611d00d79..e13e6c4be 100644 --- a/postfix/HISTORY +++ b/postfix/HISTORY @@ -10704,6 +10704,12 @@ Apologies for any names omitted. src/global/mbox_open.c, src/lmtp/lmtp_addr.c, src/smtp/smtp_addr.c, src/smtp/smtp_connect.c. +20050429 + + The Postfix SMTP server now announces ENHANCEDSTATUSCODES + support in the EHLO response, as described in RFC 2034. + File: smtpd/smtpd.c. + Open problems: Med: disable header address rewriting after XCLIENT? diff --git a/postfix/man/Makefile.in.snapshot b/postfix/man/Makefile.in.snapshot deleted file mode 100644 index 5010210c8..000000000 --- a/postfix/man/Makefile.in.snapshot +++ /dev/null @@ -1,283 +0,0 @@ -SHELL = /bin/sh - -# For now, just hard-coded rules for daemons, commands, config files. - -DAEMONS = man8/bounce.8 man8/defer.8 man8/cleanup.8 man8/error.8 man8/local.8 \ - man8/lmtp.8 man8/master.8 man8/pickup.8 man8/pipe.8 man8/qmgr.8 \ - man8/showq.8 man8/smtp.8 man8/smtpd.8 man8/trivial-rewrite.8 \ - man8/oqmgr.8 man8/spawn.8 man8/flush.8 man8/virtual.8 man8/qmqpd.8 \ - man8/verify.8 man8/trace.8 man8/proxymap.8 man8/anvil.8 -COMMANDS= man1/postalias.1 man1/postcat.1 man1/postconf.1 man1/postfix.1 \ - man1/postkick.1 man1/postlock.1 man1/postlog.1 man1/postdrop.1 \ - man1/postmap.1 man1/sendmail.1 man1/mailq.1 man1/newaliases.1 \ - man1/postqueue.1 man1/postsuper.1 -CONFIG = man5/access.5 man5/aliases.5 man5/canonical.5 man5/relocated.5 \ - man5/transport.5 man5/virtual.5 man5/pcre_table.5 man5/regexp_table.5 \ - man5/cidr_table.5 man5/tcp_table.5 man5/header_checks.5 \ - man5/body_checks.5 man5/ldap_table.5 man5/mysql_table.5 \ - man5/pgsql_table.5 -TOOLS = man1/smtp-sink.1 man1/smtp-source.1 man1/qmqp-sink.1 \ - man1/qmqp-source.1 man1/qshape.1 - -update: $(DAEMONS) $(COMMANDS) $(CONFIG) $(TOOLS) - -Makefile: Makefile.in - (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../src/makedefs; cat $?) >$@ - -clean: - rm -f cat?/* - -tidy: clean - -clobber: - rm -f $(DAEMONS) $(COMMANDS) $(CONFIG) - -man8/bounce.8: ../src/bounce/bounce.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man8/defer.8: - echo .so man8/bounce.8 >$@ - -man8/cleanup.8: ../src/cleanup/cleanup.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man8/anvil.8: ../src/anvil/anvil.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man8/error.8: ../src/error/error.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man8/flush.8: ../src/flush/flush.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man8/local.8: ../src/local/local.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man8/lmtp.8: ../src/lmtp/lmtp.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man8/master.8: ../src/master/master.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man8/oqmgr.8: ../src/oqmgr/qmgr.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? | \ - sed -e 's/qmgr[^_]/o&/' \ - -e 's/qmgr$$/o&/' \ - -e 's/QMGR[^_]/O&/' >$@ - -man8/pickup.8: ../src/pickup/pickup.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man8/pipe.8: ../src/pipe/pipe.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man8/proxymap.8: ../src/proxymap/proxymap.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man8/qmgr.8: ../src/qmgr/qmgr.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man8/qmqpd.8: ../src/qmqpd/qmqpd.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man8/showq.8: ../src/showq/showq.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man8/spawn.8: ../src/spawn/spawn.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man8/smtp.8: ../src/smtp/smtp.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man8/smtpd.8: ../src/smtpd/smtpd.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man8/virtual.8: ../src/virtual/virtual.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man8/verify.8: ../src/verify/verify.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man8/trace.8: - echo .so man8/bounce.8 >$@ - -man8/trivial-rewrite.8: ../src/trivial-rewrite/trivial-rewrite.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man1/postalias.1: ../src/postalias/postalias.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man1/postcat.1: ../src/postcat/postcat.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man1/postconf.1: ../src/postconf/postconf.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man1/postdrop.1: ../src/postdrop/postdrop.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man1/postfix.1: ../src/postfix/postfix.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man1/postkick.1: ../src/postkick/postkick.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man1/postlock.1: ../src/postlock/postlock.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man1/postlog.1: ../src/postlog/postlog.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man1/postmap.1: ../src/postmap/postmap.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man1/postqueue.1: ../src/postqueue/postqueue.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man1/postsuper.1: ../src/postsuper/postsuper.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man1/sendmail.1: ../src/sendmail/sendmail.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man1/mailq.1: - echo .so man1/sendmail.1 >$@ - -man1/newaliases.1: - echo .so man1/sendmail.1 >$@ - -man5/access.5: ../proto/access - ../mantools/srctoman - $? >$@ - -man5/aliases.5: ../proto/aliases - ../mantools/srctoman - $? >$@ - -man5/canonical.5: ../proto/canonical - ../mantools/srctoman - $? >$@ - -man5/cidr_table.5: ../proto/cidr_table - ../mantools/srctoman - $? >$@ - -man5/header_checks.5: ../proto/header_checks - ../mantools/srctoman - $? >$@ - -man5/body_checks.5: ../proto/header_checks - echo .so man5/header_checks.5 >$@ - -man5/ldap_table.5: ../proto/ldap_table - ../mantools/srctoman - $? >$@ - -man5/mysql_table.5: ../proto/mysql_table - ../mantools/srctoman - $? >$@ - -man5/pcre_table.5: ../proto/pcre_table - ../mantools/srctoman - $? >$@ - -man5/pgsql_table.5: ../proto/pgsql_table - ../mantools/srctoman - $? >$@ - -man5/regexp_table.5: ../proto/regexp_table - ../mantools/srctoman - $? >$@ - -man5/relocated.5: ../proto/relocated - ../mantools/srctoman - $? >$@ - -man5/transport.5: ../proto/transport - ../mantools/srctoman - $? >$@ - -man5/virtual.5: ../proto/virtual - ../mantools/srctoman - $? >$@ - -man1/smtp-sink.1: ../src/smtpstone/smtp-sink.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man1/smtp-source.1: ../src/smtpstone/smtp-source.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man5/tcp_table.5: ../proto/tcp_table - ../mantools/srctoman - $? >$@ - -man1/qmqp-sink.1: ../src/smtpstone/qmqp-sink.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man1/qmqp-source.1: ../src/smtpstone/qmqp-source.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man1/qshape.1: ../auxiliary/qshape/qshape.pl - #../mantools/fixman ../proto/postconf.proto $? >junk && \ - # (cmp -s junk $? || mv junk $?) - ../mantools/srctoman - $? >$@ diff --git a/postfix/man/Makefile.in.stable b/postfix/man/Makefile.in.stable deleted file mode 100644 index 31c38eb38..000000000 --- a/postfix/man/Makefile.in.stable +++ /dev/null @@ -1,283 +0,0 @@ -SHELL = /bin/sh - -# For now, just hard-coded rules for daemons, commands, config files. - -DAEMONS = man8/bounce.8 man8/defer.8 man8/cleanup.8 man8/error.8 man8/local.8 \ - man8/lmtp.8 man8/master.8 man8/pickup.8 man8/pipe.8 man8/qmgr.8 \ - man8/showq.8 man8/smtp.8 man8/smtpd.8 man8/trivial-rewrite.8 \ - man8/oqmgr.8 man8/spawn.8 man8/flush.8 man8/virtual.8 man8/qmqpd.8 \ - man8/verify.8 man8/trace.8 man8/proxymap.8 -COMMANDS= man1/postalias.1 man1/postcat.1 man1/postconf.1 man1/postfix.1 \ - man1/postkick.1 man1/postlock.1 man1/postlog.1 man1/postdrop.1 \ - man1/postmap.1 man1/sendmail.1 man1/mailq.1 man1/newaliases.1 \ - man1/postqueue.1 man1/postsuper.1 -CONFIG = man5/access.5 man5/aliases.5 man5/canonical.5 man5/relocated.5 \ - man5/transport.5 man5/virtual.5 man5/pcre_table.5 man5/regexp_table.5 \ - man5/cidr_table.5 man5/header_checks.5 \ - man5/body_checks.5 man5/ldap_table.5 man5/mysql_table.5 \ - man5/pgsql_table.5 -TOOLS = man1/smtp-sink.1 man1/smtp-source.1 man1/qmqp-sink.1 \ - man1/qmqp-source.1 man1/qshape.1 - -update: $(DAEMONS) $(COMMANDS) $(CONFIG) $(TOOLS) - -Makefile: Makefile.in - (set -e; echo "# DO NOT EDIT"; $(OPTS) $(SHELL) ../src/makedefs; cat $?) >$@ - -clean: - rm -f cat?/* - -tidy: clean - -clobber: - rm -f $(DAEMONS) $(COMMANDS) $(CONFIG) - -man8/bounce.8: ../src/bounce/bounce.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man8/defer.8: - echo .so man8/bounce.8 >$@ - -man8/cleanup.8: ../src/cleanup/cleanup.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man8/anvil.8: ../src/anvil/anvil.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man8/error.8: ../src/error/error.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man8/flush.8: ../src/flush/flush.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man8/local.8: ../src/local/local.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man8/lmtp.8: ../src/lmtp/lmtp.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man8/master.8: ../src/master/master.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man8/oqmgr.8: ../src/oqmgr/qmgr.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? | \ - sed -e 's/qmgr[^_]/o&/' \ - -e 's/qmgr$$/o&/' \ - -e 's/QMGR[^_]/O&/' >$@ - -man8/pickup.8: ../src/pickup/pickup.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man8/pipe.8: ../src/pipe/pipe.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man8/proxymap.8: ../src/proxymap/proxymap.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man8/qmgr.8: ../src/qmgr/qmgr.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man8/qmqpd.8: ../src/qmqpd/qmqpd.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man8/showq.8: ../src/showq/showq.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man8/spawn.8: ../src/spawn/spawn.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man8/smtp.8: ../src/smtp/smtp.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man8/smtpd.8: ../src/smtpd/smtpd.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man8/virtual.8: ../src/virtual/virtual.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man8/verify.8: ../src/verify/verify.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man8/trace.8: - echo .so man8/bounce.8 >$@ - -man8/trivial-rewrite.8: ../src/trivial-rewrite/trivial-rewrite.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man1/postalias.1: ../src/postalias/postalias.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man1/postcat.1: ../src/postcat/postcat.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man1/postconf.1: ../src/postconf/postconf.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man1/postdrop.1: ../src/postdrop/postdrop.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man1/postfix.1: ../src/postfix/postfix.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man1/postkick.1: ../src/postkick/postkick.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man1/postlock.1: ../src/postlock/postlock.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man1/postlog.1: ../src/postlog/postlog.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man1/postmap.1: ../src/postmap/postmap.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man1/postqueue.1: ../src/postqueue/postqueue.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man1/postsuper.1: ../src/postsuper/postsuper.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man1/sendmail.1: ../src/sendmail/sendmail.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man1/mailq.1: - echo .so man1/sendmail.1 >$@ - -man1/newaliases.1: - echo .so man1/sendmail.1 >$@ - -man5/access.5: ../proto/access - ../mantools/srctoman - $? >$@ - -man5/aliases.5: ../proto/aliases - ../mantools/srctoman - $? >$@ - -man5/canonical.5: ../proto/canonical - ../mantools/srctoman - $? >$@ - -man5/cidr_table.5: ../proto/cidr_table - ../mantools/srctoman - $? >$@ - -man5/header_checks.5: ../proto/header_checks - ../mantools/srctoman - $? >$@ - -man5/body_checks.5: ../proto/header_checks - echo .so man5/header_checks.5 >$@ - -man5/ldap_table.5: ../proto/ldap_table - ../mantools/srctoman - $? >$@ - -man5/mysql_table.5: ../proto/mysql_table - ../mantools/srctoman - $? >$@ - -man5/pcre_table.5: ../proto/pcre_table - ../mantools/srctoman - $? >$@ - -man5/pgsql_table.5: ../proto/pgsql_table - ../mantools/srctoman - $? >$@ - -man5/regexp_table.5: ../proto/regexp_table - ../mantools/srctoman - $? >$@ - -man5/relocated.5: ../proto/relocated - ../mantools/srctoman - $? >$@ - -man5/transport.5: ../proto/transport - ../mantools/srctoman - $? >$@ - -man5/virtual.5: ../proto/virtual - ../mantools/srctoman - $? >$@ - -man1/smtp-sink.1: ../src/smtpstone/smtp-sink.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man1/smtp-source.1: ../src/smtpstone/smtp-source.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man5/tcp_table.5: ../proto/tcp_table - ../mantools/srctoman - $? >$@ - -man1/qmqp-sink.1: ../src/smtpstone/qmqp-sink.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man1/qmqp-source.1: ../src/smtpstone/qmqp-source.c - ../mantools/fixman ../proto/postconf.proto $? >junk && \ - (cmp -s junk $? || mv junk $?) - ../mantools/srctoman $? >$@ - -man1/qshape.1: ../auxiliary/qshape/qshape.pl - #../mantools/fixman ../proto/postconf.proto $? >junk && \ - # (cmp -s junk $? || mv junk $?) - ../mantools/srctoman - $? >$@ diff --git a/postfix/src/global/ehlo_mask.c b/postfix/src/global/ehlo_mask.c index 85ade1293..a97a9f0cd 100644 --- a/postfix/src/global/ehlo_mask.c +++ b/postfix/src/global/ehlo_mask.c @@ -16,7 +16,8 @@ /* #define EHLO_MASK_STARTTLS (1<<7) /* #define EHLO_MASK_XCLIENT (1<<8) /* #define EHLO_MASK_XFORWARD (1<<9) -/* #define EHLO_MASK_SILENT (1<<10) +/* #define EHLO_MASK_XFORWARD (1<<10) +/* #define EHLO_MASK_SILENT (1<<15) /* /* int ehlo_mask(keyword_list) /* const char *keyword_list; @@ -71,6 +72,7 @@ static NAME_MASK ehlo_mask_table[] = { "XCLIENT", EHLO_MASK_XCLIENT, "XFORWARD", EHLO_MASK_XFORWARD, "STARTTLS", EHLO_MASK_STARTTLS, + "ENHANCEDSTATUSCODES", EHLO_MASK_ENHANCEDSTATUSCODES, "SILENT-DISCARD", EHLO_MASK_SILENT, /* XXX In-band signaling */ 0, }; diff --git a/postfix/src/global/ehlo_mask.h b/postfix/src/global/ehlo_mask.h index 9e8611f57..440ae69dc 100644 --- a/postfix/src/global/ehlo_mask.h +++ b/postfix/src/global/ehlo_mask.h @@ -25,7 +25,8 @@ #define EHLO_MASK_XCLIENT (1<<8) /* start of second byte */ #define EHLO_MASK_XFORWARD (1<<9) -#define EHLO_MASK_SILENT (1<<10) +#define EHLO_MASK_ENHANCEDSTATUSCODES (1<<10) +#define EHLO_MASK_SILENT (1<<15) extern int ehlo_mask(const char *); extern const char *str_ehlo_mask(int); diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h index fd71ce170..edaba91ee 100644 --- a/postfix/src/global/mail_version.h +++ b/postfix/src/global/mail_version.h @@ -20,7 +20,7 @@ * Patches change the patchlevel and the release date. Snapshots change the * release date only. */ -#define MAIL_RELEASE_DATE "20050427" +#define MAIL_RELEASE_DATE "20050429" #define MAIL_VERSION_NUMBER "2.3" #define VAR_MAIL_VERSION "mail_version" diff --git a/postfix/src/smtpd/smtpd.c b/postfix/src/smtpd/smtpd.c index 610b3b4c9..112f9afc4 100644 --- a/postfix/src/smtpd/smtpd.c +++ b/postfix/src/smtpd/smtpd.c @@ -1218,6 +1218,8 @@ static int ehlo_cmd(SMTPD_STATE *state, int argc, SMTPD_TOKEN *argv) " " XFORWARD_NAME " " XFORWARD_ADDR " " XFORWARD_PROTO " " XFORWARD_HELO " " XFORWARD_DOMAIN); + if ((discard_mask & EHLO_MASK_ENHANCEDSTATUSCODES) == 0) + ENQUEUE_FIX_REPLY(state, reply_buf, "ENHANCEDSTATUSCODES"); if ((discard_mask & EHLO_MASK_8BITMIME) == 0) ENQUEUE_FIX_REPLY(state, reply_buf, "8BITMIME"); smtpd_chat_reply(state, "250 %s", STR(reply_buf));