Module Name: src
Committed By: roy
Date: Wed Apr 15 15:54:18 UTC 2020
Modified Files:
src/external/bsd/dhcpcd/dist/src: dhcpcd.c
Log Message:
dhcpcd: Don't open a control socket in test mode
Fixes PR bin/55170
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/external/bsd/dhcpcd/dist/src/dhcpcd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/dhcpcd/dist/src/dhcpcd.c
diff -u src/external/bsd/dhcpcd/dist/src/dhcpcd.c:1.33 src/external/bsd/dhcpcd/dist/src/dhcpcd.c:1.34
--- src/external/bsd/dhcpcd/dist/src/dhcpcd.c:1.33 Mon Apr 13 15:46:26 2020
+++ src/external/bsd/dhcpcd/dist/src/dhcpcd.c Wed Apr 15 15:54:18 2020
@@ -2207,7 +2207,8 @@ printpidfile:
goto run_loop;
#endif
- if (control_start(&ctx,
+ if (!(ctx.options & DHCPCD_TEST) &&
+ control_start(&ctx,
ctx.options & DHCPCD_MASTER ? NULL : argv[optind]) == -1)
{
logerr("%s: control_start", __func__);
