~ubuntu-branches/ubuntu/natty/postfix/natty-security

« back to all changes in this revision

Viewing changes to src/smtpd/smtpd_proxy.c

Committer: Bazaar Package Importer
Author(s): LaMont Jones
Date: 2011-02-22 05:26:41 UTC
mfrom: (1.1.27 upstream)
Revision ID: james.westby@ubuntu.com-20110222052641-l05d2bsz2kka0yca

Tags: 2.8.0-1~build1

natty version

files added:
README_FILES/POSTSCREEN_README

README_FILES/SQLITE_README

RELEASE_NOTES-2.7

debian/po/da.po

debian/postfix.insserv.conf

debian/source

debian/source/format

html/POSTSCREEN_README.html

html/SQLITE_README.html

html/dnsblog.8.html

html/postscreen.8.html

html/sqlite_table.5.html

html/tlsproxy.8.html

man/man5/sqlite_table.5

man/man8/dnsblog.8

man/man8/postscreen.8

man/man8/tlsproxy.8

proto/POSTSCREEN_README.html

proto/SQLITE_README.html

proto/sqlite_table

src/dnsblog

src/dnsblog/.indent.pro

src/dnsblog/Makefile.in

src/dnsblog/dnsblog.c

src/global/dict_sqlite.c

src/global/dict_sqlite.h

src/global/mail_conf_nbool.c

src/global/smtp_reply_footer.c

src/global/smtp_reply_footer.h

src/postscreen

src/postscreen/.indent.pro

src/postscreen/Makefile.in

src/postscreen/postscreen.c

src/postscreen/postscreen.h

src/postscreen/postscreen_access.c

src/postscreen/postscreen_dict.c

src/postscreen/postscreen_dnsbl.c

src/postscreen/postscreen_early.c

src/postscreen/postscreen_expand.c

src/postscreen/postscreen_misc.c

src/postscreen/postscreen_send.c

src/postscreen/postscreen_smtpd.c

src/postscreen/postscreen_starttls.c

src/postscreen/postscreen_state.c

src/postscreen/postscreen_tests.c

src/smtpd/smtpd_dnswl.in

src/smtpd/smtpd_dnswl.ref

src/smtpd/smtpd_expand.c

src/smtpd/smtpd_expand.h

src/tls/tls_proxy.h

src/tls/tls_proxy_clnt.c

src/tls/tls_proxy_print.c

src/tls/tls_proxy_scan.c

src/tlsproxy

src/tlsproxy/.indent.pro

src/tlsproxy/Makefile.in

src/tlsproxy/tlsproxy.c

src/tlsproxy/tlsproxy.h

src/tlsproxy/tlsproxy_state.c

src/util/dict_thash.c

src/util/dict_thash.h

src/util/ip_match.c

src/util/ip_match.h

src/util/ip_match.in

src/util/ip_match.ref

src/util/name_mask.in

src/util/name_mask.ref0

src/util/name_mask.ref1

src/util/name_mask.ref2

src/util/name_mask.ref3

src/util/name_mask.ref4

src/util/name_mask.ref5

src/util/name_mask.ref6

src/util/name_mask.ref7

src/util/name_mask.ref8

src/util/name_mask.ref9

src/util/nbbio.c

src/util/nbbio.h

src/util/stream_pass_connect.c

src/util/unix_pass_listen.c

src/util/unix_pass_trigger.c

src/util/valid_utf_8.c

files removed:
src/util/upass_connect.c

src/util/upass_listen.c

src/util/upass_trigger.c

files modified:
.indent.pro

HISTORY

Makefile.in

README_FILES/AAAREADME

README_FILES/ADDRESS_VERIFICATION_README

README_FILES/BACKSCATTER_README

README_FILES/CYRUS_README

README_FILES/DATABASE_README

README_FILES/INSTALL

README_FILES/LDAP_README

README_FILES/MILTER_README

README_FILES/OVERVIEW

README_FILES/QSHAPE_README

README_FILES/SASL_README

README_FILES/STANDARD_CONFIGURATION_README

README_FILES/TLS_README

README_FILES/XFORWARD_README

RELEASE_NOTES

conf/access

conf/header_checks

conf/master.cf

conf/post-install

conf/postfix-files

debian/README.Debian

debian/changelog

debian/compat

debian/control

debian/init.d

