From: Bob Halley <halley@dnspython.org>
Date: Sat, 21 Jun 2014 16:13:57 +0000 (-0700)
Subject: Add ChangeLog entry for resolver.rotate
X-Git-Tag: v1.12.0~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5bb31eb605b0109d02d6037098983b06e3b2ca98;p=thirdparty%2Fdnspython.git

Add ChangeLog entry for resolver.rotate
Tweak options processing for greater flexibility
---

diff --git a/ChangeLog b/ChangeLog
index 6e9e86d5..f2106881 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,13 @@
     * Added dns.zone.to_text() convenience method.  Thanks to Brandon Whaley
       <redkrieg@gmail.com> for the patch.
 
+    * The /etc/resolv.conf setting "options rotate" is now understood by the
+      resolver.  If present, the resolver will shuffle the nameserver list
+      each time dns.resolver.query() is called.  Thanks to underrun for the
+      patch.  Note that you don't want to add "options rotate" to your
+      /etc/resolv.conf if your system's resolver library does not understand
+      it.  In this case, just set resolver.rotate = True by hand.
+
 2014-06-19  Bob Halley  <halley@dnspython.org>
 
     * Escaping of Unicode has been corrected.  Previously we escaped and
diff --git a/dns/resolver.py b/dns/resolver.py
index 88419e95..f52b5556 100644
--- a/dns/resolver.py
+++ b/dns/resolver.py
@@ -541,7 +541,7 @@ class Resolver(object):
                     for suffix in tokens[1:]:
                         self.search.append(dns.name.from_text(suffix))
                 elif tokens[0] == 'options':
-                    if len(tokens) == 2 and tokens[1] == 'rotate':
+                    if 'rotate' in tokens[1:]:
                         self.rotate = True
         finally:
             if want_close: