← Back to branch summary

~ubuntu-branches/ubuntu/vivid/exim4/vivid

~ubuntu-branches/ubuntu/vivid/exim4/vivid

« back to all changes in this revision

Viewing changes to src/routers/dnslookup.h

Committer: Package Import Robot
Author(s): Corey Bryant
Date: 2014-08-04 11:48:39 UTC
mfrom: (56.1.2 utopic)
Revision ID: package-import@ubuntu.com-20140804114839-xoulpcx9nxi5m72u

Tags: 4.84~RC1-3ubuntu1

https://launchpad.net/bugs/1351470

* Merge from Debian unstable (LP: #1351470). Remaining changes:
  - Show Ubuntu distribution on smtp:
    + debian/patches/fix_smtp_banner.patch: updated SMTP banner
      with Ubuntu distribution
    + debian/control: added lsb-release build dependency
  - Don't provide default-mta; in Ubuntu, we want postfix to be the
    default.

files added:
README.DSN

src/tlscert-gnu.c

src/tlscert-openssl.c

util/proxy_protocol_client.pl

files removed:
.pc/75_unbind-ldap-connection.diff

.pc/75_unbind-ldap-connection.diff/src

.pc/75_unbind-ldap-connection.diff/src/lookups

.pc/75_unbind-ldap-connection.diff/src/lookups/ldap.c

.pc/76_fix_ldap_option_setting.diff

.pc/76_fix_ldap_option_setting.diff/src

.pc/76_fix_ldap_option_setting.diff/src/lookups

.pc/76_fix_ldap_option_setting.diff/src/lookups/ldap.c

.pc/77_close-the-server-side-of-TLS.diff

.pc/77_close-the-server-side-of-TLS.diff/src

.pc/77_close-the-server-side-of-TLS.diff/src/daemon.c

.pc/77_close-the-server-side-of-TLS.diff/src/exim.c

.pc/80_fix_ftbfs_hurd.diff

.pc/80_fix_ftbfs_hurd.diff/src

.pc/80_fix_ftbfs_hurd.diff/src/ip.c

.pc/87_double_expansion.diff

.pc/87_double_expansion.diff/src

.pc/87_double_expansion.diff/src/expand.c

debian/patches/75_unbind-ldap-connection.diff

debian/patches/76_fix_ldap_option_setting.diff

debian/patches/77_close-the-server-side-of-TLS.diff

debian/patches/80_fix_ftbfs_hurd.diff

debian/patches/87_double_expansion.diff

files modified:
.gitignore

.pc/31_eximmanpage.dpatch/doc/exim.8

.pc/32_exim4.dpatch/src/exiqgrep.src

.pc/32_exim4.dpatch/src/globals.c

.pc/34_eximstatsmanpage.dpatch/src/eximstats.src

.pc/50_localscan_dlopen.dpatch/src/EDITME

.pc/50_localscan_dlopen.dpatch/src/config.h.defaults

.pc/50_localscan_dlopen.dpatch/src/globals.c

.pc/50_localscan_dlopen.dpatch/src/globals.h

.pc/50_localscan_dlopen.dpatch/src/local_scan.h

.pc/50_localscan_dlopen.dpatch/src/readconf.c

.pc/66_enlarge-dh-parameters-size.dpatch/src/tls-gnu.c

.pc/70_remove_exim-users_references.dpatch/src/eximstats.src

.pc/applied-patches

.pc/fix_smtp_banner.patch/src/config.h.defaults

.pc/fix_smtp_banner.patch/src/exim.h

.pc/fix_smtp_banner.patch/src/globals.c

Makefile

OS/Makefile-Base

OS/os.c-Linux

OS/os.h-Darwin

README.UPDATING

debian/changelog

debian/control

debian/patches/31_eximmanpage.dpatch

debian/patches/50_localscan_dlopen.dpatch

debian/patches/series

debian/rules

doc/ChangeLog

doc/NewStuff

doc/OptionLists.txt

doc/exim.8

doc/experimental-spec.txt

doc/filter.txt

doc/spec.txt

exim_monitor/em_globals.c

exim_monitor/em_log.c

scripts/Configure-Makefile

scripts/MakeLinks

scripts/lookups-Makefile

src/EDITME

src/acl.c

src/auths/dovecot.c

src/config.h.defaults

src/daemon.c

src/deliver.c

src/dkim.c

src/dmarc.c

src/dmarc.h

src/dns.c

src/drtables.c

src/exigrep.src

src/exim.c

src/exim.h

src/exim_lock.c

src/eximstats.src

src/exiqgrep.src

src/expand.c

src/functions.h

src/globals.c

src/globals.h

src/host.c

src/ip.c

src/local_scan.c

src/local_scan.h

src/log.c

src/lookups/dnsdb.c

src/lookups/ldap.c

src/macros.h

src/malware.c

src/match.c

src/mime.c

src/moan.c

src/readconf.c

src/receive.c

src/route.c

src/routers/dnslookup.c

src/routers/dnslookup.h

src/routers/rf_get_munge_headers.c

src/routers/rf_lookup_hostlist.c

src/sieve.c

src/smtp_in.c

src/smtp_out.c

src/spam.c

src/spf.c

src/spool_in.c

src/spool_out.c

src/string.c

src/structs.h

src/tls-gnu.c

src/tls-openssl.c

src/tls.c

src/tod.c

src/transport.c

src/transports/appendfile.c

src/transports/lmtp.c

src/transports/pipe.c

src/transports/pipe.h

src/transports/smtp.c

src/transports/smtp.h

src/verify.c

src/version.sh

Show diffs side-by-side

added added

removed removed

src/routers/dnslookup.h

17

17

uschar *mx_fail_domains;

18

18

uschar *srv_fail_domains;

19

19

uschar *check_srv;

20

uschar *dnssec_request_domains;

21

uschar *dnssec_require_domains;

20

22

} dnslookup_router_options_block;

21

23

22

24

/* Data for reading the private options. */

Older »