From: Roy Marples <roy@marples.name>
Date: Mon, 25 Mar 2019 12:20:45 +0000 (+0000)
Subject: script: Fix prior when we have listeners but no script
X-Git-Tag: v7.2.0~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7925c17fede8601c0910a22fd92fe399cca76284;p=thirdparty%2Fdhcpcd.git

script: Fix prior when we have listeners but no script
---

diff --git a/src/script.c b/src/script.c
index 800c4c31..deeda527 100644
--- a/src/script.c
+++ b/src/script.c
@@ -704,7 +704,7 @@ script_runreason(const struct interface *ifp, const char *reason)
 	int status = 0;
 	struct fd_list *fd;
 
-	if (ifp->options->script == NULL ||
+	if (ifp->options->script == NULL &&
 	    TAILQ_FIRST(&ifp->ctx->control_fds) == NULL)
 		return 0;
 
@@ -715,9 +715,7 @@ script_runreason(const struct interface *ifp, const char *reason)
 		return -1;
 	}
 
-	if (ifp->options->script &&
-	    (ifp->options->script[0] == '\0' ||
-	    strcmp(ifp->options->script, "/dev/null") == 0))
+	if (ifp->options->script == NULL)
 		goto send_listeners;
 
 	argv[0] = ifp->options->script ? ifp->options->script : UNCONST(SCRIPT);