Fix CID: 1153964 and 1153966

This commit is contained in:
Roy Marples 2014-01-14 10:56:21 +00:00
parent 5301406a6c
commit 563a421c50
2 changed files with 5 additions and 0 deletions

View File

@ -431,6 +431,10 @@ dhcp6_makemessage(struct interface *ifp)
ml = state->new_len;
}
si = dhcp6_getmoption(D6_OPTION_SERVERID, m, ml);
if (si == NULL) {
errno = ESRCH;
return -1;
}
len += sizeof(*si) + ntohs(si->len);
/* FALLTHROUGH */
case DH6S_REBIND:

View File

@ -1083,6 +1083,7 @@ parse_option(struct if_options *ifo, int opt, const char *arg)
if (parse_iaid(ifo->iaid, arg, sizeof(ifo->iaid)) == -1)
return -1;
ifo->options |= DHCPCD_IAID;
break;
case O_IPV6RS:
ifo->options |= DHCPCD_IPV6RS;
break;