Wed Apr 15 15:54:18 2020 UTC ()
dhcpcd: Don't open a control socket in test mode

Fixes PR bin/55170


(roy)
diff -r1.33 -r1.34 src/external/bsd/dhcpcd/dist/src/dhcpcd.c

cvs diff -r1.33 -r1.34 src/external/bsd/dhcpcd/dist/src/dhcpcd.c (expand / switch to unified diff)

--- src/external/bsd/dhcpcd/dist/src/dhcpcd.c 2020/04/13 15:46:26 1.33
+++ src/external/bsd/dhcpcd/dist/src/dhcpcd.c 2020/04/15 15:54:18 1.34
@@ -2197,27 +2197,28 @@ printpidfile: @@ -2197,27 +2197,28 @@ printpidfile:
2197 if (mkdir(DBDIR, 0755) == -1 && errno != EEXIST) 2197 if (mkdir(DBDIR, 0755) == -1 && errno != EEXIST)
2198 logerr("%s: mkdir `%s'", __func__, DBDIR); 2198 logerr("%s: mkdir `%s'", __func__, DBDIR);
2199 } 2199 }
2200 2200
2201#ifdef PRIVSEP 2201#ifdef PRIVSEP
2202 if (ctx.options & DHCPCD_PRIVSEP && ps_start(&ctx) == -1) { 2202 if (ctx.options & DHCPCD_PRIVSEP && ps_start(&ctx) == -1) {
2203 logerr("ps_start"); 2203 logerr("ps_start");
2204 goto exit_failure; 2204 goto exit_failure;
2205 } 2205 }
2206 if (ctx.options & DHCPCD_FORKED) 2206 if (ctx.options & DHCPCD_FORKED)
2207 goto run_loop; 2207 goto run_loop;
2208#endif 2208#endif
2209 2209
2210 if (control_start(&ctx, 2210 if (!(ctx.options & DHCPCD_TEST) &&
 2211 control_start(&ctx,
2211 ctx.options & DHCPCD_MASTER ? NULL : argv[optind]) == -1) 2212 ctx.options & DHCPCD_MASTER ? NULL : argv[optind]) == -1)
2212 { 2213 {
2213 logerr("%s: control_start", __func__); 2214 logerr("%s: control_start", __func__);
2214 goto exit_failure; 2215 goto exit_failure;
2215 } 2216 }
2216 2217
2217 /* Start any dev listening plugin which may want to 2218 /* Start any dev listening plugin which may want to
2218 * change the interface name provided by the kernel */ 2219 * change the interface name provided by the kernel */
2219 if ((ctx.options & (DHCPCD_MASTER | DHCPCD_DEV)) == 2220 if ((ctx.options & (DHCPCD_MASTER | DHCPCD_DEV)) ==
2220 (DHCPCD_MASTER | DHCPCD_DEV)) 2221 (DHCPCD_MASTER | DHCPCD_DEV))
2221 dev_start(&ctx); 2222 dev_start(&ctx);
2222 2223
2223#ifdef PRIVSEP 2224#ifdef PRIVSEP