pi-hole/FTL
1
0
Fork 0
mirror of https://github.com/pi-hole/FTL.git synced 2024-10-26 16:52:18 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix failed merge conflict resolution when adding dnsmasq v2.80

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2019-01-27 10:11:13 +01:00
parent d5f6509d84
commit fb103eaf9e
5 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dnsmasq/dhcp6.c
+1 -1
View File
@@ -668,7 +668,7 @@ static int construct_worker(struct in6_addr *local, int prefix,
setaddr6part(&end6, addr6part(&template->end6));
for (context = daemon->dhcp6; context; context = context->next)
if ((context->flags & CONTEXT_TEMPLATE) &&
if (!(context->flags & CONTEXT_TEMPLATE) &&
IN6_ARE_ADDR_EQUAL(&start6, &context->start6) &&
IN6_ARE_ADDR_EQUAL(&end6, &context->end6))
{
dnsmasq/inotify.c
+1
View File
@@ -237,6 +237,7 @@ int inotify_check(time_t now)
(in->name[0] == '#' && in->name[namelen - 1] == '#') ||
in->name[0] == '.')
continue;
for (res = daemon->resolv_files; res; res = res->next)
if (res->wd == in->wd && strcmp(res->file, in->name) == 0)
hit = 1;
dnsmasq/network.c
+5 -6
View File
@@ -1571,8 +1571,7 @@ void check_servers(void)
else if (strlen(serv->domain) == 0)
s1 = _("default"), s2 = "";
else
//s1 = _("domain"), s2 = serv->domain;
continue;
s1 = _("domain"), s2 = serv->domain;
if (serv->flags & SERV_NO_ADDR)
{
@@ -1596,10 +1595,10 @@ void check_servers(void)
}
}
// if (locals > LOCALS_LOGGED)
// my_syslog(LOG_INFO, _("using %d more local addresses"), locals - LOCALS_LOGGED);
// if (count - 1 > SERVERS_LOGGED)
// my_syslog(LOG_INFO, _("using %d more nameservers"), count - SERVERS_LOGGED - 1);
if (locals > LOCALS_LOGGED)
my_syslog(LOG_INFO, _("using %d more local addresses"), locals - LOCALS_LOGGED);
if (count - 1 > SERVERS_LOGGED)
my_syslog(LOG_INFO, _("using %d more nameservers"), count - SERVERS_LOGGED - 1);
/* Remove unused sfds */
for (sfd = daemon->sfds, up = &daemon->sfds; sfd; sfd = tmp)
dnsmasq/rfc1035.c
+2 -2
View File
@@ -1725,8 +1725,8 @@ size_t answer_request(struct dns_header *header, char *limit, size_t qlen,
nxdomain = 1;
if (!dryrun)
{
log_query(crecp->flags, name, NULL, record_source(crecp->uid));
FTL_cache(crecp->flags, name, NULL, record_source(crecp->uid), daemon->log_display_id);
log_query(crecp->flags, name, NULL, NULL);
FTL_cache(crecp->flags, name, NULL, NULL, daemon->log_display_id);
}
}
else
dnsmasq/util.c
-1
View File
@@ -294,7 +294,6 @@ void safe_strncpy(char *dest, const char *src, size_t size)
}
}
void safe_pipe(int *fd, int read_noblock)
{
if (pipe(fd) == -1 ||