[Git][NTPsec/ntpsec][dgb-trace] 2 commits: Borked merge fix

[Ian Bruene]

Ian Bruene pushed to branch dgb-trace at NTPsec / ntpsec


Commits:
b4880a30 by Ian Bruene at 2017-06-02T17:26:41-05:00
Borked merge fix

- - - - -
7ead8ea3 by Ian Bruene at 2017-06-02T18:01:01-05:00
Fixed refclock_generic.c, hopefully

- - - - -


2 changed files:

- ntpd/ntp_io.c
- ntpd/refclock_generic.c


Changes:

=====================================
ntpd/ntp_io.c
=====================================
--- a/ntpd/ntp_io.c
+++ b/ntpd/ntp_io.c
@@ -938,15 +938,9 @@ action_text(
 
 	default:
 		t = "ERROR";	/* quiet uninit warning */
-<<<<<<< dee3f727e0954f1aac9fe4b13225ef89364c2787
-		DPRINTF(1, ("fatal: unknown nic_rule_action %u\n",
-			    action));
-		ENSURE(0);
-=======
 		DPRINT(1, ("fatal: unknown nic_rule_action %u\n",
 			   action));
-		NTP_ENSURE(0);
->>>>>>> Changed current debugging macros to DPRINT or TPRINT
+		ENSURE(0);
 		break;
 
 	case ACTION_LISTEN:


=====================================
ntpd/refclock_generic.c
=====================================
--- a/ntpd/refclock_generic.c
+++ b/ntpd/refclock_generic.c
@@ -3481,6 +3481,7 @@ parse_process(
 			   prettydate(reftime),
 			   prettydate(rectime),
 			   lfptoa(off,6)));
+	}
 
 	if (PARSE_PPS(parsetime->parse_state) && CLK_PPS(parse->peer))
 	{



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/24baaba3cf534f8a9408dd24534510abadbb1f72...7ead8ea3a479473037dbfd93b37fe4f3a20ab04e

---
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/24baaba3cf534f8a9408dd24534510abadbb1f72...7ead8ea3a479473037dbfd93b37fe4f3a20ab04e
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/20170602/e4097b25/attachment.html>