From: Steven Barth <steven@midlink.org>
Date: Tue, 22 Oct 2013 10:49:54 +0000 (+0200)
Subject: Don't accidentally apply settings from foreign interfaces
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=commitdiff_plain;h=e418a237611a5d2ad6dfa8a814b560350345b2f7

Don't accidentally apply settings from foreign interfaces
---

diff --git a/src/ubus.c b/src/ubus.c
index 1c74499..dc2f171 100644
--- a/src/ubus.c
+++ b/src/ubus.c
@@ -246,7 +246,7 @@ void ubus_apply_network(void)
 			bool cmatched = !strcmp(interface, c->name) || !strcmp(ifname, c->ifname);
 			matched |= cmatched;
 
-			if (!cmatched && (!f || (f != c->upstream && f[-1] != 0)))
+			if (!cmatched && (!c->upstream_len || !f || (f != c->upstream && f[-1] != 0)))
 				continue;
 
 			if (!c->ignore)