diff options
| author | Thomas Markwalder <tmark@isc.org> | 2014-08-28 07:56:20 -0400 |
|---|---|---|
| committer | Thomas Markwalder <tmark@isc.org> | 2014-08-28 08:12:30 -0400 |
| commit | a07d99bbefd67a238b66341f84c6c63f7f35540e (patch) | |
| tree | 07bb7bcc8187364b785423822ddcd8dde667319c /server/failover.c | |
| parent | 36e2c22493c0f2357aec2ccf4ed37c2eb676bc56 (diff) | |
| download | isc-dhcp-a07d99bbefd67a238b66341f84c6c63f7f35540e.tar.gz | |
[master] Corrects medium impact issues reported by Coverity.
Merges in rt36933
Diffstat (limited to 'server/failover.c')
| -rw-r--r-- | server/failover.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/server/failover.c b/server/failover.c index a0bebc28..19c3e087 100644 --- a/server/failover.c +++ b/server/failover.c @@ -720,7 +720,10 @@ static isc_result_t do_a_failover_option (c, link) /* FT_DDNS* are special - one or two bytes of status followed by the client FQDN. */ - if (ft_options [option_code].type == FT_DDNS1 || + + /* Note: FT_DDNS* option support appears to be incomplete. + ISC-Bugs #36996 has been opened to address this. */ + if (ft_options [option_code].type == FT_DDNS || ft_options [option_code].type == FT_DDNS1) { ddns_fqdn_t *ddns = ((ddns_fqdn_t *) @@ -2285,6 +2288,8 @@ isc_result_t dhcp_failover_peer_state_changed (dhcp_failover_state_t *state, switch (new_state) { case recover_done: log_error("Both servers have entered recover-done!"); + /* Fall through and tranistion to normal anyway */ + case normal: dhcp_failover_set_state (state, normal); break; |