[exim-cvs] Fix dns_retry definition.

Góra strony
Delete this message
Reply to this message
Autor: Exim Git Commits Mailing List
Data:  
Dla: exim-cvs
Temat: [exim-cvs] Fix dns_retry definition.
Gitweb: http://git.exim.org/exim.git/commitdiff/83712b3900eb045eb14df258fd092ad54314e990
Commit:     83712b3900eb045eb14df258fd092ad54314e990
Parent:     5336c0d9bbf5de9a948c168de692a092e557d8b6
Author:     Todd Lyons <tlyons@???>
AuthorDate: Wed May 8 05:46:00 2013 -0700
Committer:  Todd Lyons <tlyons@???>
CommitDate: Wed May 8 05:46:00 2013 -0700


    Fix dns_retry definition.


    Was placed in non-alphabetical order.
---
 doc/doc-txt/ChangeLog |    3 +++
 src/src/readconf.c    |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)


diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 552103b..f06946a 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -46,6 +46,9 @@ TL/05 Bugzilla 1285 - Spec omission, fix docbook errors for spec.txt creation.

TL/06 Add Experimental DMARC support using libopendmarc libraries.

+TL/07 Fix an out of order global option causing a segfault.  Reported to dev
+      mailing list by by Dmitry Isaikin.
+
 JH/01 Bugzilla 1201 & 304 - New cutthrough-delivery feature, with TLS support.


 JH/02 Support "G" suffix to numbers in ${if comparisons.
diff --git a/src/src/readconf.c b/src/src/readconf.c
index ba69546..c2785b7 100644
--- a/src/src/readconf.c
+++ b/src/src/readconf.c
@@ -221,10 +221,10 @@ static optionlist optionlist_config[] = {
   { "dns_check_names_pattern",  opt_stringptr,   &check_dns_names_pattern },
   { "dns_csa_search_limit",     opt_int,         &dns_csa_search_limit },
   { "dns_csa_use_reverse",      opt_bool,        &dns_csa_use_reverse },
+  { "dns_dnssec_ok",            opt_int,         &dns_dnssec_ok },
   { "dns_ipv4_lookup",          opt_stringptr,   &dns_ipv4_lookup },
   { "dns_retrans",              opt_time,        &dns_retrans },
   { "dns_retry",                opt_int,         &dns_retry },
-  { "dns_dnssec_ok",            opt_int,         &dns_dnssec_ok },
   { "dns_use_edns0",            opt_int,         &dns_use_edns0 },
  /* This option is now a no-op, retained for compability */
   { "drop_cr",                  opt_bool,        &drop_cr },