diff options
| author | David Hankins <dhankins@isc.org> | 2006-11-07 23:43:08 +0000 |
|---|---|---|
| committer | David Hankins <dhankins@isc.org> | 2006-11-07 23:43:08 +0000 |
| commit | e2a02c6dcacc8467c744a47566c654d27d7c4af1 (patch) | |
| tree | aa45f0fa100a349bc07cac48c03c6a239d3da08f | |
| parent | 9f6031e1fbf6d6c47d356a9ad69f939f55a4e1ba (diff) | |
| download | isc-dhcp-e2a02c6dcacc8467c744a47566c654d27d7c4af1.tar.gz | |
- 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]
| -rw-r--r-- | RELNOTES | 6 | ||||
| -rw-r--r-- | common/discover.c | 4 |
2 files changed, 8 insertions, 2 deletions
@@ -79,6 +79,12 @@ thanks to all of these good people here, both for working on the code and for prodding me into improving it. + 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.5rc2 - Failover servers try harder to retransmit binding updates upon entering diff --git a/common/discover.c b/common/discover.c index 4ad213cb..6a9f41d6 100644 --- a/common/discover.c +++ b/common/discover.c @@ -34,7 +34,7 @@ #ifndef lint static char copyright[] = -"$Id: discover.c,v 1.42.2.21 2006/02/22 22:43:27 dhankins Exp $ Copyright (c) 2004-2006 Internet Systems Consortium. All rights reserved.\n"; +"$Id: discover.c,v 1.42.2.22 2006/11/07 23:43:08 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"); |