Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-19 10:18:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correct logic for when to start helper.

Browse Source
This commit is contained in:
Simon Kelley
2015-12-31 16:18:11 +00:00
parent 33702ab1f8
commit 97b1d25764
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/dnsmasq.c
View File

@@ -249,7 +249,7 @@ int main (int argc, char **argv)
The script subsystrm relies on DHCP buffers, hence the last two The script subsystrm relies on DHCP buffers, hence the last two
conditions below. */ conditions below. */
if (daemon->dhcp || daemon->doing_dhcp6 || daemon->relay4 || if (daemon->dhcp || daemon->doing_dhcp6 || daemon->relay4 ||
daemon->relay6 || option_bool(OPT_TFTP) || option_bool(OPT_ADD_MAC)) daemon->relay6 || option_bool(OPT_TFTP) || option_bool(OPT_DNS_CLIENT))
{ {
dhcp_common_init(); dhcp_common_init();
if (daemon->dhcp || daemon->doing_dhcp6) if (daemon->dhcp || daemon->doing_dhcp6)
@@ -556,7 +556,7 @@ int main (int argc, char **argv)
/* if we are to run scripts, we need to fork a helper before dropping root. */ /* if we are to run scripts, we need to fork a helper before dropping root. */
daemon->helperfd = -1; daemon->helperfd = -1;
#ifdef HAVE_SCRIPT #ifdef HAVE_SCRIPT
if ((daemon->dhcp || daemon->dhcp6 || option_bool(OPT_TFTP) || option_bool(OPT_ADD_MAC)) && if ((daemon->dhcp || daemon->dhcp6 || option_bool(OPT_TFTP) || option_bool(OPT_DNS_CLIENT)) &&
(daemon->lease_change_command || daemon->luascript)) (daemon->lease_change_command || daemon->luascript))
daemon->helperfd = create_helper(pipewrite, err_pipe[1], script_uid, script_gid, max_fd); daemon->helperfd = create_helper(pipewrite, err_pipe[1], script_uid, script_gid, max_fd);
#endif #endif