|
|
@@ -14,7 +14,7 @@ Signed-off-by: Kevin Darbyshire-Bryant <[email protected]>
|
|
|
|
|
|
--- a/src/dnsmasq.c
|
|
|
+++ b/src/dnsmasq.c
|
|
|
-@@ -94,10 +94,6 @@ int main (int argc, char **argv)
|
|
|
+@@ -95,10 +95,6 @@ int main (int argc, char **argv)
|
|
|
|
|
|
read_opts(argc, argv, compile_opts);
|
|
|
|
|
|
@@ -27,7 +27,7 @@ Signed-off-by: Kevin Darbyshire-Bryant <[email protected]>
|
|
|
|
|
|
--- a/src/dnsmasq.h
|
|
|
+++ b/src/dnsmasq.h
|
|
|
-@@ -1110,7 +1110,7 @@ extern struct daemon {
|
|
|
+@@ -1112,7 +1112,7 @@ extern struct daemon {
|
|
|
int inotifyfd;
|
|
|
#endif
|
|
|
#if defined(HAVE_LINUX_NETWORK)
|
|
|
@@ -36,7 +36,7 @@ Signed-off-by: Kevin Darbyshire-Bryant <[email protected]>
|
|
|
#elif defined(HAVE_BSD_NETWORK)
|
|
|
int dhcp_raw_fd, dhcp_icmp_fd, routefd;
|
|
|
#endif
|
|
|
-@@ -1290,9 +1290,6 @@ int read_write(int fd, unsigned char *pa
|
|
|
+@@ -1292,9 +1292,6 @@ int read_write(int fd, unsigned char *pa
|
|
|
void close_fds(long max_fd, int spare1, int spare2, int spare3);
|
|
|
int wildcard_match(const char* wildcard, const char* match);
|
|
|
int wildcard_matchn(const char* wildcard, const char* match, int num);
|
|
|
@@ -141,16 +141,16 @@ Signed-off-by: Kevin Darbyshire-Bryant <[email protected]>
|
|
|
my_syslog(LOG_ERR, _("failed to update ipset %s: %s"), setname, strerror(errno));
|
|
|
--- a/src/netlink.c
|
|
|
+++ b/src/netlink.c
|
|
|
-@@ -82,8 +82,7 @@ void netlink_init(void)
|
|
|
- }
|
|
|
+@@ -92,8 +92,7 @@ char *netlink_init(void)
|
|
|
+ iov.iov_len = 100;
|
|
|
+ iov.iov_base = safe_malloc(iov.iov_len);
|
|
|
|
|
|
- if (daemon->netlinkfd == -1 ||
|
|
|
-- (daemon->kernel_version >= KERNEL_VERSION(2,6,30) &&
|
|
|
-- setsockopt(daemon->netlinkfd, SOL_NETLINK, NETLINK_NO_ENOBUFS, &opt, sizeof(opt)) == -1) ||
|
|
|
-+ (setsockopt(daemon->netlinkfd, SOL_NETLINK, NETLINK_NO_ENOBUFS, &opt, sizeof(opt)) == -1) ||
|
|
|
- getsockname(daemon->netlinkfd, (struct sockaddr *)&addr, &slen) == -1)
|
|
|
- die(_("cannot create netlink socket: %s"), NULL, EC_MISC);
|
|
|
+- if (daemon->kernel_version >= KERNEL_VERSION(2,6,30) &&
|
|
|
+- setsockopt(daemon->netlinkfd, SOL_NETLINK, NETLINK_NO_ENOBUFS, &opt, sizeof(opt)) == -1)
|
|
|
++ if (setsockopt(daemon->netlinkfd, SOL_NETLINK, NETLINK_NO_ENOBUFS, &opt, sizeof(opt)) == -1)
|
|
|
+ return _("warning: failed to set NETLINK_NO_ENOBUFS on netlink socket");
|
|
|
|
|
|
+ return NULL;
|
|
|
--- a/src/util.c
|
|
|
+++ b/src/util.c
|
|
|
@@ -786,22 +786,3 @@ int wildcard_matchn(const char* wildcard
|