statefiles: don't consider no hostname as broken

Commit e568bde changed the OAF_BROKEN_HOSTNAME flag to a boolean, but at
the same time changed the semantics slightly so that no hostname was
also considered broken (rather, no hostname means it's neither valid nor
invalid).

So, add a simple fix for this.

Closes: https://github.com/openwrt/odhcpd/issues/350
Signed-off-by: David Härdeman <david@hardeman.nu>
Link: https://github.com/openwrt/odhcpd/pull/351
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>

diff --git a/src/statefiles.c b/src/statefiles.c
index 558b0120ee61d4e631beb259ba821108a562b6a1..05c9663756bcefa80a9eecae42695e11db44e2c6 100644 (file)
--- a/src/statefiles.c
+++ b/src/statefiles.c
@@ -488,7 +488,7 @@ static void statefiles_write_state6(struct write_ctxt *ctxt, struct dhcpv6_lease
                fprintf(ctxt->fp,
                        "# %s %s %x %s%s %" PRId64 " %" PRIx64 " %" PRIu8,
                        ctxt->iface->ifname, duidbuf, ntohl(lease->iaid),
-                       lease->hostname_valid ? "" : "broken\\x20",
+                       lease->hostname && !lease->hostname_valid ? "broken\\x20": "",
                        lease->hostname ? lease->hostname : "-",
                        (lease->valid_until > ctxt->now ?
                         (int64_t)(lease->valid_until - ctxt->now + ctxt->wall_time) :
@@ -524,7 +524,7 @@ static void statefiles_write_state4(struct write_ctxt *ctxt, struct dhcpv4_lease
                "# %s %s ipv4 %s%s %" PRId64 " %x 32 %s/32\n",
                ctxt->iface->ifname,
                ether_ntoa((struct ether_addr *)lease->hwaddr),
-               lease->hostname_valid ? "" : "broken\\x20",
+               lease->hostname && !lease->hostname_valid ? "broken\\x20" : "",
                lease->hostname ? lease->hostname : "-",
                (lease->valid_until > ctxt->now ?
                 (int64_t)(lease->valid_until - ctxt->now + ctxt->wall_time) :