From: Evan Hunt <each@isc.org>
Date: Sat, 19 Jul 2008 03:57:23 +0000 (+0000)
Subject: The server wasn't always sending the FQDN option when it should. [rt18237]
X-Git-Tag: v4_1_0a2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=535485df4eb076359834b727ee7e12971172084f;p=thirdparty%2Fdhcp.git

The server wasn't always sending the FQDN option when it should. [rt18237]
---

diff --git a/RELNOTES b/RELNOTES
index 8c250ac54..049287828 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -58,6 +58,8 @@ work on other platforms. Please report any problems and suggested fixes to
   routers option before the subnet mask option were receiving
   only the latter.  Fixed.
 
+- The server wasn't always sending the FQDN option when it should.
+
 			Changes since 4.1.0a1
 
 - Fixed a coredump when adding a class via OMAPI.
diff --git a/common/options.c b/common/options.c
index 7971d7458..cd00e5327 100644
--- a/common/options.c
+++ b/common/options.c
@@ -668,8 +668,8 @@ cons_options(struct packet *inpacket, struct dhcp_packet *outpacket,
 		 * may only be included if the client supplied one.
 		 */
 		if ((priority_len < PRIORITY_COUNT) &&
-		    (lookup_option(&dhcp_universe, inpacket->options,
-				   DHO_FQDN) != NULL))
+		    (lookup_option(&fqdn_universe, inpacket->options,
+				   FQDN_ENCODED) != NULL))
 			priority_list[priority_len++] = DHO_FQDN;
 
 		/*