Mercurial > hg > dhcpcd

comparison src/if-options.c @ 5546:08426e8a98a7 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
DHCP6: Delegated activations work once more This was broken with the --noconfigure option in dhcpcd-9.3.3
author Roy Marples <roy@marples.name>
date Sat, 21 Nov 2020 11:59:07 +0000
parents a0d828e25482
children dba7608e00b3
comparison
equal deleted inserted replaced
5545:d40f87a25035 5546:08426e8a98a7
2341 #ifdef AUTH 2341 #ifdef AUTH
2342 TAILQ_INIT(&ifo->auth.tokens); 2342 TAILQ_INIT(&ifo->auth.tokens);
2343 #endif 2343 #endif
2344 2344
2345 /* Inherit some global defaults */ 2345 /* Inherit some global defaults */
2346 if (ctx->options & DHCPCD_CONFIGURE)
2347 ifo->options |= DHCPCD_CONFIGURE;
2346 if (ctx->options & DHCPCD_PERSISTENT) 2348 if (ctx->options & DHCPCD_PERSISTENT)
2347 ifo->options |= DHCPCD_PERSISTENT; 2349 ifo->options |= DHCPCD_PERSISTENT;
2348 if (ctx->options & DHCPCD_SLAACPRIVATE) 2350 if (ctx->options & DHCPCD_SLAACPRIVATE)
2349 ifo->options |= DHCPCD_SLAACPRIVATE; 2351 ifo->options |= DHCPCD_SLAACPRIVATE;
2350 2352
2369 2371
2370 /* Seed our default options */ 2372 /* Seed our default options */
2371 if ((ifo = default_config(ctx)) == NULL) 2373 if ((ifo = default_config(ctx)) == NULL)
2372 return NULL; 2374 return NULL;
2373 if (default_options == 0) { 2375 if (default_options == 0) {
2374 default_options |= DHCPCD_DAEMONISE | 2376 default_options |= DHCPCD_CONFIGURE | DHCPCD_DAEMONISE |
2375 DHCPCD_CONFIGURE | DHCPCD_GATEWAY; 2377 DHCPCD_GATEWAY;
2376 #ifdef INET 2378 #ifdef INET
2377 skip = socket(PF_INET, SOCK_DGRAM, 0); 2379 skip = socket(PF_INET, SOCK_DGRAM, 0);
2378 if (skip != -1) { 2380 if (skip != -1) {
2379 close(skip); 2381 close(skip);
2380 default_options |= DHCPCD_IPV4 | DHCPCD_ARP | 2382 default_options |= DHCPCD_IPV4 | DHCPCD_ARP |