summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2019-09-19 20:48:12 +0100
committerRoy Marples <roy@marples.name>2019-09-19 20:48:12 +0100
commitad5ede468447d15f573a5e0f99f819562f808998 (patch)
treee33f07ece2fd1d2c897370379fccab4ce25237ac
parentd5700a48edf7006369f766d225e70bbca3d8055c (diff)
downloaddhcpcd-master.tar.xz
DHCP: Don't send force renew none or reconf accept if not asked forHEADmaster
-rw-r--r--src/dhcp.c3
-rw-r--r--src/dhcp6.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/dhcp.c b/src/dhcp.c
index fc21904b..17634119 100644
--- a/src/dhcp.c
+++ b/src/dhcp.c
@@ -988,7 +988,8 @@ make_message(struct bootp **bootpm, const struct interface *ifp, uint8_t type)
#ifdef AUTH
if ((ifo->auth.options & DHCPCD_AUTH_SENDREQUIRE) !=
- DHCPCD_AUTH_SENDREQUIRE)
+ DHCPCD_AUTH_SENDREQUIRE &&
+ !has_option_mask(ifo->nomask, DHO_FORCERENEW_NONCE))
{
/* We support HMAC-MD5 */
AREA_CHECK(1);
diff --git a/src/dhcp6.c b/src/dhcp6.c
index 08183370..99531af0 100644
--- a/src/dhcp6.c
+++ b/src/dhcp6.c
@@ -1031,7 +1031,8 @@ dhcp6_makemessage(struct interface *ifp)
#ifdef AUTH
if ((ifo->auth.options & DHCPCD_AUTH_SENDREQUIRE) !=
- DHCPCD_AUTH_SENDREQUIRE)
+ DHCPCD_AUTH_SENDREQUIRE &&
+ !has_option_mask(ifo->nomask6, D6_OPTION_RECONF_ACCEPT))
COPYIN1(D6_OPTION_RECONF_ACCEPT, 0);
#endif