starlingx/integ
Code Issues Proposed changes

Merge "de-fuzz dnsmasq patches"

Browse Source
This commit is contained in:
Zuul 2018-09-27 19:00:31 +00:00 committed by Gerrit Code Review
commit 305cc2ae26
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
base/dnsmasq/centos/patches/dnsmasq-update-ipv6-leases-from-config.patch
View File

@ -1,18 +1,17 @@
From c68370ac5678b1052592877ede04886d5f62d2dc Mon Sep 17 00:00:00 2001
From 1a91b72146893dab1cca1354dd3b0a8fa74d6b55 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Tue, 18 Oct 2016 13:07:56 -0400
Subject: [PATCH 1/4] WRS: Patch22:
dnsmasq-update-ipv6-leases-from-config.patch
Subject: WRS: Patch22: dnsmasq-update-ipv6-leases-from-config.patch
---
src/lease.c | 53 +++++++++++++++++++++++++++++++++++++++++++----------
1 file changed, 43 insertions(+), 10 deletions(-)
diff --git a/src/lease.c b/src/lease.c
index e5fe8a6..ffa683a 100644
index 69e698c..bc56c47 100644
--- a/src/lease.c
+++ b/src/lease.c
@@ -179,6 +179,18 @@ void lease_init(time_t now)
@@ -210,6 +210,18 @@ void lease_init(time_t now)
dns_dirty = 1;
}
@ -31,7 +30,7 @@ index e5fe8a6..ffa683a 100644
void lease_update_from_configs(void)
{
/* changes to the config may change current leases. */
@@ -187,16 +199,37 @@ void lease_update_from_configs(void)
@@ -218,16 +230,37 @@ void lease_update_from_configs(void)
struct dhcp_config *config;
char *name;
@ -80,5 +79,5 @@ index e5fe8a6..ffa683a 100644
static void ourprintf(int *errp, char *format, ...)
--
1.9.1
2.7.4