debian/po/ja.po

debian/po/nl.po

debian/postfix.dirs

debian/rules

debian/vars.in

html/ADDRESS_VERIFICATION_README.html

html/BACKSCATTER_README.html

html/DATABASE_README.html

html/INSTALL.html

html/LDAP_README.html

html/MILTER_README.html

html/Makefile.in

html/OVERVIEW.html

html/QSHAPE_README.html

html/SASL_README.html

html/STANDARD_CONFIGURATION_README.html

html/TLS_README.html

html/XFORWARD_README.html

html/access.5.html

html/header_checks.5.html

html/index.html

html/ldap_table.5.html

html/lmtp.8.html

html/local.8.html

html/master.5.html

html/mysql_table.5.html

html/oqmgr.8.html

html/pgsql_table.5.html

html/postconf.1.html

html/postconf.5.html

html/postfix-manuals.html

html/postfix.1.html

html/qmgr.8.html

html/smtp-sink.1.html

html/smtp.8.html

html/smtpd.8.html

man/Makefile.in

man/man1/postconf.1

man/man1/postfix.1

man/man1/smtp-sink.1

man/man5/access.5

man/man5/header_checks.5

man/man5/ldap_table.5

man/man5/master.5

man/man5/mysql_table.5

man/man5/pgsql_table.5

man/man5/postconf.5

man/man8/defer.8

man/man8/lmtp.8

man/man8/local.8

man/man8/oqmgr.8

man/man8/qmgr.8

man/man8/smtp.8

man/man8/smtpd.8

man/man8/trace.8

mantools/postlink

proto/ADDRESS_VERIFICATION_README.html

proto/BACKSCATTER_README.html

proto/DATABASE_README.html

proto/INSTALL.html

proto/LDAP_README.html

proto/MILTER_README.html

proto/Makefile.in

proto/OVERVIEW.html

proto/QSHAPE_README.html

proto/SASL_README.html

proto/STANDARD_CONFIGURATION_README.html

proto/TLS_README.html

proto/XFORWARD_README.html

proto/access

proto/header_checks

proto/ldap_table

proto/master

proto/mysql_table

proto/pgsql_table

proto/postconf.proto

proto/stop

src/cleanup/Makefile.in

src/cleanup/cleanup.h

src/cleanup/cleanup_addr.c

src/cleanup/cleanup_map1n.c

src/cleanup/cleanup_message.c

src/cleanup/cleanup_milter.c

src/dns/dns.h

src/dns/dns_rr.c

src/dns/test_dns_lookup.c

src/global/Makefile.in

src/global/addr_match_list.c

src/global/cfg_parser.c

src/global/conv_time.c

src/global/db_common.c

src/global/deliver_pass.c

src/global/deliver_request.c

src/global/deliver_request.h

src/global/dict_ldap.c

src/global/dict_mysql.c

src/global/dict_pgsql.c

src/global/dsn_mask.c

src/global/ehlo_mask.c

src/global/header_body_checks.c

src/global/mail_conf.c

src/global/mail_conf.h

src/global/mail_conf_int.c

src/global/mail_conf_long.c

src/global/mail_conf_nint.c

src/global/mail_conf_time.c

src/global/mail_dict.c

src/global/mail_params.h

src/global/mail_proto.h

src/global/mail_version.h

src/global/mime_state.c

src/global/mkmap_open.c

src/global/pipe_command.c

src/global/scache_clnt.c

src/local/alias.c

src/local/forward.c

src/local/local.c

src/local/recipient.c

src/master/event_server.c

src/master/mail_server.h

src/master/master.h

src/master/master_sig.c

src/master/master_spawn.c

src/master/multi_server.c

src/master/single_server.c

src/master/trigger_server.c

src/milter/milter8.c

src/milter/test-milter.c

src/oqmgr/qmgr.c

src/oqmgr/qmgr.h

src/oqmgr/qmgr_deliver.c

src/oqmgr/qmgr_message.c

src/pickup/pickup.c

src/pipe/pipe.c

src/postconf/Makefile.in

src/postconf/extract.awk

src/postconf/postconf.c

src/postfix/postfix.c

src/qmgr/qmgr.c

src/qmgr/qmgr.h

src/qmgr/qmgr_deliver.c

src/qmgr/qmgr_message.c

src/qmqpd/Makefile.in

