From c1e6c8329f41b05cdb065af0b20631fc6d33230b Mon Sep 17 00:00:00 2001 From: David Hankins Date: Tue, 7 Nov 2006 23:40:14 +0000 Subject: [PATCH] - 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] --- RELNOTES | 6 ++++++ common/discover.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/RELNOTES b/RELNOTES index b6c4683e4..a5905ac0e 100644 --- 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 c22a2a66e..e69218674 100644 --- 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"); -- 2.39.5