Add an option to control dhcpcd forking or not if the RA does not contain

a RDNSS option.
This involves changing our options to an unsigned long long so we can use
more than 32 bits.

1 files changed, 6 insertions, 1 deletions

diff --git a/ipv6rs.c b/ipv6rs.c
index 4c5f67a8..999c4602 100644
--- a/ipv6rs.c
+++ b/ipv6rs.c
@@ -468,7 +468,8 @@ ipv6rs_handledata(_unused void *arg)
 						    '\0';
 					} else
 						opt = xstrdup(cbp);
-					has_dns = 1;
+					if (lifetime > 0)
+						has_dns = 1;
 				}
 		        	op += sizeof(addr.s6_addr);
 			}
@@ -535,6 +536,10 @@ ipv6rs_handledata(_unused void *arg)
 	if (options & DHCPCD_TEST)
 		exit(EXIT_SUCCESS);
 
+	/* If we don't require RDNSS then set has_dns = 1 so we fork */
+	if (!(ifp->state->options->options & DHCPCD_IPV6RA_REQRDNSS))
+		has_dns = 1;
+
 	if (has_dns)
 		delete_q_timeout(0, handle_exit_timeout, NULL);
 	delete_timeouts(ifp, NULL);