2
0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-31 06:15:55 +00:00

[master] Replaced SERVER_ID_CHECK compile switch with runtime config parameter

Merges in rt37551.
This commit is contained in:
Thomas Markwalder
2014-12-08 14:56:40 -05:00
parent 2731a82c83
commit 7116a34fc9
7 changed files with 73 additions and 40 deletions

View File

@@ -72,6 +72,7 @@ option server.ddns-rev-domainname = \"in-addr.arpa.\";";
#endif /* NSUPDATE */
int ddns_update_style;
int dont_use_fsync = 0; /* 0 = default, use fsync, 1 = don't use fsync */
int server_id_check = 0; /* 0 = default, don't check server id, 1 = do check */
const char *path_dhcpd_conf = _PATH_DHCPD_CONF;
const char *path_dhcpd_db = _PATH_DHCPD_DB;
@@ -1078,6 +1079,14 @@ void postconf_initialization (int quiet)
log_error("Not using fsync() to flush lease writes");
}
oc = lookup_option(&server_universe, options, SV_SERVER_ID_CHECK);
if ((oc != NULL) &&
evaluate_boolean_option_cache(NULL, NULL, NULL, NULL, options, NULL,
&global_scope, oc, MDL)) {
log_info("Setting server-id-check true");
server_id_check = 1;
}
/* Don't need the options anymore. */
option_state_dereference(&options, MDL);
}