Compare commits

..

No commits in common. "3cd5924c850929b03bc8d4ba5db614d662edb49a" and "161bc1b62777b3f32ce645a8e128007a654a2300" have entirely different histories.

2 changed files with 6 additions and 4 deletions

View File

@ -58,7 +58,7 @@ option('debug-extra', type : 'array', choices : ['hashmap', 'mmap-cache', 'sipha
option('memory-accounting-default', type : 'boolean', option('memory-accounting-default', type : 'boolean',
description : 'enable MemoryAccounting= by default') description : 'enable MemoryAccounting= by default')
option('bump-proc-sys-fs-file-max', type : 'boolean', option('bump-proc-sys-fs-file-max', type : 'boolean',
description : 'bump /proc/sys/fs/file-max to LONG_MAX') description : 'bump /proc/sys/fs/file-max to ULONG_MAX')
option('bump-proc-sys-fs-nr-open', type : 'boolean', option('bump-proc-sys-fs-nr-open', type : 'boolean',
description : 'bump /proc/sys/fs/nr_open to INT_MAX') description : 'bump /proc/sys/fs/nr_open to INT_MAX')
option('valgrind', type : 'boolean', value : false, option('valgrind', type : 'boolean', value : false,

View File

@ -1133,14 +1133,16 @@ void link_check_ready(Link *link) {
in_addr_is_null(AF_INET6, (const union in_addr_union*) &link->ipv6ll_address)) in_addr_is_null(AF_INET6, (const union in_addr_union*) &link->ipv6ll_address))
return; return;
if ((link_dhcp4_enabled(link) || link_dhcp6_enabled(link) || link_ipv6_accept_ra_enabled(link)) && if ((link_dhcp4_enabled(link) || link_dhcp6_enabled(link)) &&
!link->dhcp4_configured && !link->dhcp4_configured &&
!link->dhcp6_configured && !link->dhcp6_configured &&
!link->ndisc_configured &&
!(link_ipv4ll_enabled(link, ADDRESS_FAMILY_FALLBACK_IPV4) && link->ipv4ll_address)) !(link_ipv4ll_enabled(link, ADDRESS_FAMILY_FALLBACK_IPV4) && link->ipv4ll_address))
/* When DHCP or RA is enabled, at least one protocol must provide an address, or /* When DHCP is enabled, at least one protocol must provide an address, or
* an IPv4ll fallback address must be configured. */ * an IPv4ll fallback address must be configured. */
return; return;
if (link_ipv6_accept_ra_enabled(link) && !link->ndisc_configured)
return;
} }
if (link->state != LINK_STATE_CONFIGURED) if (link->state != LINK_STATE_CONFIGURED)