Mercurial > hg > dhcpcd
changeset 4229:12388193ccdc draft
inet6: remove references to the crazies.
And add a comment that if we do this again to add a new knob for it.
| author | Roy Marples <roy@marples.name> |
|---|---|
| date | Sun, 25 Feb 2018 16:31:23 +0000 |
| parents | 5e355a5061a7 |
| children | bdf512764978 |
| files | src/if-bsd.c src/if-linux.c |
| diffstat | 2 files changed, 7 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/src/if-bsd.c Tue Feb 20 09:08:02 2018 +0000 +++ b/src/if-bsd.c Sun Feb 25 16:31:23 2018 +0000 @@ -1360,11 +1360,8 @@ flags &= ~IFXF_NOINET6; #endif /* - * If dhcpcd is doing RS, disable RA support - * in the kernel. Otherwise, leave it alone. - * Logically it should be disabled regardless as dhcpcd can - * do it better and the user saying no RS means no RS even the kernel, - * but some crazy people want the kernel to do it still. + * If not doing autoconf, don't disable the kernel from doing it. + * If we need to, we should have another option actively disable it. */ if (ifp->options->options & DHCPCD_IPV6RS) flags &= ~IFXF_AUTOCONF6; @@ -1423,11 +1420,8 @@ #endif /* - * If dhcpcd is doing RS, disable RA support - * in the kernel. Otherwise, leave it alone. - * Logically it should be disabled regardless as dhcpcd can - * do it better and the user saying no RS means no RS even the kernel, - * but some crazy people want the kernel to do it still. + * If not doing autoconf, don't disable the kernel from doing it. + * If we need to, we should have another option actively disable it. */ #ifdef ND6_IFF_ACCEPT_RTADV if (ifp->options->options & DHCPCD_IPV6RS)
--- a/src/if-linux.c Tue Feb 20 09:08:02 2018 +0000 +++ b/src/if-linux.c Sun Feb 25 16:31:23 2018 +0000 @@ -1686,17 +1686,13 @@ int ra; char path[256]; - /* Unlike the kernel, - * dhcpcd make make a stable private address. */ + /* The kernel cannot make stable private addresses. */ if (if_disable_autolinklocal(ifp->ctx, ifp->index) == -1) logdebug("%s: if_disable_autolinklocal", ifp->name); /* - * If dhcpcd is doing RS, disable RA support - * in the kernel. Otherwise, leave it alone. - * Logically it should be disabled regardless as dhcpcd can - * do it better and the user saying no RS means no RS even the kernel, - * but some crazy people want the kernel to do it still. + * If not doing autoconf, don't disable the kernel from doing it. + * If we need to, we should have another option actively disable it. */ if (!(ifp->options->options & DHCPCD_IPV6RS)) return;