summaryrefslogtreecommitdiff
path: root/server/dhcpd.c
diff options
context:
space:
mode:
Diffstat (limited to 'server/dhcpd.c')
-rw-r--r--server/dhcpd.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/server/dhcpd.c b/server/dhcpd.c
index c5b9d092..68e74b54 100644
--- a/server/dhcpd.c
+++ b/server/dhcpd.c
@@ -1335,6 +1335,17 @@ void postconf_initialization (int quiet)
}
data_string_forget(&db, MDL);
}
+#if defined(DHCP4o6)
+ /* Delayed acks and DHCPv4-over-DHCPv6 are incompatible */
+ if (dhcpv4_over_dhcpv6) {
+ if (max_outstanding_acks > 0) {
+ log_debug("DHCP4o6 enabled, "
+ "setting delayed-ack to zero (incompatible)");
+ }
+
+ max_outstanding_acks = 0;
+ }
+#endif
oc = lookup_option(&server_universe, options, SV_MAX_ACK_DELAY);
if (oc &&