starlingx/integ
Code Issues Proposed changes

Merge "de-fuzz dhcp patch"

Browse Source
This commit is contained in:
Zuul 2018-10-16 01:43:25 +00:00 committed by Gerrit Code Review
commit 1828f08bad
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
base/dhcp/centos/files/dhclient-restrict-interfaces-to-command-line.patch
View File

@ -41,7 +41,7 @@ index 0db4703..00b4240 100644
struct iaddr iaddr_broadcast = { 4, { 255, 255, 255, 255 } };
struct iaddr iaddr_any = { 4, { 0, 0, 0, 0 } };
@@ -240,6 +241,8 @@ main(int argc, char **argv) {
@@ -242,6 +243,8 @@ main(int argc, char **argv) {
no_dhclient_pid = 1;
} else if (!strcmp(argv[i], "--no-pid")) {
no_pid_file = ISC_TRUE;
@ -54,7 +54,7 @@ diff --git a/includes/dhcpd.h b/includes/dhcpd.h
index 1d2bf2c..b1f16bf 100644
--- a/includes/dhcpd.h
+++ b/includes/dhcpd.h
@@ -2703,6 +2703,7 @@ extern const char *path_dhclient_db;
@@ -2693,6 +2693,7 @@ extern const char *path_dhclient_db;
extern const char *path_dhclient_pid;
extern char *path_dhclient_script;
extern int interfaces_requested;

4
base/dhcp/centos/files/support-disable-nsupdate.patch
View File

@ -12,7 +12,7 @@ diff --git a/server/dhcpd.c b/server/dhcpd.c
index 67fec83..7523093 100644
--- a/server/dhcpd.c
+++ b/server/dhcpd.c
@@ -504,8 +504,10 @@ main(int argc, char **argv) {
@@ -424,8 +424,10 @@ main(int argc, char **argv) {
trace_srandom = trace_type_register ("random-seed", (void *)0,
trace_seed_input,
trace_seed_stop, MDL);
@ -27,7 +27,7 @@ diff --git a/server/failover.c b/server/failover.c
index 8944102..d26adfa 100644
--- a/server/failover.c
+++ b/server/failover.c
@@ -5232,7 +5232,9 @@ isc_result_t dhcp_failover_process_bind_update (dhcp_failover_state_t *state,
@@ -5290,7 +5290,9 @@ isc_result_t dhcp_failover_process_bind_update (dhcp_failover_state_t *state,
*/
if (msg->binding_status == FTS_ACTIVE &&
(chaddr_changed || ident_changed)) {