Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/dhcpcd/dist/src dhcpcd: Don't open a control so...



details:   https://anonhg.NetBSD.org/src/rev/6b177196b29d
branches:  trunk
changeset: 1009183:6b177196b29d
user:      roy <roy%NetBSD.org@localhost>
date:      Wed Apr 15 15:54:18 2020 +0000

description:
dhcpcd: Don't open a control socket in test mode

Fixes PR bin/55170

diffstat:

 external/bsd/dhcpcd/dist/src/dhcpcd.c |  3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diffs (13 lines):

diff -r afc2f9250606 -r 6b177196b29d external/bsd/dhcpcd/dist/src/dhcpcd.c
--- a/external/bsd/dhcpcd/dist/src/dhcpcd.c     Wed Apr 15 15:50:15 2020 +0000
+++ b/external/bsd/dhcpcd/dist/src/dhcpcd.c     Wed Apr 15 15:54:18 2020 +0000
@@ -2207,7 +2207,8 @@
                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__);



Home | Main Index | Thread Index | Old Index