diff options
| author | Francis Dupont <fdupont@isc.org> | 2016-02-23 10:40:10 +0100 |
|---|---|---|
| committer | Francis Dupont <fdupont@isc.org> | 2016-02-23 10:40:10 +0100 |
| commit | 785c1a519e88bfebb70bd3384589de36bee02dd2 (patch) | |
| tree | 04f794b247068983b2df432fb20f229de1e8bf03 /server/stables.c | |
| parent | 08ad1e3c9089b51888c73837cf41de49112de29c (diff) | |
| download | isc-dhcp-785c1a519e88bfebb70bd3384589de36bee02dd2.tar.gz | |
Merged rt35711c (DHCPv4-over-DHCPv6 support)
Diffstat (limited to 'server/stables.c')
| -rw-r--r-- | server/stables.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server/stables.c b/server/stables.c index d375bad6..f34a6721 100644 --- a/server/stables.c +++ b/server/stables.c @@ -234,7 +234,7 @@ static struct option server_options[] = { { "limit-addrs-per-ia", "L", &server_universe, 56, 1 }, { "limit-prefs-per-ia", "L", &server_universe, 57, 1 }, /* Assert a configuration parsing error if delayed-ack isn't compiled in. */ -#if defined(DELAYED_ACK) +#if defined(DELAYED_ACK) && !defined(DHCP4o6) { "delayed-ack", "S", &server_universe, 58, 1 }, { "max-ack-delay", "L", &server_universe, 59, 1 }, #endif |