From: Juergen Perlinger <perlinger@ntp.org>
Date: Sat, 10 Aug 2019 06:31:59 +0000 (+0200)
Subject: [Bug 3599] Build fails on linux-m68k due to alignment issues
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71d4c0548bc11caaf69cc0b4ee41c0f4e12bece0;p=thirdparty%2Fntp.git

[Bug 3599] Build fails on linux-m68k due to alignment issues

bk: 5d4e64dfQh7SXurWcB9bsclFuMIajA
---

diff --git a/ChangeLog b/ChangeLog
index 9ff845c81..23b30b14f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+---
+* [Bug 3599] Build fails on linux-m68k due to alignment issues <perlinger@ntp.org>
+  - added padding as suggested by John Paul Adrian Glaubitz 
+
 ---
 (4.2.8p13) 2019/03/07 Released by Harlan Stenn <stenn@ntp.org>
 
diff --git a/include/ntp_request.h b/include/ntp_request.h
index d05a67f75..d3fc60d3e 100644
--- a/include/ntp_request.h
+++ b/include/ntp_request.h
@@ -672,6 +672,7 @@ struct conf_restrict {
 	short ippeerlimit;	/* ip peer limit */
 	u_short flags;		/* restrict flags */
 	u_short mflags;		/* match flags */
+	short unused1;		/*  manual padding here */
 	u_int v6_flag;		/* is this v6 or not */
 	struct in6_addr addr6; 	/* match address (v6) */
 	struct in6_addr mask6; 	/* match mask (v6) */
diff --git a/ntpdc/layout.std b/ntpdc/layout.std
index f07f79f36..3660494bc 100644
--- a/ntpdc/layout.std
+++ b/ntpdc/layout.std
@@ -275,6 +275,7 @@ offsetof(mask) = 4
 offsetof(ippeerlimit) = 8
 offsetof(flags) = 10
 offsetof(mflags) = 12
+offsetof(unused1) = 14
 offsetof(v6_flag) = 16
 offsetof(addr6) = 20
 offsetof(mask6) = 36