- A logic error in omapi interface code was repaired that might result in

  incorrectly indicating 'up' state when any flags were set, rather than
  specifically the INTERFACE_REQUESTED flag. [ISC-Bugs #16431]

diff --git a/RELNOTES b/RELNOTES
index b6c4683e492eb25f2876eeba99cb50b444e75cc1..a5905ac0e43c7dc763ca779f48d4b9a1230a1e9d 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -174,6 +174,12 @@ the README file.
 - Encapsulated option spaces within encapsulated option spaces is now
   formally supported.
 
+                       Changes since 3.0.5
+
+- A logic error in omapi interface code was repaired that might result in
+  incorrectly indicating 'up' state when any flags were set, rather than
+  specifically the INTERFACE_REQUESTED flag.
+
                         Changes since 3.0.5rc1
 
 - A bug was repaired in fixes to the dhclient, which sought to run the

diff --git a/common/discover.c b/common/discover.c
index c22a2a66e73064e0b3d6053674bc1534f9b9f854..e6921867451b5091f5f9ef55b275759f2cd06926 100644 (file)
--- a/common/discover.c
+++ b/common/discover.c
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: discover.c,v 1.51 2006/08/09 14:57:47 dhankins Exp $ Copyright (c) 2004-2006 Internet Systems Consortium.  All rights reserved.\n";
+"$Id: discover.c,v 1.52 2006/11/07 23:40:14 dhankins Exp $ Copyright (c) 2004-2006 Internet Systems Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -938,7 +938,7 @@ isc_result_t dhcp_interface_stuff_values (omapi_object_t *c,
        status = omapi_connection_put_name (c, "state");
        if (status != ISC_R_SUCCESS)
                return status;
-       if (interface -> flags && INTERFACE_REQUESTED)
+       if ((interface->flags & INTERFACE_REQUESTED) != 0)
            status = omapi_connection_put_string (c, "up");
        else
            status = omapi_connection_put_string (c, "down");