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

Handle building with script support enabled and DHCP disabled.

Browse Source
This commit is contained in:
Simon Kelley
2016-01-06 17:59:13 +00:00
parent d917275e48
commit 53a9173fc0
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/dnsmasq.c
View File

@@ -919,7 +919,10 @@ int main (int argc, char **argv)
poll_listen(piperead, POLLIN); poll_listen(piperead, POLLIN);
#ifdef HAVE_SCRIPT #ifdef HAVE_SCRIPT
# ifdef HAVE_DHCP
while (helper_buf_empty() && do_script_run(now)); while (helper_buf_empty() && do_script_run(now));
# endif
while (helper_buf_empty() && do_arp_script_run()); while (helper_buf_empty() && do_arp_script_run());
# ifdef HAVE_TFTP # ifdef HAVE_TFTP
@@ -930,7 +933,10 @@ int main (int argc, char **argv)
poll_listen(daemon->helperfd, POLLOUT); poll_listen(daemon->helperfd, POLLOUT);
#else #else
/* need this for other side-effects */ /* need this for other side-effects */
# ifdef HAVE_DHCP
while (do_script_run(now)); while (do_script_run(now));
# endif
while (do_arp_script_run(now)); while (do_arp_script_run(now));
# ifdef HAVE_TFTP # ifdef HAVE_TFTP
@@ -1312,7 +1318,7 @@ static void async_event(int pipe, time_t now)
if (daemon->tcp_pids[i] != 0) if (daemon->tcp_pids[i] != 0)
kill(daemon->tcp_pids[i], SIGALRM); kill(daemon->tcp_pids[i], SIGALRM);
#if defined(HAVE_SCRIPT) #if defined(HAVE_SCRIPT) && defined(HAVE_DHCP)
/* handle pending lease transitions */ /* handle pending lease transitions */
if (daemon->helperfd != -1) if (daemon->helperfd != -1)
{ {