[Git][NTPsec/ntpsec][master] 2 commits: Clean up debug-only error in ntp_proto

[Hal Murray]

Hal Murray pushed to branch master at NTPsec / ntpsec


Commits:
d99f76e6 by Hal Murray at 2017-04-14T23:22:35-07:00
Clean up debug-only error in ntp_proto

- - - - -
87ce9e62 by Hal Murray at 2017-04-14T23:22:35-07:00
Allow exit if no DNS ntp_seccomp

- - - - -


2 changed files:

- ntpd/ntp_proto.c
- ntpd/ntp_sandbox.c


Changes:

=====================================
ntpd/ntp_proto.c
=====================================
--- a/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@ -2446,13 +2446,6 @@ if (NULL == server->dstadr)
 		peer_update_hash(server);
 		peer_xmit(server);
 
-#ifdef HAL_FIXED
-		DPRINTF(1, ("transmit: at %lu %s->%s pool\n",
-		    current_time, latoa(lcladr), socktoa(rmtadr)));
-#else
-		DPRINTF(1, ("transmit: at %lu ->%s pool\n",
-		    current_time, socktoa(rmtadr)));
-#endif
 		msyslog(LOG_INFO, "Setup server %s", socktoa(rmtadr));
 		return;
 	};


=====================================
ntpd/ntp_sandbox.c
=====================================
--- a/ntpd/ntp_sandbox.c
+++ b/ntpd/ntp_sandbox.c
@@ -297,6 +297,7 @@ int scmp_sc[] = {
 	SCMP_SYS(clock_settime),
 	SCMP_SYS(close),
 	SCMP_SYS(connect),
+	SCMP_SYS(exit),
 	SCMP_SYS(exit_group),
 	SCMP_SYS(fcntl),
 	SCMP_SYS(fstat),
@@ -354,8 +355,7 @@ int scmp_sc[] = {
 
 #ifdef ENABLE_DNS_LOOKUP
 	SCMP_SYS(clone),	/* threads */
-	SCMP_SYS(exit),
-	SCMP_SYS(futex),	/* sem_xxx */
+	SCMP_SYS(futex),	/* sem_xxx, used by threads */
 	SCMP_SYS(kill),		/* generate signal */
 	SCMP_SYS(madvise),
 	SCMP_SYS(mprotect),



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/971f0c060399dd6c22df44d766c3b560361a7048...87ce9e62ecc514c9879926b90ee6aa197adca366

---
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/971f0c060399dd6c22df44d766c3b560361a7048...87ce9e62ecc514c9879926b90ee6aa197adca366
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/20170415/e2ca427e/attachment.html>