src/qmqpd/qmqpd_peer.c

src/smtp/Makefile.in

src/smtp/lmtp_params.c

src/smtp/smtp.c

src/smtp/smtp.h

src/smtp/smtp_addr.c

src/smtp/smtp_params.c

src/smtp/smtp_proto.c

src/smtpd/Makefile.in

src/smtpd/smtpd.c

src/smtpd/smtpd.h

src/smtpd/smtpd_chat.c

src/smtpd/smtpd_check.c

src/smtpd/smtpd_peer.c

src/smtpd/smtpd_proxy.c

src/smtpd/smtpd_sasl_proto.c

src/smtpd/smtpd_state.c

src/smtpstone/smtp-sink.c

src/smtpstone/smtp-source.c

src/tls/Makefile.in

src/tls/tls.h

src/tls/tls_bio_ops.c

src/tls/tls_certkey.c

src/tls/tls_client.c

src/tls/tls_misc.c

src/tls/tls_server.c

src/util/Makefile.in

src/util/connect.h

src/util/dict.c

src/util/dict_db.c

src/util/dict_dbm.h

src/util/dict_ht.c

src/util/dict_open.c

src/util/events.c

src/util/events.h

src/util/listen.h

src/util/mac_expand.c

src/util/mac_expand.h

src/util/make_dirs.c

src/util/mymalloc.c

src/util/name_mask.c

src/util/name_mask.h

src/util/stream_recv_fd.c

src/util/stream_send_fd.c

src/util/stringops.h

src/util/sys_defs.h

src/util/trigger.h

src/util/unix_recv_fd.c

src/util/unix_send_fd.c

src/util/vstream.c

src/util/vstream.h

src/util/vstring.c

src/util/watchdog.c

src/xsasl/Makefile.in

src/xsasl/xsasl_dovecot_server.c

Show diffs side-by-side

added added

removed removed

src/smtpd/smtpd_proxy.c

325

XFORWARD_PORT, SMTPD_PROXY_XFORWARD_PORT,

326

XFORWARD_PROTO, SMTPD_PROXY_XFORWARD_PROTO,

327

XFORWARD_HELO, SMTPD_PROXY_XFORWARD_HELO,

328

XFORWARD_IDENT, SMTPD_PROXY_XFORWARD_IDENT,

328

329

XFORWARD_DOMAIN, SMTPD_PROXY_XFORWARD_DOMAIN,

329

330

0, 0,

330

331

};

349

350

351

* Connect to proxy.

351

352

if ((fd = connect_fn(endpoint, BLOCKING, proxy->timeout)) < 0)

353

if ((fd = connect_fn(endpoint, BLOCKING, proxy->timeout)) < 0) {

354

msg_warn("connect to proxy filter %s: %m", proxy->service_name);

353

355

return (smtpd_proxy_rdwr_error(state, 0));

356

}

354

357

proxy->service_stream = vstream_fdopen(fd, O_RDWR);

355

358

/* Needed by our DATA-phase record emulation routines. */

356

359

vstream_control(proxy->service_stream, VSTREAM_CTL_CONTEXT,

357

360

(char *) state, VSTREAM_CTL_END);

361

/* Avoid poor performance when TCP MSS > VSTREAM_BUFSIZE. */

362

if (connect_fn == inet_connect)

363

vstream_tweak_tcp(proxy->service_stream);

358

364

smtp_timeout_setup(proxy->service_stream, proxy->timeout);

359

365

360

366

426

432

&& smtpd_proxy_xforward_send(state, buf, XFORWARD_HELO,

427

433

IS_AVAIL_CLIENT_HELO(FORWARD_HELO(state)),

428

434

FORWARD_HELO(state)))

435

|| ((server_xforward_features & SMTPD_PROXY_XFORWARD_IDENT)

436

&& smtpd_proxy_xforward_send(state, buf, XFORWARD_IDENT,

437

IS_AVAIL_CLIENT_IDENT(FORWARD_IDENT(state)),

438

FORWARD_IDENT(state)))

429

439

|| ((server_xforward_features & SMTPD_PROXY_XFORWARD_PROTO)

430

440

&& smtpd_proxy_xforward_send(state, buf, XFORWARD_PROTO,

431

441

IS_AVAIL_CLIENT_PROTO(FORWARD_PROTO(state)),

Older »