diff options
| author | Thomas Markwalder <tmark@isc.org> | 2015-06-15 15:19:42 -0400 |
|---|---|---|
| committer | Thomas Markwalder <tmark@isc.org> | 2015-06-15 15:19:42 -0400 |
| commit | e422b8c78f8cb22ada4675ce9bb0372d739a0013 (patch) | |
| tree | 41c37b82dd119b9c164b727894ecaeb0ff1e5453 /server/dhcpd.c | |
| parent | 3933e2aa5183d4602c4fffee4f2ae0d9ca25df99 (diff) | |
| download | isc-dhcp-e422b8c78f8cb22ada4675ce9bb0372d739a0013.tar.gz | |
[master] Delayed-ack now works correctly with failover
Merges in 31474.
Diffstat (limited to 'server/dhcpd.c')
| -rw-r--r-- | server/dhcpd.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/server/dhcpd.c b/server/dhcpd.c index cb4f0112..ebb6d3e3 100644 --- a/server/dhcpd.c +++ b/server/dhcpd.c @@ -1059,7 +1059,8 @@ void postconf_initialization (int quiet) data_string_forget(&db, MDL); } } - + +#if defined(DELAYED_ACK) oc = lookup_option(&server_universe, options, SV_DELAYED_ACK); if (oc && evaluate_option_cache(&db, NULL, NULL, NULL, options, NULL, @@ -1087,6 +1088,7 @@ void postconf_initialization (int quiet) data_string_forget(&db, MDL); } +#endif oc = lookup_option(&server_universe, options, SV_DONT_USE_FSYNC); if ((oc != NULL) && |