svn commit: r339460 - head/usr.sbin/rtsold

Mark Johnston markj at FreeBSD.org
Sat Oct 20 18:00:14 UTC 2018


Author: markj
Date: Sat Oct 20 18:00:13 2018
New Revision: 339460
URL: https://svnweb.freebsd.org/changeset/base/339460

Log:
  Fix a dead store.
  
  We would fail to clear DNS search list configuration if a router
  stopped specifying the DNSSL RA option.  I suspect that the bug
  was mostly harmless, as the RDNSS and DNSSL options are typically used
  together and omitting the RDNSS option would have the same effect.
  
  CID:		1006219
  MFC after:	2 weeks
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/usr.sbin/rtsold/rtsol.c

Modified: head/usr.sbin/rtsold/rtsol.c
==============================================================================
--- head/usr.sbin/rtsold/rtsol.c	Sat Oct 20 18:00:12 2018	(r339459)
+++ head/usr.sbin/rtsold/rtsol.c	Sat Oct 20 18:00:13 2018	(r339460)
@@ -616,7 +616,6 @@ ra_opt_handler(struct ifinfo *ifi)
 				TAILQ_INSERT_TAIL(&sm_rdnss_head, smp3,
 				    sm_next);
 				ifi->ifi_rdnss = IFI_DNSOPT_STATE_RECEIVED;
-
 				break;
 			case ND_OPT_DNSSL:
 				if (TS_CMP(&now, &rao->rao_expire, >)) {
@@ -656,10 +655,7 @@ ra_opt_handler(struct ifinfo *ifi)
 				    sm_next);
 				dlen += strlen(rao->rao_msg) +
 				    strlen(resstr_sp);
-				break;
-
 				ifi->ifi_dnssl = IFI_DNSOPT_STATE_RECEIVED;
-			default:
 				break;
 			}
 			continue;


More information about the svn-src-head mailing list