[Git][NTPsec/ntpsec][master] 2 commits: Adjust syscomp list for Fedora on aarch64

[Hal Murray]

Hal Murray pushed to branch master at NTPsec / ntpsec


Commits:
3ef1a160 by Hal Murray at 2020-05-25T23:55:55-07:00
Adjust syscomp list for Fedora on aarch64

- - - - -
3191b7fb by Hal Murray at 2020-05-25T23:55:56-07:00
Fix for ntpq crashing with debug=2  #655
Fix from James Browning.  Thanks.

- - - - -


2 changed files:

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


Changes:

=====================================
ntpd/ntp_sandbox.c
=====================================
@@ -314,6 +314,7 @@ int scmp_sc[] = {
 	SCMP_SYS(bind),
 	SCMP_SYS(brk),
 	SCMP_SYS(chdir),
+	SCMP_SYS(clock_adjtime),
 	SCMP_SYS(clock_gettime),
 	SCMP_SYS(clock_settime),
 	SCMP_SYS(close),
@@ -436,7 +437,6 @@ int scmp_sc[] = {
  #define __SNR_ppoll                     __PNR_ppoll
 #endif
 	SCMP_SYS(ppoll),
-	SCMP_SYS(clock_adjtime),
 #endif
 	SCMP_SYS(sendmsg),
 #ifdef __NR_geteuid32
@@ -451,6 +451,8 @@ int scmp_sc[] = {
 	SCMP_SYS(faccessat),
 	SCMP_SYS(newfstatat),
 	SCMP_SYS(renameat),
+	SCMP_SYS(linkat),
+	SCMP_SYS(unlinkat),
 #endif
 #if defined(__i386__) || defined(__arm__) || defined(__powerpc__)
 	SCMP_SYS(_newselect),


=====================================
pylib/packet.py
=====================================
@@ -1121,7 +1121,7 @@ class ControlSession:
                         warn("Response packet:\n%s\n" % repr(self.response))
                     elif self.debug >= 2:  # pragma: no cover
                         # FIXME: Garbage when retrieving assoc list (binary)
-                        eol = self.response.find("\n")
+                        eol = self.response.find(b"\n")
                         firstline = self.response[:eol]
                         warn("First line:\n%s\n" % repr(firstline))
                     return None



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/compare/205e83d4e995c040d6c205c7b878116276c392ca...3191b7fb8c7032743b6c2356c084c63d0797b14f

-- 
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/compare/205e83d4e995c040d6c205c7b878116276c392ca...3191b7fb8c7032743b6c2356c084c63d0797b14f
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/20200526/554367ea/attachment-0001.htm>