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

Fix breakage of ipset on *BSD.

Browse Source 
Regression introduced in 98189ff988

Thanks to Harper Andrews for spotting this.
This commit is contained in:
Simon Kelley
2025-06-20 15:48:47 +01:00
parent a444715bf0
commit 2b19285724
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/config.h
View File

@@ -349,7 +349,6 @@ HAVE_SOCKADDR_SA_LEN
#endif #endif
#if !defined(HAVE_LINUX_NETWORK) #if !defined(HAVE_LINUX_NETWORK)
#undef HAVE_IPSET
#undef HAVE_NFTSET #undef HAVE_NFTSET
#endif #endif
@@ -357,6 +356,16 @@ HAVE_SOCKADDR_SA_LEN
#undef HAVE_IPSET #undef HAVE_IPSET
#endif #endif
#if defined(HAVE_IPSET)
# if defined(HAVE_LINUX_NETWORK)
# define HAVE_LINUX_IPSET
# elif defined(HAVE_BSD_NETWORK)
# define HAVE_BSD_IPSET
# else
# undef HAVE_IPSET
# endif
#endif
#ifdef NO_LOOP #ifdef NO_LOOP
#undef HAVE_LOOP #undef HAVE_LOOP
#endif #endif

2
src/ipset.c
View File

@@ -16,7 +16,7 @@
#include "dnsmasq.h" #include "dnsmasq.h"
#if defined(HAVE_IPSET) #if defined(HAVE_LINUX_IPSET)
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>

2
src/tables.c
View File

@@ -18,7 +18,7 @@
#include "dnsmasq.h" #include "dnsmasq.h"
#if defined(HAVE_IPSET) && defined(HAVE_BSD_NETWORK) #if defined(HAVE_BSD_IPSET)
#include <string.h> #include <string.h>