]> git.ipfire.org Git - thirdparty/dhcpcd.git/commitdiff
src/dhcpcd.c: fix build without fork or signals (#20)
authorFabrice Fontaine <fontaine.fabrice@gmail.com>
Sat, 26 Dec 2020 19:45:08 +0000 (20:45 +0100)
committerGitHub <noreply@github.com>
Sat, 26 Dec 2020 19:45:08 +0000 (19:45 +0000)
Since version 9.3.3 and commit a5348dd02c86fa940cd93f203d0aa974cae0563c,
build without fork or signals fails on:

dhcpcd.c: In function ‘main’:
dhcpcd.c:2261:3: error: label ‘start_master’ used but not defined
   goto start_master;
   ^~~~

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
src/dhcpcd.c

index 3acf72c3e9a521a306038bbe7d95022be343b8bf..1d34cdbb0469208ef5a3a2d4e81abda9d04a3e8f 100644 (file)
@@ -2310,10 +2310,10 @@ printpidfile:
        if (ctx.stdin_valid && freopen(_PATH_DEVNULL, "w", stdin) == NULL)
                logwarn("freopen stdin");
 
+#if defined(USE_SIGNALS) && !defined(THERE_IS_NO_FORK)
        if (!(ctx.options & DHCPCD_DAEMONISE))
                goto start_master;
 
-#if defined(USE_SIGNALS) && !defined(THERE_IS_NO_FORK)
        if (xsocketpair(AF_UNIX, SOCK_DGRAM | SOCK_CXNB, 0, fork_fd) == -1 ||
            (ctx.stderr_valid &&
            xsocketpair(AF_UNIX, SOCK_DGRAM | SOCK_CXNB, 0, stderr_fd) == -1))