Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/ibm-public/postfix Resolve conflicts.
details: https://anonhg.NetBSD.org/src/rev/ef51e2e34953
branches: trunk
changeset: 821709:ef51e2e34953
user: christos <christos%NetBSD.org@localhost>
date: Tue Feb 14 01:16:43 2017 +0000
description:
Resolve conflicts.
diffstat:
external/ibm-public/postfix/Makefile.inc | 4 +-
external/ibm-public/postfix/dist/README_FILES/ADDRESS_VERIFICATION_README | 46 +-
external/ibm-public/postfix/dist/README_FILES/INSTALL | 411 +-
external/ibm-public/postfix/dist/README_FILES/TLS_README | 262 +-
external/ibm-public/postfix/dist/conf/dynamicmaps.cf | 2 +-
external/ibm-public/postfix/dist/conf/main.cf | 25 +-
external/ibm-public/postfix/dist/conf/master.cf | 4 +-
external/ibm-public/postfix/dist/conf/post-install | 2 +-
external/ibm-public/postfix/dist/conf/postfix-files | 47 +-
external/ibm-public/postfix/dist/conf/postfix-script | 2 +-
external/ibm-public/postfix/dist/conf/postfix-tls-script | 2 +-
external/ibm-public/postfix/dist/conf/postmulti-script | 2 +-
external/ibm-public/postfix/dist/html/ADDRESS_VERIFICATION_README.html | 42 +-
external/ibm-public/postfix/dist/html/INSTALL.html | 517 +-
external/ibm-public/postfix/dist/html/TLS_README.html | 310 +-
external/ibm-public/postfix/dist/html/postconf.5.html | 1519 ++++-
external/ibm-public/postfix/dist/makedefs | 581 +-
external/ibm-public/postfix/dist/man/man1/postalias.1 | 2 +-
external/ibm-public/postfix/dist/man/man1/postcat.1 | 2 +-
external/ibm-public/postfix/dist/man/man1/postconf.1 | 2 +-
external/ibm-public/postfix/dist/man/man1/postdrop.1 | 2 +-
external/ibm-public/postfix/dist/man/man1/postfix-tls.1 | 2 +-
external/ibm-public/postfix/dist/man/man1/postfix.1 | 2 +-
external/ibm-public/postfix/dist/man/man1/postkick.1 | 2 +-
external/ibm-public/postfix/dist/man/man1/postlock.1 | 2 +-
external/ibm-public/postfix/dist/man/man1/postlog.1 | 2 +-
external/ibm-public/postfix/dist/man/man1/postmap.1 | 2 +-
external/ibm-public/postfix/dist/man/man1/postmulti.1 | 2 +-
external/ibm-public/postfix/dist/man/man1/postqueue.1 | 2 +-
external/ibm-public/postfix/dist/man/man1/postsuper.1 | 2 +-
external/ibm-public/postfix/dist/man/man1/posttls-finger.1 | 2 +-
external/ibm-public/postfix/dist/man/man1/qmqp-sink.1 | 2 +-
external/ibm-public/postfix/dist/man/man1/qmqp-source.1 | 2 +-
external/ibm-public/postfix/dist/man/man1/qshape.1 | 2 +-
external/ibm-public/postfix/dist/man/man1/sendmail.1 | 2 +-
external/ibm-public/postfix/dist/man/man1/smtp-sink.1 | 2 +-
external/ibm-public/postfix/dist/man/man1/smtp-source.1 | 2 +-
external/ibm-public/postfix/dist/man/man5/access.5 | 2 +-
external/ibm-public/postfix/dist/man/man5/aliases.5 | 2 +-
external/ibm-public/postfix/dist/man/man5/bounce.5 | 2 +-
external/ibm-public/postfix/dist/man/man5/canonical.5 | 2 +-
external/ibm-public/postfix/dist/man/man5/cidr_table.5 | 2 +-
external/ibm-public/postfix/dist/man/man5/generic.5 | 2 +-
external/ibm-public/postfix/dist/man/man5/header_checks.5 | 2 +-
external/ibm-public/postfix/dist/man/man5/ldap_table.5 | 2 +-
external/ibm-public/postfix/dist/man/man5/lmdb_table.5 | 2 +-
external/ibm-public/postfix/dist/man/man5/master.5 | 2 +-
external/ibm-public/postfix/dist/man/man5/memcache_table.5 | 2 +-
external/ibm-public/postfix/dist/man/man5/mysql_table.5 | 2 +-
external/ibm-public/postfix/dist/man/man5/nisplus_table.5 | 2 +-
external/ibm-public/postfix/dist/man/man5/pcre_table.5 | 2 +-
external/ibm-public/postfix/dist/man/man5/pgsql_table.5 | 2 +-
external/ibm-public/postfix/dist/man/man5/postconf.5 | 3166 ++++++---
external/ibm-public/postfix/dist/man/man5/postfix-wrapper.5 | 2 +-
external/ibm-public/postfix/dist/man/man5/regexp_table.5 | 2 +-
external/ibm-public/postfix/dist/man/man5/relocated.5 | 2 +-
external/ibm-public/postfix/dist/man/man5/socketmap_table.5 | 2 +-
external/ibm-public/postfix/dist/man/man5/sqlite_table.5 | 2 +-
external/ibm-public/postfix/dist/man/man5/tcp_table.5 | 2 +-
external/ibm-public/postfix/dist/man/man5/transport.5 | 2 +-
external/ibm-public/postfix/dist/man/man5/virtual.5 | 2 +-
external/ibm-public/postfix/dist/man/man8/anvil.8 | 2 +-
external/ibm-public/postfix/dist/man/man8/bounce.8 | 2 +-
external/ibm-public/postfix/dist/man/man8/cleanup.8 | 2 +-
external/ibm-public/postfix/dist/man/man8/discard.8 | 2 +-
external/ibm-public/postfix/dist/man/man8/dnsblog.8 | 2 +-
external/ibm-public/postfix/dist/man/man8/error.8 | 2 +-
external/ibm-public/postfix/dist/man/man8/flush.8 | 2 +-
external/ibm-public/postfix/dist/man/man8/local.8 | 2 +-
external/ibm-public/postfix/dist/man/man8/master.8 | 2 +-
external/ibm-public/postfix/dist/man/man8/oqmgr.8 | 2 +-
external/ibm-public/postfix/dist/man/man8/pickup.8 | 2 +-
external/ibm-public/postfix/dist/man/man8/pipe.8 | 2 +-
external/ibm-public/postfix/dist/man/man8/postscreen.8 | 2 +-
external/ibm-public/postfix/dist/man/man8/proxymap.8 | 2 +-
external/ibm-public/postfix/dist/man/man8/qmgr.8 | 2 +-
external/ibm-public/postfix/dist/man/man8/qmqpd.8 | 2 +-
external/ibm-public/postfix/dist/man/man8/scache.8 | 2 +-
external/ibm-public/postfix/dist/man/man8/showq.8 | 2 +-
external/ibm-public/postfix/dist/man/man8/smtp.8 | 2 +-
external/ibm-public/postfix/dist/man/man8/smtpd.8 | 2 +-
external/ibm-public/postfix/dist/man/man8/spawn.8 | 2 +-
external/ibm-public/postfix/dist/man/man8/tlsmgr.8 | 2 +-
external/ibm-public/postfix/dist/man/man8/tlsproxy.8 | 2 +-
external/ibm-public/postfix/dist/man/man8/trivial-rewrite.8 | 2 +-
external/ibm-public/postfix/dist/man/man8/verify.8 | 2 +-
external/ibm-public/postfix/dist/man/man8/virtual.8 | 2 +-
external/ibm-public/postfix/dist/postfix-install | 200 +-
external/ibm-public/postfix/dist/proto/ADDRESS_VERIFICATION_README.html | 42 +-
external/ibm-public/postfix/dist/proto/INSTALL.html | 517 +-
external/ibm-public/postfix/dist/proto/TLS_README.html | 302 +-
external/ibm-public/postfix/dist/proto/postconf.proto | 1331 +++-
external/ibm-public/postfix/dist/src/anvil/anvil.c | 2 +-
external/ibm-public/postfix/dist/src/bounce/bounce.c | 2 +-
external/ibm-public/postfix/dist/src/bounce/bounce_append_service.c | 2 +-
external/ibm-public/postfix/dist/src/bounce/bounce_notify_service.c | 2 +-
external/ibm-public/postfix/dist/src/bounce/bounce_notify_util.c | 2 +-
external/ibm-public/postfix/dist/src/bounce/bounce_notify_verp.c | 2 +-
external/ibm-public/postfix/dist/src/bounce/bounce_one_service.c | 2 +-
external/ibm-public/postfix/dist/src/bounce/bounce_service.h | 2 +-
external/ibm-public/postfix/dist/src/bounce/bounce_template.c | 2 +-
external/ibm-public/postfix/dist/src/bounce/bounce_template.h | 2 +-
external/ibm-public/postfix/dist/src/bounce/bounce_templates.c | 2 +-
external/ibm-public/postfix/dist/src/bounce/bounce_trace_service.c | 2 +-
external/ibm-public/postfix/dist/src/bounce/bounce_warn_service.c | 2 +-
external/ibm-public/postfix/dist/src/cleanup/cleanup.c | 70 +-
external/ibm-public/postfix/dist/src/cleanup/cleanup.h | 21 +-
external/ibm-public/postfix/dist/src/cleanup/cleanup_addr.c | 2 +-
external/ibm-public/postfix/dist/src/cleanup/cleanup_api.c | 2 +-
external/ibm-public/postfix/dist/src/cleanup/cleanup_bounce.c | 2 +-
external/ibm-public/postfix/dist/src/cleanup/cleanup_envelope.c | 38 +-
external/ibm-public/postfix/dist/src/cleanup/cleanup_extracted.c | 2 +-
external/ibm-public/postfix/dist/src/cleanup/cleanup_final.c | 2 +-
external/ibm-public/postfix/dist/src/cleanup/cleanup_init.c | 45 +-
external/ibm-public/postfix/dist/src/cleanup/cleanup_map11.c | 2 +-
external/ibm-public/postfix/dist/src/cleanup/cleanup_map1n.c | 2 +-
external/ibm-public/postfix/dist/src/cleanup/cleanup_masquerade.c | 2 +-
external/ibm-public/postfix/dist/src/cleanup/cleanup_message.c | 2 +-
external/ibm-public/postfix/dist/src/cleanup/cleanup_milter.c | 2 +-
external/ibm-public/postfix/dist/src/cleanup/cleanup_out.c | 2 +-
external/ibm-public/postfix/dist/src/cleanup/cleanup_out_recipient.c | 2 +-
external/ibm-public/postfix/dist/src/cleanup/cleanup_region.c | 2 +-
external/ibm-public/postfix/dist/src/cleanup/cleanup_state.c | 2 +-
external/ibm-public/postfix/dist/src/discard/discard.c | 2 +-
external/ibm-public/postfix/dist/src/dns/dns.h | 2 +-
external/ibm-public/postfix/dist/src/dns/dns_lookup.c | 473 +-
external/ibm-public/postfix/dist/src/dns/dns_rr.c | 2 +-
external/ibm-public/postfix/dist/src/dns/dns_rr_eq_sa.c | 2 +-
external/ibm-public/postfix/dist/src/dns/dns_rr_filter.c | 2 +-
external/ibm-public/postfix/dist/src/dns/dns_rr_to_sa.c | 2 +-
external/ibm-public/postfix/dist/src/dns/dns_sa_to_rr.c | 2 +-
external/ibm-public/postfix/dist/src/dns/dns_strrecord.c | 2 +-
external/ibm-public/postfix/dist/src/dns/test_dns_lookup.c | 2 +-
external/ibm-public/postfix/dist/src/dnsblog/dnsblog.c | 2 +-
external/ibm-public/postfix/dist/src/error/error.c | 2 +-
external/ibm-public/postfix/dist/src/flush/flush.c | 2 +-
external/ibm-public/postfix/dist/src/global/abounce.c | 2 +-
external/ibm-public/postfix/dist/src/global/abounce.h | 2 +-
external/ibm-public/postfix/dist/src/global/addr_match_list.c | 2 +-
external/ibm-public/postfix/dist/src/global/addr_match_list.h | 2 +-
external/ibm-public/postfix/dist/src/global/anvil_clnt.c | 2 +-
external/ibm-public/postfix/dist/src/global/anvil_clnt.h | 2 +-
external/ibm-public/postfix/dist/src/global/attr_override.c | 2 +-
external/ibm-public/postfix/dist/src/global/attr_override.h | 2 +-
external/ibm-public/postfix/dist/src/global/been_here.c | 2 +-
external/ibm-public/postfix/dist/src/global/bounce.c | 2 +-
external/ibm-public/postfix/dist/src/global/bounce.h | 2 +-
external/ibm-public/postfix/dist/src/global/bounce_log.c | 2 +-
external/ibm-public/postfix/dist/src/global/cfg_parser.c | 2 +-
external/ibm-public/postfix/dist/src/global/cleanup_strflags.c | 2 +-
external/ibm-public/postfix/dist/src/global/cleanup_user.h | 2 +-
external/ibm-public/postfix/dist/src/global/clnt_stream.c | 2 +-
external/ibm-public/postfix/dist/src/global/conv_time.c | 2 +-
external/ibm-public/postfix/dist/src/global/data_redirect.c | 2 +-
external/ibm-public/postfix/dist/src/global/db_common.c | 2 +-
external/ibm-public/postfix/dist/src/global/debug_peer.c | 2 +-
external/ibm-public/postfix/dist/src/global/defer.c | 2 +-
external/ibm-public/postfix/dist/src/global/defer.h | 2 +-
external/ibm-public/postfix/dist/src/global/deliver_pass.c | 2 +-
external/ibm-public/postfix/dist/src/global/deliver_request.c | 2 +-
external/ibm-public/postfix/dist/src/global/deliver_request.h | 2 +-
external/ibm-public/postfix/dist/src/global/delivered_hdr.c | 2 +-
external/ibm-public/postfix/dist/src/global/dict_ldap.c | 2 +-
external/ibm-public/postfix/dist/src/global/dict_memcache.c | 2 +-
external/ibm-public/postfix/dist/src/global/dict_mysql.c | 2 +-
external/ibm-public/postfix/dist/src/global/dict_pgsql.c | 2 +-
external/ibm-public/postfix/dist/src/global/dict_proxy.c | 2 +-
external/ibm-public/postfix/dist/src/global/dict_proxy.h | 2 +-
external/ibm-public/postfix/dist/src/global/dict_sqlite.c | 2 +-
external/ibm-public/postfix/dist/src/global/domain_list.c | 2 +-
external/ibm-public/postfix/dist/src/global/domain_list.h | 2 +-
external/ibm-public/postfix/dist/src/global/dsb_scan.c | 2 +-
external/ibm-public/postfix/dist/src/global/dsn.c | 2 +-
external/ibm-public/postfix/dist/src/global/dsn_buf.c | 2 +-
external/ibm-public/postfix/dist/src/global/dsn_filter.c | 2 +-
external/ibm-public/postfix/dist/src/global/dsn_filter.h | 2 +-
external/ibm-public/postfix/dist/src/global/dsn_mask.c | 2 +-
external/ibm-public/postfix/dist/src/global/dsn_print.c | 2 +-
external/ibm-public/postfix/dist/src/global/dynamicmaps.c | 2 +-
external/ibm-public/postfix/dist/src/global/dynamicmaps.h | 2 +-
external/ibm-public/postfix/dist/src/global/ehlo_mask.c | 2 +-
external/ibm-public/postfix/dist/src/global/ehlo_mask.h | 2 +-
external/ibm-public/postfix/dist/src/global/ext_prop.c | 2 +-
external/ibm-public/postfix/dist/src/global/flush_clnt.c | 2 +-
external/ibm-public/postfix/dist/src/global/fold_addr.c | 2 +-
external/ibm-public/postfix/dist/src/global/fold_addr.h | 2 +-
external/ibm-public/postfix/dist/src/global/header_body_checks.c | 2 +-
external/ibm-public/postfix/dist/src/global/header_body_checks.h | 2 +-
external/ibm-public/postfix/dist/src/global/header_opts.c | 2 +-
external/ibm-public/postfix/dist/src/global/header_opts.h | 2 +-
external/ibm-public/postfix/dist/src/global/int_filt.c | 2 +-
external/ibm-public/postfix/dist/src/global/log_adhoc.c | 2 +-
external/ibm-public/postfix/dist/src/global/mail_addr_crunch.c | 2 +-
external/ibm-public/postfix/dist/src/global/mail_addr_find.c | 2 +-
external/ibm-public/postfix/dist/src/global/mail_addr_map.c | 2 +-
external/ibm-public/postfix/dist/src/global/mail_command_client.c | 2 +-
external/ibm-public/postfix/dist/src/global/mail_conf.c | 2 +-
external/ibm-public/postfix/dist/src/global/mail_conf.h | 2 +-
external/ibm-public/postfix/dist/src/global/mail_conf_int.c | 2 +-
external/ibm-public/postfix/dist/src/global/mail_conf_str.c | 2 +-
external/ibm-public/postfix/dist/src/global/mail_conf_time.c | 2 +-
external/ibm-public/postfix/dist/src/global/mail_connect.c | 2 +-
external/ibm-public/postfix/dist/src/global/mail_dict.c | 2 +-
external/ibm-public/postfix/dist/src/global/mail_params.c | 2 +-
external/ibm-public/postfix/dist/src/global/mail_params.h | 254 +-
external/ibm-public/postfix/dist/src/global/mail_parm_split.c | 2 +-
external/ibm-public/postfix/dist/src/global/mail_parm_split.h | 2 +-
external/ibm-public/postfix/dist/src/global/mail_proto.h | 2 +-
external/ibm-public/postfix/dist/src/global/mail_queue.c | 2 +-
external/ibm-public/postfix/dist/src/global/mail_queue.h | 2 +-
external/ibm-public/postfix/dist/src/global/mail_stream.c | 2 +-
external/ibm-public/postfix/dist/src/global/mail_stream.h | 2 +-
external/ibm-public/postfix/dist/src/global/mail_version.c | 2 +-
external/ibm-public/postfix/dist/src/global/mail_version.h | 2 +-
external/ibm-public/postfix/dist/src/global/maps.c | 2 +-
external/ibm-public/postfix/dist/src/global/match_parent_style.c | 2 +-
external/ibm-public/postfix/dist/src/global/match_service.c | 2 +-
external/ibm-public/postfix/dist/src/global/mbox_open.c | 2 +-
external/ibm-public/postfix/dist/src/global/memcache_proto.h | 2 +-
external/ibm-public/postfix/dist/src/global/midna_adomain.c | 2 +-
external/ibm-public/postfix/dist/src/global/midna_adomain.h | 2 +-
external/ibm-public/postfix/dist/src/global/mime_state.c | 2 +-
external/ibm-public/postfix/dist/src/global/mkmap.h | 2 +-
external/ibm-public/postfix/dist/src/global/mkmap_open.c | 2 +-
external/ibm-public/postfix/dist/src/global/msg_stats_print.c | 2 +-
external/ibm-public/postfix/dist/src/global/msg_stats_scan.c | 2 +-
external/ibm-public/postfix/dist/src/global/mynetworks.c | 2 +-
external/ibm-public/postfix/dist/src/global/mynetworks.h | 2 +-
external/ibm-public/postfix/dist/src/global/mypwd.c | 2 +-
external/ibm-public/postfix/dist/src/global/namadr_list.c | 2 +-
external/ibm-public/postfix/dist/src/global/namadr_list.h | 2 +-
external/ibm-public/postfix/dist/src/global/pipe_command.c | 2 +-
external/ibm-public/postfix/dist/src/global/pipe_command.h | 2 +-
external/ibm-public/postfix/dist/src/global/post_mail.c | 2 +-
external/ibm-public/postfix/dist/src/global/post_mail.h | 2 +-
external/ibm-public/postfix/dist/src/global/rcpt_buf.c | 2 +-
external/ibm-public/postfix/dist/src/global/rcpt_print.c | 2 +-
external/ibm-public/postfix/dist/src/global/rec_type.h | 2 +-
external/ibm-public/postfix/dist/src/global/recipient_list.c | 2 +-
external/ibm-public/postfix/dist/src/global/record.c | 2 +-
external/ibm-public/postfix/dist/src/global/record.h | 2 +-
external/ibm-public/postfix/dist/src/global/resolve_clnt.c | 2 +-
external/ibm-public/postfix/dist/src/global/resolve_local.c | 2 +-
external/ibm-public/postfix/dist/src/global/rewrite_clnt.c | 2 +-
external/ibm-public/postfix/dist/src/global/scache.c | 2 +-
external/ibm-public/postfix/dist/src/global/scache.h | 2 +-
external/ibm-public/postfix/dist/src/global/scache_clnt.c | 2 +-
external/ibm-public/postfix/dist/src/global/scache_multi.c | 2 +-
external/ibm-public/postfix/dist/src/global/scache_single.c | 2 +-
external/ibm-public/postfix/dist/src/global/sent.c | 2 +-
external/ibm-public/postfix/dist/src/global/server_acl.c | 2 +-
external/ibm-public/postfix/dist/src/global/smtp_reply_footer.c | 2 +-
external/ibm-public/postfix/dist/src/global/smtp_reply_footer.h | 2 +-
external/ibm-public/postfix/dist/src/global/smtp_stream.c | 2 +-
external/ibm-public/postfix/dist/src/global/smtputf8.c | 2 +-
external/ibm-public/postfix/dist/src/global/smtputf8.h | 2 +-
external/ibm-public/postfix/dist/src/global/split_addr.c | 2 +-
external/ibm-public/postfix/dist/src/global/string_list.c | 2 +-
external/ibm-public/postfix/dist/src/global/string_list.h | 2 +-
external/ibm-public/postfix/dist/src/global/strip_addr.c | 2 +-
external/ibm-public/postfix/dist/src/global/sys_exits.c | 2 +-
external/ibm-public/postfix/dist/src/global/timed_ipc.c | 2 +-
external/ibm-public/postfix/dist/src/global/tok822_node.c | 2 +-
external/ibm-public/postfix/dist/src/global/tok822_tree.c | 2 +-
external/ibm-public/postfix/dist/src/global/trace.c | 2 +-
external/ibm-public/postfix/dist/src/global/user_acl.c | 2 +-
external/ibm-public/postfix/dist/src/global/user_acl.h | 2 +-
external/ibm-public/postfix/dist/src/global/uxtext.c | 2 +-
external/ibm-public/postfix/dist/src/global/uxtext.h | 2 +-
external/ibm-public/postfix/dist/src/global/verify.c | 2 +-
external/ibm-public/postfix/dist/src/global/verify_clnt.c | 2 +-
external/ibm-public/postfix/dist/src/global/verify_sender_addr.c | 2 +-
external/ibm-public/postfix/dist/src/global/xtext.c | 2 +-
external/ibm-public/postfix/dist/src/local/alias.c | 2 +-
external/ibm-public/postfix/dist/src/local/biff_notify.c | 2 +-
external/ibm-public/postfix/dist/src/local/bounce_workaround.c | 2 +-
external/ibm-public/postfix/dist/src/local/command.c | 2 +-
external/ibm-public/postfix/dist/src/local/dotforward.c | 2 +-
external/ibm-public/postfix/dist/src/local/file.c | 2 +-
external/ibm-public/postfix/dist/src/local/forward.c | 2 +-
external/ibm-public/postfix/dist/src/local/local.c | 2 +-
external/ibm-public/postfix/dist/src/local/local.h | 2 +-
external/ibm-public/postfix/dist/src/local/local_expand.c | 2 +-
external/ibm-public/postfix/dist/src/local/mailbox.c | 2 +-
external/ibm-public/postfix/dist/src/local/recipient.c | 2 +-
external/ibm-public/postfix/dist/src/local/unknown.c | 7 +-
external/ibm-public/postfix/dist/src/master/event_server.c | 2 +-
external/ibm-public/postfix/dist/src/master/mail_server.h | 2 +-
external/ibm-public/postfix/dist/src/master/master.c | 2 +-
external/ibm-public/postfix/dist/src/master/master_avail.c | 2 +-
external/ibm-public/postfix/dist/src/master/master_ent.c | 2 +-
external/ibm-public/postfix/dist/src/master/master_monitor.c | 2 +-
external/ibm-public/postfix/dist/src/master/master_proto.c | 2 +-
external/ibm-public/postfix/dist/src/master/master_sig.c | 2 +-
external/ibm-public/postfix/dist/src/master/master_spawn.c | 2 +-
external/ibm-public/postfix/dist/src/master/master_status.c | 2 +-
external/ibm-public/postfix/dist/src/master/master_vars.c | 2 +-
external/ibm-public/postfix/dist/src/master/master_wakeup.c | 2 +-
external/ibm-public/postfix/dist/src/master/multi_server.c | 2 +-
external/ibm-public/postfix/dist/src/master/single_server.c | 2 +-
external/ibm-public/postfix/dist/src/master/trigger_server.c | 2 +-
external/ibm-public/postfix/dist/src/milter/milter.c | 2 +-
external/ibm-public/postfix/dist/src/milter/milter.h | 2 +-
external/ibm-public/postfix/dist/src/milter/milter8.c | 2 +-
external/ibm-public/postfix/dist/src/milter/milter_macros.c | 2 +-
external/ibm-public/postfix/dist/src/milter/test-milter.c | 2 +-
external/ibm-public/postfix/dist/src/oqmgr/qmgr.c | 2 +-
external/ibm-public/postfix/dist/src/oqmgr/qmgr.h | 2 +-
external/ibm-public/postfix/dist/src/oqmgr/qmgr_active.c | 2 +-
external/ibm-public/postfix/dist/src/oqmgr/qmgr_deliver.c | 2 +-
external/ibm-public/postfix/dist/src/oqmgr/qmgr_entry.c | 2 +-
external/ibm-public/postfix/dist/src/oqmgr/qmgr_message.c | 2 +-
external/ibm-public/postfix/dist/src/oqmgr/qmgr_queue.c | 2 +-
external/ibm-public/postfix/dist/src/oqmgr/qmgr_transport.c | 2 +-
external/ibm-public/postfix/dist/src/pickup/pickup.c | 2 +-
external/ibm-public/postfix/dist/src/pipe/pipe.c | 2 +-
external/ibm-public/postfix/dist/src/postalias/postalias.c | 2 +-
external/ibm-public/postfix/dist/src/postcat/postcat.c | 2 +-
external/ibm-public/postfix/dist/src/postconf/postconf.c | 2 +-
external/ibm-public/postfix/dist/src/postconf/postconf.h | 2 +-
external/ibm-public/postfix/dist/src/postconf/postconf_builtin.c | 2 +-
external/ibm-public/postfix/dist/src/postconf/postconf_dbms.c | 2 +-
external/ibm-public/postfix/dist/src/postconf/postconf_edit.c | 2 +-
external/ibm-public/postfix/dist/src/postconf/postconf_lookup.c | 2 +-
external/ibm-public/postfix/dist/src/postconf/postconf_main.c | 2 +-
external/ibm-public/postfix/dist/src/postconf/postconf_master.c | 147 +-
external/ibm-public/postfix/dist/src/postconf/postconf_misc.c | 2 +-
external/ibm-public/postfix/dist/src/postconf/postconf_node.c | 2 +-
external/ibm-public/postfix/dist/src/postconf/postconf_other.c | 2 +-
external/ibm-public/postfix/dist/src/postconf/postconf_service.c | 2 +-
external/ibm-public/postfix/dist/src/postconf/postconf_user.c | 2 +-
external/ibm-public/postfix/dist/src/postdrop/postdrop.c | 2 +-
external/ibm-public/postfix/dist/src/postfix/postfix.c | 2 +-
external/ibm-public/postfix/dist/src/postkick/postkick.c | 2 +-
external/ibm-public/postfix/dist/src/postlock/postlock.c | 2 +-
external/ibm-public/postfix/dist/src/postlog/postlog.c | 2 +-
external/ibm-public/postfix/dist/src/postmap/postmap.c | 2 +-
external/ibm-public/postfix/dist/src/postmulti/postmulti.c | 2 +-
external/ibm-public/postfix/dist/src/postqueue/postqueue.c | 2 +-
external/ibm-public/postfix/dist/src/postqueue/postqueue.h | 2 +-
external/ibm-public/postfix/dist/src/postqueue/showq_compat.c | 2 +-
external/ibm-public/postfix/dist/src/postqueue/showq_json.c | 2 +-
external/ibm-public/postfix/dist/src/postscreen/postscreen.c | 2 +-
external/ibm-public/postfix/dist/src/postscreen/postscreen.h | 2 +-
external/ibm-public/postfix/dist/src/postscreen/postscreen_dnsbl.c | 2 +-
external/ibm-public/postfix/dist/src/postscreen/postscreen_early.c | 2 +-
external/ibm-public/postfix/dist/src/postscreen/postscreen_endpt.c | 2 +-
external/ibm-public/postfix/dist/src/postscreen/postscreen_expand.c | 2 +-
external/ibm-public/postfix/dist/src/postscreen/postscreen_haproxy.c | 2 +-
external/ibm-public/postfix/dist/src/postscreen/postscreen_misc.c | 2 +-
external/ibm-public/postfix/dist/src/postscreen/postscreen_send.c | 2 +-
external/ibm-public/postfix/dist/src/postscreen/postscreen_smtpd.c | 2 +-
external/ibm-public/postfix/dist/src/postscreen/postscreen_starttls.c | 2 +-
external/ibm-public/postfix/dist/src/postscreen/postscreen_state.c | 2 +-
external/ibm-public/postfix/dist/src/postscreen/postscreen_tests.c | 2 +-
external/ibm-public/postfix/dist/src/postsuper/postsuper.c | 2 +-
external/ibm-public/postfix/dist/src/posttls-finger/posttls-finger.c | 2 +-
external/ibm-public/postfix/dist/src/posttls-finger/tlsmgrmem.c | 2 +-
external/ibm-public/postfix/dist/src/proxymap/proxymap.c | 2 +-
external/ibm-public/postfix/dist/src/qmgr/qmgr.c | 2 +-
external/ibm-public/postfix/dist/src/qmgr/qmgr.h | 2 +-
external/ibm-public/postfix/dist/src/qmgr/qmgr_active.c | 2 +-
external/ibm-public/postfix/dist/src/qmgr/qmgr_deliver.c | 2 +-
external/ibm-public/postfix/dist/src/qmgr/qmgr_entry.c | 2 +-
external/ibm-public/postfix/dist/src/qmgr/qmgr_job.c | 2 +-
external/ibm-public/postfix/dist/src/qmgr/qmgr_message.c | 2 +-
external/ibm-public/postfix/dist/src/qmgr/qmgr_peer.c | 2 +-
external/ibm-public/postfix/dist/src/qmgr/qmgr_queue.c | 2 +-
external/ibm-public/postfix/dist/src/qmgr/qmgr_transport.c | 2 +-
external/ibm-public/postfix/dist/src/qmqpd/qmqpd.c | 2 +-
external/ibm-public/postfix/dist/src/qmqpd/qmqpd_peer.c | 2 +-
external/ibm-public/postfix/dist/src/qmqpd/qmqpd_state.c | 2 +-
external/ibm-public/postfix/dist/src/scache/scache.c | 2 +-
external/ibm-public/postfix/dist/src/sendmail/sendmail.c | 2 +-
external/ibm-public/postfix/dist/src/showq/showq.c | 2 +-
external/ibm-public/postfix/dist/src/smtp/lmtp_params.c | 2 +-
external/ibm-public/postfix/dist/src/smtp/smtp.c | 197 +-
external/ibm-public/postfix/dist/src/smtp/smtp.h | 2 +-
external/ibm-public/postfix/dist/src/smtp/smtp_addr.c | 2 +-
external/ibm-public/postfix/dist/src/smtp/smtp_addr.h | 2 +-
external/ibm-public/postfix/dist/src/smtp/smtp_chat.c | 2 +-
external/ibm-public/postfix/dist/src/smtp/smtp_connect.c | 2 +-
external/ibm-public/postfix/dist/src/smtp/smtp_key.c | 2 +-
external/ibm-public/postfix/dist/src/smtp/smtp_map11.c | 2 +-
external/ibm-public/postfix/dist/src/smtp/smtp_params.c | 2 +-
external/ibm-public/postfix/dist/src/smtp/smtp_proto.c | 2 +-
external/ibm-public/postfix/dist/src/smtp/smtp_rcpt.c | 2 +-
external/ibm-public/postfix/dist/src/smtp/smtp_reuse.c | 2 +-
external/ibm-public/postfix/dist/src/smtp/smtp_sasl_auth_cache.c | 2 +-
external/ibm-public/postfix/dist/src/smtp/smtp_sasl_glue.c | 2 +-
external/ibm-public/postfix/dist/src/smtp/smtp_sasl_proto.c | 2 +-
external/ibm-public/postfix/dist/src/smtp/smtp_session.c | 2 +-
external/ibm-public/postfix/dist/src/smtp/smtp_state.c | 2 +-
external/ibm-public/postfix/dist/src/smtp/smtp_tls_policy.c | 2 +-
external/ibm-public/postfix/dist/src/smtp/smtp_trouble.c | 2 +-
external/ibm-public/postfix/dist/src/smtpd/smtpd.c | 563 +-
external/ibm-public/postfix/dist/src/smtpd/smtpd.h | 2 +-
external/ibm-public/postfix/dist/src/smtpd/smtpd_chat.c | 2 +-
external/ibm-public/postfix/dist/src/smtpd/smtpd_chat.h | 2 +-
external/ibm-public/postfix/dist/src/smtpd/smtpd_check.c | 2 +-
external/ibm-public/postfix/dist/src/smtpd/smtpd_check.h | 2 +-
external/ibm-public/postfix/dist/src/smtpd/smtpd_expand.c | 2 +-
external/ibm-public/postfix/dist/src/smtpd/smtpd_expand.h | 2 +-
external/ibm-public/postfix/dist/src/smtpd/smtpd_haproxy.c | 2 +-
external/ibm-public/postfix/dist/src/smtpd/smtpd_milter.c | 2 +-
external/ibm-public/postfix/dist/src/smtpd/smtpd_peer.c | 2 +-
external/ibm-public/postfix/dist/src/smtpd/smtpd_proxy.c | 2 +-
external/ibm-public/postfix/dist/src/smtpd/smtpd_resolve.c | 2 +-
external/ibm-public/postfix/dist/src/smtpd/smtpd_resolve.h | 2 +-
external/ibm-public/postfix/dist/src/smtpd/smtpd_sasl_glue.c | 2 +-
external/ibm-public/postfix/dist/src/smtpd/smtpd_sasl_proto.c | 2 +-
external/ibm-public/postfix/dist/src/smtpd/smtpd_sasl_proto.h | 2 +-
external/ibm-public/postfix/dist/src/smtpd/smtpd_token.c | 2 +-
external/ibm-public/postfix/dist/src/smtpstone/qmqp-sink.c | 2 +-
external/ibm-public/postfix/dist/src/smtpstone/qmqp-source.c | 2 +-
external/ibm-public/postfix/dist/src/smtpstone/smtp-sink.c | 2 +-
external/ibm-public/postfix/dist/src/smtpstone/smtp-source.c | 2 +-
external/ibm-public/postfix/dist/src/spawn/spawn.c | 2 +-
external/ibm-public/postfix/dist/src/tls/tls.h | 2 +-
external/ibm-public/postfix/dist/src/tls/tls_certkey.c | 2 +-
external/ibm-public/postfix/dist/src/tls/tls_client.c | 126 +-
external/ibm-public/postfix/dist/src/tls/tls_dane.c | 2 +-
external/ibm-public/postfix/dist/src/tls/tls_dh.c | 2 +-
external/ibm-public/postfix/dist/src/tls/tls_fprint.c | 2 +-
external/ibm-public/postfix/dist/src/tls/tls_level.c | 2 +-
external/ibm-public/postfix/dist/src/tls/tls_mgr.c | 2 +-
external/ibm-public/postfix/dist/src/tls/tls_misc.c | 2 +-
external/ibm-public/postfix/dist/src/tls/tls_prng_dev.c | 2 +-
external/ibm-public/postfix/dist/src/tls/tls_prng_egd.c | 2 +-
external/ibm-public/postfix/dist/src/tls/tls_prng_exch.c | 2 +-
external/ibm-public/postfix/dist/src/tls/tls_prng_file.c | 2 +-
external/ibm-public/postfix/dist/src/tls/tls_proxy_clnt.c | 2 +-
external/ibm-public/postfix/dist/src/tls/tls_proxy_print.c | 2 +-
external/ibm-public/postfix/dist/src/tls/tls_proxy_scan.c | 2 +-
external/ibm-public/postfix/dist/src/tls/tls_rsa.c | 2 +-
external/ibm-public/postfix/dist/src/tls/tls_scache.c | 2 +-
external/ibm-public/postfix/dist/src/tls/tls_scache.h | 2 +-
external/ibm-public/postfix/dist/src/tls/tls_server.c | 118 +-
external/ibm-public/postfix/dist/src/tls/tls_stream.c | 2 +-
external/ibm-public/postfix/dist/src/tls/tls_verify.c | 2 +-
external/ibm-public/postfix/dist/src/tlsmgr/tlsmgr.c | 2 +-
external/ibm-public/postfix/dist/src/tlsproxy/tlsproxy.c | 2 +-
external/ibm-public/postfix/dist/src/tlsproxy/tlsproxy_state.c | 2 +-
external/ibm-public/postfix/dist/src/trivial-rewrite/resolve.c | 2 +-
external/ibm-public/postfix/dist/src/trivial-rewrite/rewrite.c | 2 +-
external/ibm-public/postfix/dist/src/trivial-rewrite/transport.c | 2 +-
external/ibm-public/postfix/dist/src/trivial-rewrite/trivial-rewrite.c | 2 +-
external/ibm-public/postfix/dist/src/trivial-rewrite/trivial-rewrite.h | 2 +-
external/ibm-public/postfix/dist/src/util/allascii.c | 2 +-
external/ibm-public/postfix/dist/src/util/argv.c | 2 +-
external/ibm-public/postfix/dist/src/util/argv.h | 2 +-
external/ibm-public/postfix/dist/src/util/argv_splitq.c | 2 +-
external/ibm-public/postfix/dist/src/util/attr.h | 2 +-
external/ibm-public/postfix/dist/src/util/attr_clnt.c | 2 +-
external/ibm-public/postfix/dist/src/util/attr_clnt.h | 2 +-
external/ibm-public/postfix/dist/src/util/attr_print0.c | 2 +-
external/ibm-public/postfix/dist/src/util/attr_print64.c | 2 +-
external/ibm-public/postfix/dist/src/util/attr_print_plain.c | 2 +-
external/ibm-public/postfix/dist/src/util/attr_scan0.c | 2 +-
external/ibm-public/postfix/dist/src/util/attr_scan64.c | 2 +-
external/ibm-public/postfix/dist/src/util/attr_scan_plain.c | 2 +-
external/ibm-public/postfix/dist/src/util/auto_clnt.c | 2 +-
external/ibm-public/postfix/dist/src/util/balpar.c | 2 +-
external/ibm-public/postfix/dist/src/util/base32_code.c | 2 +-
external/ibm-public/postfix/dist/src/util/base32_code.h | 2 +-
external/ibm-public/postfix/dist/src/util/base64_code.c | 2 +-
external/ibm-public/postfix/dist/src/util/base64_code.h | 2 +-
external/ibm-public/postfix/dist/src/util/binhash.c | 2 +-
external/ibm-public/postfix/dist/src/util/binhash.h | 2 +-
external/ibm-public/postfix/dist/src/util/casefold.c | 2 +-
external/ibm-public/postfix/dist/src/util/check_arg.h | 2 +-
external/ibm-public/postfix/dist/src/util/cidr_match.c | 2 +-
external/ibm-public/postfix/dist/src/util/ctable.c | 2 +-
external/ibm-public/postfix/dist/src/util/ctable.h | 2 +-
external/ibm-public/postfix/dist/src/util/dict.c | 2 +-
external/ibm-public/postfix/dist/src/util/dict.h | 2 +-
external/ibm-public/postfix/dist/src/util/dict_alloc.c | 2 +-
external/ibm-public/postfix/dist/src/util/dict_cache.c | 2 +-
external/ibm-public/postfix/dist/src/util/dict_cache.h | 2 +-
external/ibm-public/postfix/dist/src/util/dict_cdb.c | 2 +-
external/ibm-public/postfix/dist/src/util/dict_cidr.c | 2 +-
external/ibm-public/postfix/dist/src/util/dict_db.c | 2 +-
external/ibm-public/postfix/dist/src/util/dict_db.h | 2 +-
external/ibm-public/postfix/dist/src/util/dict_dbm.c | 2 +-
external/ibm-public/postfix/dist/src/util/dict_debug.c | 2 +-
external/ibm-public/postfix/dist/src/util/dict_ht.c | 2 +-
external/ibm-public/postfix/dist/src/util/dict_inline.c | 2 +-
external/ibm-public/postfix/dist/src/util/dict_inline.h | 2 +-
external/ibm-public/postfix/dist/src/util/dict_lmdb.c | 2 +-
external/ibm-public/postfix/dist/src/util/dict_lmdb.h | 2 +-
external/ibm-public/postfix/dist/src/util/dict_open.c | 2 +-
external/ibm-public/postfix/dist/src/util/dict_pcre.c | 2 +-
external/ibm-public/postfix/dist/src/util/dict_pipe.c | 2 +-
external/ibm-public/postfix/dist/src/util/dict_pipe.h | 2 +-
external/ibm-public/postfix/dist/src/util/dict_random.c | 2 +-
external/ibm-public/postfix/dist/src/util/dict_random.h | 2 +-
external/ibm-public/postfix/dist/src/util/dict_regexp.c | 2 +-
external/ibm-public/postfix/dist/src/util/dict_sockmap.c | 18 +-
external/ibm-public/postfix/dist/src/util/dict_static.c | 2 +-
external/ibm-public/postfix/dist/src/util/dict_surrogate.c | 2 +-
external/ibm-public/postfix/dist/src/util/dict_tcp.c | 2 +-
external/ibm-public/postfix/dist/src/util/dict_test.c | 2 +-
external/ibm-public/postfix/dist/src/util/dict_thash.c | 2 +-
external/ibm-public/postfix/dist/src/util/dict_union.c | 2 +-
external/ibm-public/postfix/dist/src/util/dict_union.h | 2 +-
external/ibm-public/postfix/dist/src/util/dict_utf8.c | 2 +-
external/ibm-public/postfix/dist/src/util/edit_file.c | 2 +-
external/ibm-public/postfix/dist/src/util/edit_file.h | 2 +-
external/ibm-public/postfix/dist/src/util/events.c | 2 +-
external/ibm-public/postfix/dist/src/util/events.h | 2 +-
external/ibm-public/postfix/dist/src/util/extpar.c | 2 +-
external/ibm-public/postfix/dist/src/util/fifo_trigger.c | 2 +-
external/ibm-public/postfix/dist/src/util/find_inet.c | 2 +-
external/ibm-public/postfix/dist/src/util/format_tv.c | 2 +-
external/ibm-public/postfix/dist/src/util/format_tv.h | 2 +-
external/ibm-public/postfix/dist/src/util/hex_code.c | 2 +-
external/ibm-public/postfix/dist/src/util/hex_code.h | 2 +-
external/ibm-public/postfix/dist/src/util/host_port.c | 2 +-
external/ibm-public/postfix/dist/src/util/host_port.h | 2 +-
external/ibm-public/postfix/dist/src/util/htable.c | 2 +-
external/ibm-public/postfix/dist/src/util/htable.h | 2 +-
external/ibm-public/postfix/dist/src/util/inet_addr_host.c | 2 +-
external/ibm-public/postfix/dist/src/util/inet_addr_list.c | 2 +-
external/ibm-public/postfix/dist/src/util/inet_addr_local.c | 28 +-
external/ibm-public/postfix/dist/src/util/inet_listen.c | 2 +-
external/ibm-public/postfix/dist/src/util/inet_proto.c | 2 +-
external/ibm-public/postfix/dist/src/util/inet_trigger.c | 2 +-
external/ibm-public/postfix/dist/src/util/inet_windowsize.c | 2 +-
external/ibm-public/postfix/dist/src/util/iostuff.h | 2 +-
external/ibm-public/postfix/dist/src/util/line_number.c | 2 +-
external/ibm-public/postfix/dist/src/util/line_wrap.c | 2 +-
external/ibm-public/postfix/dist/src/util/line_wrap.h | 2 +-
external/ibm-public/postfix/dist/src/util/listen.h | 2 +-
external/ibm-public/postfix/dist/src/util/load_lib.c | 2 +-
external/ibm-public/postfix/dist/src/util/load_lib.h | 2 +-
external/ibm-public/postfix/dist/src/util/lstat_as.h | 2 +-
external/ibm-public/postfix/dist/src/util/mac_expand.c | 2 +-
external/ibm-public/postfix/dist/src/util/mac_expand.h | 2 +-
external/ibm-public/postfix/dist/src/util/mac_parse.c | 2 +-
external/ibm-public/postfix/dist/src/util/mac_parse.h | 2 +-
external/ibm-public/postfix/dist/src/util/mask_addr.c | 2 +-
external/ibm-public/postfix/dist/src/util/match_list.c | 2 +-
external/ibm-public/postfix/dist/src/util/match_list.h | 2 +-
external/ibm-public/postfix/dist/src/util/match_ops.c | 2 +-
external/ibm-public/postfix/dist/src/util/midna_domain.c | 2 +-
external/ibm-public/postfix/dist/src/util/midna_domain.h | 2 +-
external/ibm-public/postfix/dist/src/util/msg.h | 2 +-
external/ibm-public/postfix/dist/src/util/msg_output.c | 2 +-
external/ibm-public/postfix/dist/src/util/msg_output.h | 2 +-
external/ibm-public/postfix/dist/src/util/msg_syslog.h | 2 +-
external/ibm-public/postfix/dist/src/util/msg_vstream.h | 2 +-
external/ibm-public/postfix/dist/src/util/mvect.c | 2 +-
external/ibm-public/postfix/dist/src/util/mvect.h | 2 +-
external/ibm-public/postfix/dist/src/util/myaddrinfo.c | 2 +-
external/ibm-public/postfix/dist/src/util/myaddrinfo.h | 2 +-
external/ibm-public/postfix/dist/src/util/myflock.c | 2 +-
external/ibm-public/postfix/dist/src/util/myflock.h | 2 +-
external/ibm-public/postfix/dist/src/util/mymalloc.c | 2 +-
external/ibm-public/postfix/dist/src/util/mymalloc.h | 2 +-
external/ibm-public/postfix/dist/src/util/mystrtok.c | 2 +-
external/ibm-public/postfix/dist/src/util/name_code.c | 2 +-
external/ibm-public/postfix/dist/src/util/name_mask.c | 2 +-
external/ibm-public/postfix/dist/src/util/nbbio.c | 2 +-
external/ibm-public/postfix/dist/src/util/nbbio.h | 2 +-
external/ibm-public/postfix/dist/src/util/netstring.c | 2 +-
external/ibm-public/postfix/dist/src/util/nvtable.c | 2 +-
external/ibm-public/postfix/dist/src/util/nvtable.h | 2 +-
external/ibm-public/postfix/dist/src/util/pass_trigger.c | 2 +-
external/ibm-public/postfix/dist/src/util/peekfd.c | 2 +-
external/ibm-public/postfix/dist/src/util/printable.c | 2 +-
external/ibm-public/postfix/dist/src/util/readlline.c | 2 +-
external/ibm-public/postfix/dist/src/util/readlline.h | 2 +-
external/ibm-public/postfix/dist/src/util/recv_pass_attr.c | 2 +-
external/ibm-public/postfix/dist/src/util/sane_accept.c | 2 +-
external/ibm-public/postfix/dist/src/util/sane_connect.c | 2 +-
external/ibm-public/postfix/dist/src/util/sane_fsops.h | 2 +-
external/ibm-public/postfix/dist/src/util/sane_socketpair.h | 2 +-
external/ibm-public/postfix/dist/src/util/sane_time.c | 2 +-
external/ibm-public/postfix/dist/src/util/scan_dir.c | 2 +-
external/ibm-public/postfix/dist/src/util/slmdb.c | 2 +-
external/ibm-public/postfix/dist/src/util/slmdb.h | 2 +-
external/ibm-public/postfix/dist/src/util/sock_addr.c | 2 +-
external/ibm-public/postfix/dist/src/util/spawn_command.c | 2 +-
external/ibm-public/postfix/dist/src/util/spawn_command.h | 2 +-
external/ibm-public/postfix/dist/src/util/stat_as.h | 2 +-
external/ibm-public/postfix/dist/src/util/strcasecmp_utf8.c | 2 +-
external/ibm-public/postfix/dist/src/util/stream_trigger.c | 2 +-
external/ibm-public/postfix/dist/src/util/stringops.h | 2 +-
external/ibm-public/postfix/dist/src/util/sys_compat.c | 2 +-
external/ibm-public/postfix/dist/src/util/sys_defs.h | 237 +-
external/ibm-public/postfix/dist/src/util/timecmp.c | 2 +-
external/ibm-public/postfix/dist/src/util/timed_connect.c | 2 +-
external/ibm-public/postfix/dist/src/util/timed_wait.h | 2 +-
external/ibm-public/postfix/dist/src/util/timed_write.c | 2 +-
external/ibm-public/postfix/dist/src/util/trimblanks.c | 2 +-
external/ibm-public/postfix/dist/src/util/unescape.c | 2 +-
external/ibm-public/postfix/dist/src/util/unix_connect.c | 2 +-
external/ibm-public/postfix/dist/src/util/unix_listen.c | 2 +-
external/ibm-public/postfix/dist/src/util/unix_recv_fd.c | 4 +-
external/ibm-public/postfix/dist/src/util/unix_send_fd.c | 4 +-
external/ibm-public/postfix/dist/src/util/unix_trigger.c | 2 +-
external/ibm-public/postfix/dist/src/util/valid_hostname.c | 2 +-
external/ibm-public/postfix/dist/src/util/valid_utf8_hostname.c | 2 +-
external/ibm-public/postfix/dist/src/util/valid_utf8_hostname.h | 2 +-
external/ibm-public/postfix/dist/src/util/valid_utf8_string.c | 2 +-
external/ibm-public/postfix/dist/src/util/valid_utf_8.c | 141 -
external/ibm-public/postfix/dist/src/util/vbuf.c | 2 +-
external/ibm-public/postfix/dist/src/util/vbuf.h | 2 +-
external/ibm-public/postfix/dist/src/util/vbuf_print.c | 2 +-
external/ibm-public/postfix/dist/src/util/vstream.c | 2 +-
external/ibm-public/postfix/dist/src/util/vstream.h | 2 +-
external/ibm-public/postfix/dist/src/util/vstream_popen.c | 2 +-
external/ibm-public/postfix/dist/src/util/vstream_tweak.c | 2 +-
external/ibm-public/postfix/dist/src/util/vstring.c | 2 +-
external/ibm-public/postfix/dist/src/util/vstring.h | 2 +-
external/ibm-public/postfix/dist/src/util/vstring_vstream.h | 2 +-
external/ibm-public/postfix/dist/src/util/watchdog.c | 2 +-
external/ibm-public/postfix/dist/src/verify/verify.c | 2 +-
external/ibm-public/postfix/dist/src/virtual/mailbox.c | 2 +-
external/ibm-public/postfix/dist/src/virtual/recipient.c | 2 +-
external/ibm-public/postfix/dist/src/virtual/virtual.c | 2 +-
external/ibm-public/postfix/dist/src/xsasl/xsasl.h | 2 +-
external/ibm-public/postfix/dist/src/xsasl/xsasl_cyrus_client.c | 2 +-
external/ibm-public/postfix/dist/src/xsasl/xsasl_cyrus_server.c | 2 +-
external/ibm-public/postfix/dist/src/xsasl/xsasl_dovecot_server.c | 2 +-
external/ibm-public/postfix/lib/dns/Makefile | 5 +-
external/ibm-public/postfix/lib/global/Makefile | 5 +-
external/ibm-public/postfix/lib/util/Makefile | 14 +-
external/ibm-public/postfix/sbin/postconf/Makefile | 6 +-
external/ibm-public/postfix/sbin/postqueue/Makefile | 3 +-
630 files changed, 10142 insertions(+), 2886 deletions(-)
diffs (truncated from 27658 to 300 lines):
diff -r d12253f1276c -r ef51e2e34953 external/ibm-public/postfix/Makefile.inc
--- a/external/ibm-public/postfix/Makefile.inc Tue Feb 14 01:13:32 2017 +0000
+++ b/external/ibm-public/postfix/Makefile.inc Tue Feb 14 01:16:43 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.17 2014/07/05 19:22:42 dholland Exp $
+# $NetBSD: Makefile.inc,v 1.18 2017/02/14 01:16:43 christos Exp $
.include <bsd.own.mk>
@@ -9,7 +9,7 @@
PFIX_DISTDIR= ${NETBSDSRCDIR}/external/ibm-public/postfix/dist
-CPPFLAGS+= -DNETBSD4 -DUSE_SASL_AUTH \
+CPPFLAGS+= -DNETBSD4 -DUSE_SASL_AUTH -DNO_EAI \
-I${DIST} \
-I${PFIX_DISTDIR}/src/dns -I${PFIX_DISTDIR}/src/global \
-I${PFIX_DISTDIR}/src/master -I${PFIX_DISTDIR}/src/util \
diff -r d12253f1276c -r ef51e2e34953 external/ibm-public/postfix/dist/README_FILES/ADDRESS_VERIFICATION_README
--- a/external/ibm-public/postfix/dist/README_FILES/ADDRESS_VERIFICATION_README Tue Feb 14 01:13:32 2017 +0000
+++ b/external/ibm-public/postfix/dist/README_FILES/ADDRESS_VERIFICATION_README Tue Feb 14 01:16:43 2017 +0000
@@ -41,11 +41,11 @@
HHooww aaddddrreessss vveerriiffiiccaattiioonn wwoorrkkss
-A Postfix MTA verifies a sender or recipient address by probing the nearest MTA
-for that address, without actually delivering mail. The nearest MTA could be
-the Postfix MTA itself, or it could be a remote MTA (SMTP interruptus). Probe
-messages are like normal mail, except that they are never delivered, deferred
-or bounced; probe messages are always discarded.
+A Postfix MTA verifies a sender or recipient address by probing the preferred
+MTAs for that address, without actually delivering mail. The preferred MTAs
+could include the Postfix MTA itself, or some remote MTAs (SMTP interruptus).
+Probe messages are like normal mail, except that they are never delivered,
+deferred or bounced; probe messages are always discarded.
probe Postfix
@@ -81,12 +81,16 @@
LLiimmiittaattiioonnss ooff aaddddrreessss vveerriiffiiccaattiioonn
- * When verifying a remote address, Postfix probes the nearest MTA for that
- address, without actually delivering mail to it. If the nearest MTA accepts
- the address, then Postfix assumes that the address is deliverable. In
- reality, mail for a remote address can bounce AFTER the nearest MTA accepts
- the recipient address, or AFTER the nearest MTA accepts the message
- content.
+ * Postfix assumes that a remote SMTP server will reject unknown addresses in
+ reply to the RCPT TO command. However, some sites report this in reply to
+ the DATA command. For such sites you may configure a workaround with the
+ smtp_address_verify_target parameter (Postfix 3.0 and later).
+
+ * When verifying a remote address, Postfix probes the preferred MTAs for that
+ address, without actually delivering mail. If a preferred MTA accepts the
+ address, then Postfix assumes that the address is deliverable. In reality,
+ mail for a remote address can bounce AFTER a preferred MTA accepts the
+ recipient address, or AFTER a preferred MTA accepts the message content.
* Some sites may blacklist you when you are probing them too often (a probe
is an SMTP session that does not deliver mail), or when you are probing
@@ -101,17 +105,17 @@
to override mail routing and for possible limitations when you have to do
this.
- * Postfix assumes that an address is undeliverable when the nearest MTA for
+ * Postfix assumes that an address is undeliverable when a preferred MTA for
the address rejects the probe, regardless of the reason for rejection
(client rejected, HELO rejected, MAIL FROM rejected, etc.). Thus, Postfix
- rejects an address when the nearest MTA for that address rejects mail from
+ rejects an address when a preferred MTA for that address rejects mail from
your machine for any reason. This is not a limitation, but it is mentioned
here just in case people believe that it is a limitation.
* Unfortunately, some sites do not reject unknown addresses in reply to the
- RCPT TO command, but report a delivery failure in response to end of DATA
- after a message is transferred. Postfix address verification does not work
- with such sites.
+ RCPT TO or DATA command, but instead report a delivery failure in response
+ to end of DATA after a message is transferred. Postfix address verification
+ does not work with such sites.
* By default, Postfix probe messages have a sender address "double-
bounce@$myorigin" (with Postfix versions before 2.5, the default is
@@ -200,8 +204,8 @@
# Default setting for Postfix 2.7 and later.
# Note 1: Be sure to read the "Caching" section below!
- # Note 2: Avoid hash files here. Use btree instead.
- address_verify_map = btree:/var/db/postfix/verify
+ # Note 2: Avoid hash files here. Use btree or lmdb instead.
+ address_verify_map = btree:/var/lib/postfix/verify
/etc/postfix/sender_access:
# Don't do this when you handle lots of email.
@@ -241,8 +245,8 @@
# Default setting for Postfix 2.7 and later.
# Note 1: Be sure to read the "Caching" section below!
- # Note 2: Avoid hash files here. Use btree instead.
- address_verify_map = btree:/var/db/postfix/verify
+ # Note 2: Avoid hash files here. Use btree or lmdb instead.
+ address_verify_map = btree:/var/lib/postfix/verify
This is also a good way to populate your cache with address verification
results before you start to actually reject mail.
@@ -293,7 +297,7 @@
results are lost after "postfix reload" or "postfix stop".
# Example 1: Default setting for Postfix 2.7 and later.
- # Note: avoid hash files here. Use btree instead.
+ # Note: avoid hash files here. Use btree or lmdb instead.
/etc/postfix/main.cf:
address_verify_map = btree:$data_directory/verify_cache
diff -r d12253f1276c -r ef51e2e34953 external/ibm-public/postfix/dist/README_FILES/INSTALL
--- a/external/ibm-public/postfix/dist/README_FILES/INSTALL Tue Feb 14 01:13:32 2017 +0000
+++ b/external/ibm-public/postfix/dist/README_FILES/INSTALL Tue Feb 14 01:16:43 2017 +0000
@@ -76,41 +76,39 @@
44 -- BBuuiillddiinngg oonn aa ssuuppppoorrtteedd ssyysstteemm
-At some point in time, a version of Postfix was supported on:
+Postfix development happens on FreeBSD and MacOS X, with regular tests on Linux
+(Fedora, Ubuntu) and Solaris. Support for other systems relies on feedback from
+their users, and may not always be up-to-date.
+
+OpenBSD is partially supported. The libc resolver does not implement the
+documented "internal resolver options which are [...] set by changing fields in
+the _res structure" (documented in the OpenBSD 5.6 resolver(3) manpage). This
+results in too many DNS queries, and false positives for queries that should
+fail.
+
+Overview of topics:
- AIX 3.2.5, 4.1.x, 4.2.0, 4.3.x, 5.2
- BSD/OS 2.x, 3.x, 4.x
- FreeBSD 2.x .. 9.x
- HP-UX 9.x, 10.x, 11.x
- IRIX 5.x, 6.x
- Linux Debian 1.3.1 and later
- Linux RedHat 3.x (January 2004) and later
- Linux Slackware 3.x and later
- Linux SuSE 5.x and later
- Linux Ubuntu 4.10 and later
- Mac OS X
- NEXTSTEP 3.x
- NetBSD 1.x and later
- OPENSTEP 4.x
- OSF1.V3 - OSF1.V5 (Digital UNIX)
- Reliant UNIX 5.x
- SunOS 4.1.4 (March 2007)
- SunOS 5.4 - 5.10 (Solaris 2.4..10)
- Ultrix 4.x (well, that was long ago)
-
-or something closely resemblant.
+ * 4.1 - Getting started
+ * 4.2 - What compiler to use
+ * 4.3 - Building with Postfix position-independent executables (Postfix >=
+ 3.0)
+ * 4.4 - Building with Postfix dynamically-linked libraries and database
+ plugins (Postfix >= 3.0)
+ * 4.5 - Building with optional features
+ * 4.6 - Overriding built-in parameter default settings
+ * 4.7 - Overriding other compile-time features
+ * 4.8 - Support for thousands of processes
+ * 4.9 - Compiling Postfix, at last
44..11 -- GGeettttiinngg ssttaarrtteedd
-On Solaris, the "make" command and other utilities for software development are
-in /usr/ccs/bin, so you MUST have /usr/ccs/bin in your command search path. If
-these files do not exist, install the development packages first. See the
-Solaris FAQ item "Which packages do I need to install to support a C
-compiler?".
+On Solaris, the "make" command and other development utilities are in /usr/ccs/
+bin, so you MUST have /usr/ccs/bin in your command search path. If these files
+do not exist, you need to install the development packages first.
-If you need to build Postfix for multiple architectures, use the "lndir"
-command to build a shadow tree with symbolic links to the source files. "lndir"
-is part of X11R6.
+If you need to build Postfix for multiple architectures from a single source-
+code tree, use the "lndir" command to build a shadow tree with symbolic links
+to the source files.
If at any time in the build process you get messages like: "make: don't know
how to ..." you should be able to recover by running the following command from
@@ -146,9 +144,232 @@
$ make makefiles CC="purify cc"
$ make
-and so on. In some cases, optimization is turned off automatically.
+and so on. In some cases, optimization will be turned off automatically.
+
+44..33 -- BBuuiillddiinngg wwiitthh PPoossttffiixx ppoossiittiioonn--iinnddeeppeennddeenntt eexxeeccuuttaabblleess ((PPoossttffiixx
>>== 33..00))
+
+On some systems Postfix can be built with Position-Independent Executables. PIE
+is used by the ASLR exploit mitigation technique (ASLR = Address-Space Layout
+Randomization):
+
+ $ make makefiles pie=yes ...other arguments...
+
+(Specify "make makefiles pie=no" to explicitly disable Postfix position-
+independent executable support).
+
+Postfix PIE support appears to work on Fedora Core 20, Ubuntu 14.04, FreeBSD 9
+and 10, and NetBSD 6 (all with the default system compilers).
+
+Whether the "pie=yes" above has any effect depends on the compiler. Some
+compilers always produce PIE executables, and some may even complain that the
+Postfix build option is redundant.
+
+44..44 -- BBuuiillddiinngg wwiitthh PPoossttffiixx ddyynnaammiiccaallllyy--lliinnkkeedd lliibbrraarriieess aanndd ddaattaabbaassee
pplluuggiinnss
+((PPoossttffiixx >>== 33..00))
+
+Postfix dynamically-linked library and database plugin support exists for
+recent versions of Linux, FreeBSD and MacOS X. Dynamically-linked library
+builds may become the default at some point in the future.
+
+Overview of topics:
+
+ * 4.4.1 Turning on Postfix dynamically-linked library support
+ * 4.4.2 Turning on Postfix database-plugin support
+ * 4.4.3 Customizing Postfix dynamically-linked libraries and database plugins
+ * 4.4.4 Tips for distribution maintainers
+
+Note: directories with Postfix dynamically-linked libraries or database plugins
+should contain only postfix-related files. Postfix dynamically-linked libraries
+and database plugins should not be installed in a "public" system directory
+such as /usr/lib or /usr/local/lib. Linking Postfix dynamically-linked library
+or database-plugin files into non-Postfix programs is not supported. Postfix
+dynamically-linked libraries and database plugins implement a Postfix-internal
+API that changes without maintaining compatibility.
+
+44..44..11 TTuurrnniinngg oonn PPoossttffiixx ddyynnaammiiccaallllyy--lliinnkkeedd lliibbrraarryy ssuuppppoorrtt
+
+Postfix can be built with Postfix dynamically-linked libraries (files typically
+named libpostfix-*.so). Postfix dynamically-linked libraries add minor run-time
+overhead and result in significantly-smaller Postfix executable files.
+
+Specify "shared=yes" on the "make makefiles" command line to build Postfix with
+dynamically-linked library support.
+
+ $ make makefiles shared=yes ...other arguments...
+ $ make
+
+(Specify "make makefiles shared=no" to explicitly disable Postfix dynamically-
+linked library support).
+
+This installs dynamically-linked libraries in $shlib_directory, typically /usr/
+lib/postfix or /usr/local/lib/postfix, with file names libpostfix-name.so,
+where the name is a source-code directory name such as "util" or "global".
+
+See section 4.4.3 "Customizing Postfix dynamically-linked libraries and
+database plugins" below for how to customize the Postfix dynamically-linked
+library location, including support to upgrade a running mail system safely.
+
+44..44..22 TTuurrnniinngg oonn PPoossttffiixx ddaattaabbaassee--pplluuggiinn ssuuppppoorrtt
+
+Additionally, Postfix can be built to support dynamic loading of Postfix
+database clients (database plugins) with the Debian-style dynamicmaps feature.
+Postfix 3.0 supports dynamic loading of cdb:, ldap:, lmdb:, mysql:, pcre:,
+pgsql:, sdbm:, and sqlite: database clients. Dynamic loading is useful when you
+distribute or install pre-compiled Postfix packages.
+
+Specify "dynamicmaps=yes" on the "make makefiles" command line to build Postfix
+with support to dynamically load Postfix database clients with the Debian-style
+dynamicmaps feature.
+
+ $ make makefiles dynamicmaps=yes ...other arguments...
+ $ make
+
+(Specify "make makefiles dynamicmaps=no" to explicitly disable Postfix
+database-plugin support).
+
+This implicitly enables dynamically-linked library support, installs the
+configuration file dynamicmaps.cf in $meta_directory (usually, /etc/postfix or
+/usr/local/etc/postfix), and installs database plugins in $shlib_directory (see
+above). Database plugins are named postfix-type.so where the type is a database
+type such as "cdb" or "ldap".
+
+ NOTE: The Postfix 3.0 build procedure expects that you specify database
+ library dependencies with variables named AUXLIBS_CDB, AUXLIBS_LDAP, etc.
+ With Postfix 3.0 and later, the old AUXLIBS variable still supports
+ building a statically-loaded database client, but only the new AUXLIBS_CDB
+ etc. variables support building a dynamically-loaded or statically-loaded
+ CDB etc. database client. See CDB_README, LDAP_README, etc. for details.
+
+ Failure to follow this advice will defeat the purpose of dynamic database
+ client loading. Every Postfix executable file will have database library
+ dependencies. And that was exactly what dynamic database client loading was
+ meant to avoid.
+
+See the next section for how to customize the location and version of Postfix
+database plugins and the location of the file dynamicmaps.cf.
+
+44..44..33 CCuussttoommiizziinngg PPoossttffiixx ddyynnaammiiccaallllyy--lliinnkkeedd lliibbrraarriieess aanndd ddaattaabbaassee
pplluuggiinnss
+
+CCuussttoommiizziinngg bbuuiilldd--ttiimmee aanndd rruunn--ttiimmee ooppttiioonnss ffoorr PPoossttffiixx
ddyynnaammiiccaallllyy--lliinnkkeedd
Home |
Main Index |
Thread Index |
Old Index