diff options
| author | Hans Dedecker <hans.dedecker@technicolor.com> | 2014-01-23 09:49:42 +0100 |
|---|---|---|
| committer | Hans Dedecker <hans.dedecker@technicolor.com> | 2014-01-23 09:49:42 +0100 |
| commit | 54a51ca4375c2ae1007e5bea26ebb6dc4e88b638 (patch) | |
| tree | 945f606a00cf8746e5e8d2cb5e8fdf2beb8f3dac | |
| parent | fa3073b32452d78037d2a8ce2e3ea213b3d5f50c (diff) | |
| parent | 0a41d480c058b68fe09ac7de044c561dee955233 (diff) | |
Merge remote branch 'upstream/master' into bugfixes
| -rw-r--r-- | src/config.c | 2 | ||||
| -rw-r--r-- | src/dhcpv6-ia.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/config.c b/src/config.c index b6b3708..d025bdf 100644 --- a/src/config.c +++ b/src/config.c @@ -560,7 +560,7 @@ void odhcpd_reload(void) enum odhcpd_mode hybrid_mode = RELAYD_DISABLED; #ifdef WITH_UBUS - if (ubus_has_prefix(i->name, i->ifname)) + if (!ubus_has_prefix(i->name, i->ifname)) hybrid_mode = RELAYD_RELAY; #endif diff --git a/src/dhcpv6-ia.c b/src/dhcpv6-ia.c index 2e93bd0..88840a4 100644 --- a/src/dhcpv6-ia.c +++ b/src/dhcpv6-ia.c @@ -211,7 +211,7 @@ void dhcpv6_write_statefile(void) if (iface->dhcpv6 != RELAYD_SERVER && iface->dhcpv4 != RELAYD_SERVER) continue; - if (iface->dhcpv6 == RELAYD_SERVER) { + if (iface->dhcpv6 == RELAYD_SERVER && iface->ia_assignments.next) { struct dhcpv6_assignment *c; list_for_each_entry(c, &iface->ia_assignments, head) { if (c->clid_len == 0) @@ -262,7 +262,7 @@ void dhcpv6_write_statefile(void) } } - if (iface->dhcpv4 == RELAYD_SERVER) { + if (iface->dhcpv4 == RELAYD_SERVER && iface->dhcpv4_assignments.next) { struct dhcpv4_assignment *c; list_for_each_entry(c, &iface->dhcpv4_assignments, head) { char ipbuf[INET6_ADDRSTRLEN]; |