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

diff --git a/RELNOTES b/RELNOTES
index 8c250ac549d2ee65baedfd0403728414b14aa9a7..049287828d5ba10b6f9909fab8555739db95e1da 100644 (file)
--- 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 7971d7458b607ed255e0bca010890ae258e93d2e..cd00e5327e37c6e4a01a4cf359b7f965d49862c3 100644 (file)
--- 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;
 
                /*