From 6deb83615c794c2f7f3e56e38b433cf28e3d6fb3 Mon Sep 17 00:00:00 2001
From: Evan Hunt <each@isc.org>
Date: Thu, 14 Jan 2016 10:27:41 -0800
Subject: [PATCH] [v9_9] added sockaddr.h

4291.	[cleanup]	Added a required include to dns/forward.h. [RT #41474]

(cherry picked from commit b4ccec331dbd81581c6226a54847385a27d9eb25)
(cherry picked from commit 25da0107d119ae2df32ce1372bd00172fe0c924e)
---
 CHANGES                       | 2 ++
 lib/dns/forward.c             | 3 ---
 lib/dns/include/dns/forward.h | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/CHANGES b/CHANGES
index 61d9c48efc..87d7850359 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+4291.	[cleanup]	Added a required include to dns/forward.h. [RT #41474]
+
 4289.	[bug]		The server could crash due to memory being used
 			after it was freed if a zone transfer timed out.
 			[RT #41297]
diff --git a/lib/dns/forward.c b/lib/dns/forward.c
index 7ec4e5c9de..534219d794 100644
--- a/lib/dns/forward.c
+++ b/lib/dns/forward.c
@@ -15,8 +15,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: forward.c,v 1.14 2009/09/02 23:48:02 tbox Exp $ */
-
 /*! \file */
 
 #include <config.h>
@@ -24,7 +22,6 @@
 #include <isc/magic.h>
 #include <isc/mem.h>
 #include <isc/rwlock.h>
-#include <isc/sockaddr.h>
 #include <isc/util.h>
 
 #include <dns/forward.h>
diff --git a/lib/dns/include/dns/forward.h b/lib/dns/include/dns/forward.h
index 23e94be789..37e9732525 100644
--- a/lib/dns/include/dns/forward.h
+++ b/lib/dns/include/dns/forward.h
@@ -15,8 +15,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: forward.h,v 1.13 2009/09/02 23:48:02 tbox Exp $ */
-
 #ifndef DNS_FORWARD_H
 #define DNS_FORWARD_H 1
 
@@ -24,6 +22,7 @@
 
 #include <isc/lang.h>
 #include <isc/result.h>
+#include <isc/sockaddr.h>
 
 #include <dns/types.h>