[Git][NTPsec/ntpsec][b301-fix] 2 commits: Handle more than ten interfaces in __ordlist().

[Ian Bruene]

Ian Bruene pushed to branch b301-fix at NTPsec / ntpsec


Commits:
7c498898 by Eric S. Raymond at 2017-05-10T10:42:43-04:00
Handle more than ten interfaces in __ordlist().

- - - - -
f620e916 by Ian Bruene at 2017-05-10T11:54:56-05:00
Fixed type bug in packet.py

packet.Authenticator.control attempted to cat a pair of tuples together, but
the first tuple was malformed: missing the trailing comma of a single
element tuple.

- - - - -


1 changed file:

- pylib/packet.py


Changes:

=====================================
pylib/packet.py
=====================================
--- a/pylib/packet.py
+++ b/pylib/packet.py
@@ -1620,7 +1620,7 @@ Receive a nonce that can be replayed - combats source address spoofing
                      qdata=listtype, auth=True)
         stanzas = []
         for (key, value) in self.__parse_varlist().items():
-            if key[-1].isdigit() and key[-2] == '.':
+            if key[-1].isdigit() and '.' in key:
                 (stem, stanza) = key.split(".")
                 stanza = int(stanza)
                 if stanza > len(stanzas) - 1:
@@ -1664,7 +1664,7 @@ class Authenticator:
         "Get a keyid/passwd pair that is trusted on localhost"
         if keyid is not None:
             if keyid in self.passwords:
-                return (keyid) + self.passwords[keyid]
+                return (keyid,) + self.passwords[keyid]
             else:
                 return (keyid, None, None)
         for line in open("/etc/ntp.conf"):



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/7dc252e10d5c8458f2de088f0602e27a69984ff5...f620e91621bbd216fb4bdeb95034d14cce1d00c0

---
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/7dc252e10d5c8458f2de088f0602e27a69984ff5...f620e91621bbd216fb4bdeb95034d14cce1d00c0
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20170510/ed6293af/attachment.html>