[Git][NTPsec/ntpsec][master] 2 commits: mrulist: Fix "kod" and "limited" error "Unknown parameter"

[Eric S. Raymond]

Eric S. Raymond pushed to branch master at NTPsec / ntpsec


Commits:
a00f4a5d by Matt Nordhoff at 2017-05-02T18:26:35-04:00
mrulist: Fix "kod" and "limited" error "Unknown parameter"

- - - - -
b01f7519 by Matt Nordhoff at 2017-05-02T18:26:35-04:00
mrulist: Make "resall" and "resany" hex instead of decimal

- - - - -


1 changed file:

- pylib/packet.py


Changes:

=====================================
pylib/packet.py
=====================================
--- a/pylib/packet.py
+++ b/pylib/packet.py
@@ -1382,7 +1382,7 @@ Receive a nonce that can be replayed - combats source address spoofing
                     if sorter is None:
                         raise ControlException(SERR_BADSORT % sortkey)
             for k in list(variables.keys()):
-                if k in ("mincount", "resall", "resany",
+                if k in ("mincount", "resall", "resany", "kod", "limited",
                          "maxlstint", "laddr", "recent", "sort",
                          "frags", "limit"):
                     continue
@@ -1408,6 +1408,10 @@ Receive a nonce that can be replayed - combats source address spoofing
             limit = min(3 * MAXFRAGS, self.ntpd_row_limit)
             req_buf = "%s, frags=%d" % (nonce, frags)
             if variables:
+                if 'resall' in variables:
+                    variables['resall'] = hex(variables['resall'])
+                if 'resany' in variables:
+                    variables['resany'] = hex(variables['resany'])
                 parms = ", " + ",".join([("%s=%s" % it)
                                          for it in list(variables.items())])
             else:



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/48f81b16b907af959f289647fb3b99f7dc513848...b01f7519f38246045f7f96841aa708d54bef48fc

---
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/48f81b16b907af959f289647fb3b99f7dc513848...b01f7519f38246045f7f96841aa708d54bef48fc
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/20170502/87e5fd14/attachment.html>