diff options
| author | Simon Kelley <simon@thekelleys.org.uk> | 2022-01-03 23:31:15 +0000 |
|---|---|---|
| committer | Simon Kelley <simon@thekelleys.org.uk> | 2022-01-03 23:31:15 +0000 |
| commit | 4165c1331bf2e82a5f6afeab3e7fb94aecf2b9d6 (patch) | |
| tree | b1e9fb36075d251c407b1ed216b2d2050af926ca | |
| parent | b2690415bfa1bc105e61b75f642fb5c1aaf0fae8 (diff) | |
| download | dnsmasq-4165c1331bf2e82a5f6afeab3e7fb94aecf2b9d6.tar.gz | |
Fix fail to build when NO_SCRIPT set.
| -rw-r--r-- | src/dnsmasq.c | 5 | ||||
| -rw-r--r-- | src/dnsmasq.h | 2 | ||||
| -rw-r--r-- | src/rfc3315.c | 4 |
3 files changed, 4 insertions, 7 deletions
diff --git a/src/dnsmasq.c b/src/dnsmasq.c index 422e40f..0de8d18 100644 --- a/src/dnsmasq.c +++ b/src/dnsmasq.c @@ -1161,11 +1161,6 @@ int main (int argc, char **argv) while (do_tftp_script_run()); # endif -# ifdef HAVE_DHCP6 - while (helper_buf_empty() && do_snoop_script_run()); -# endif - - #endif diff --git a/src/dnsmasq.h b/src/dnsmasq.h index ba09bd0..1b00298 100644 --- a/src/dnsmasq.h +++ b/src/dnsmasq.h @@ -1681,7 +1681,9 @@ void relay_upstream6(struct dhcp_relay *relay, ssize_t sz, struct in6_addr *peer u32 scope_id, time_t now); int relay_reply6( struct sockaddr_in6 *peer, ssize_t sz, char *arrival_interface); +# ifdef HAVE_SCRIPT int do_snoop_script_run(void); +# endif #endif /* dhcp-common.c */ diff --git a/src/rfc3315.c b/src/rfc3315.c index fb387a4..236df47 100644 --- a/src/rfc3315.c +++ b/src/rfc3315.c @@ -2277,9 +2277,9 @@ int relay_reply6(struct sockaddr_in6 *peer, ssize_t sz, char *arrival_interface) return 0; } +#ifdef HAVE_SCRIPT int do_snoop_script_run(void) { -#ifdef HAVE_SCRIPT struct dhcp_relay *relay; struct snoop_record *snoop; @@ -2293,9 +2293,9 @@ int do_snoop_script_run(void) queue_relay_snoop(&snoop->client, relay->iface_index, &snoop->prefix, snoop->prefix_len); return 1; } -#endif return 0; } +#endif #endif |