[Git][NTPsec/ntpsec][master] 2 commits: Fix warning in refclock_oncore on FreeBSD

[Hal Murray]

Hal Murray pushed to branch master at NTPsec / ntpsec


Commits:
591b90ed by Hal Murray at 2017-05-07T21:21:53-07:00
Fix warning in refclock_oncore on FreeBSD

- - - - -
3a333c69 by Hal Murray at 2017-05-07T21:23:23-07:00
Remove unused ENABLE_DNS_RETRY

- - - - -


3 changed files:

- devel/ifdex-ignores
- ntpd/refclock_oncore.c
- wscript


Changes:

=====================================
devel/ifdex-ignores
=====================================
--- a/devel/ifdex-ignores
+++ b/devel/ifdex-ignores
@@ -64,7 +64,6 @@ ENABLE_EARLY_DROPROOT
 ENABLE_LEAP_SMEAR
 ENABLE_SECCOMP
 ENABLE_DEBUG_TIMING
-ENABLE_DNS_RETRY
 ENABLE_LOCKCLOCK
 ENABLE_MDNS_REGISTRATION
 ENABLE_MSSNTP


=====================================
ntpd/refclock_oncore.c
=====================================
--- a/ntpd/refclock_oncore.c
+++ b/ntpd/refclock_oncore.c
@@ -663,7 +663,7 @@ oncore_start(
 	}
 
 	if (stat(device2, &stat2)) {
-		stat2.st_dev = stat2.st_ino = (unsigned long)-2;
+		stat2.st_dev = stat2.st_ino = (ino_t)-2;
 		oncore_log_f(instance, LOG_ERR, "Can't stat fd2 (%s) %d %m",
 			     device2, errno);
 	}


=====================================
wscript
=====================================
--- a/wscript
+++ b/wscript
@@ -756,10 +756,6 @@ int main(int argc, char **argv) {
         ctx.define("ENABLE_DNS_LOOKUP", 1,
                    comment="Enable DNS lookup of hostnames")
 
-    if not ctx.options.disable_dns_retry:
-        ctx.define("ENABLE_DNS_RETRY", 1,
-                   comment="Retry DNS lookups after an initial failure")
-
     # This is true under every Unix-like OS.
     ctx.define("HAVE_WORKING_FORK", 1,
                comment="Whether a working fork() exists")
@@ -825,7 +821,7 @@ int main(int argc, char **argv) {
         from wafhelpers.check_mdns import check_mdns_header
         check_mdns_header(ctx)
 
-    if not ctx.options.disable_dns_retry:
+    if not ctx.options.disable_dns_lookup:
         from wafhelpers.check_pthread import check_pthread_run
         check_pthread_run(ctx)
 



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/4d24df1288bb5fca1f4901993cf73d2a43e13ec2...3a333c69fd8e381e510a110759c0eb3e4787c454

---
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/4d24df1288bb5fca1f4901993cf73d2a43e13ec2...3a333c69fd8e381e510a110759c0eb3e4787c454
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/20170508/60df865b/attachment.html>