From: Dave Hart <hart@ntp.org>
Date: Tue, 6 Oct 2009 04:21:07 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:c:/ntp/ntp-dev-1333
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dcdcbacb0e176298881473a892fc7f6942d19057;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:c:/ntp/ntp-dev-1333
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1135-1333

bk: 4acac5b3v6kxxso77OQJPfGd6PkB8Q
---

dcdcbacb0e176298881473a892fc7f6942d19057
diff --cc ChangeLog
index 69260bc40e,8274b8652b..c95a895fc4
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,4 +1,5 @@@
+ * [Bug 1135] ntpq uses sizeof(u_long) where sizeof(u_int32) is meant.
 +* [Bug 1333] ntpd --interface precedence over --novirtualips lost.
  (4.2.5p227) 2009/10/05 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1135] :config fails with "Server disallowed request"
  * [Bug 1330] disallow interface/nic rules when --novirtualips or