[Git][NTPsec/ntpsec][b301-fix] 2 commits: FALLTHRU: yet another try at pacifying gcc 7.1

[Ian Bruene]

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


Commits:
87918a65 by Gary E. Miller at 2017-05-10T10:33:59-07:00
FALLTHRU: yet another try at pacifying gcc 7.1

- - - - -
20896859 by Ian Bruene at 2017-05-10T13:24:41-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.

- - - - -


2 changed files:

- ntpd/ntp_loopfilter.c
- pylib/packet.py


Changes:

=====================================
ntpd/ntp_loopfilter.c
=====================================
--- a/ntpd/ntp_loopfilter.c
+++ b/ntpd/ntp_loopfilter.c
@@ -608,6 +608,7 @@ local_clock(
 				return (0);
 
 			clock_frequency = direct_freq(fp_offset);
+			__attribute__ ((fallthrough));
 			/* FALLTHRU to EVNT_SPIK */
 
 		/*


=====================================
pylib/packet.py
=====================================
--- a/pylib/packet.py
+++ b/pylib/packet.py
@@ -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/f620e91621bbd216fb4bdeb95034d14cce1d00c0...208968593fc41276bc947feb5bb934d6e84e482b

---
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/f620e91621bbd216fb4bdeb95034d14cce1d00c0...208968593fc41276bc947feb5bb934d6e84e482b
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/8b40c419/attachment.html>