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

Fix empty domain in server option parsing when more than one domain is given

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
Dominik DL6ER
2021-08-20 13:05:35 +02:00
committed by Simon Kelley
parent 06d01f7ae4
commit 58cf958e41
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/option.c
View File

@@ -2700,11 +2700,6 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
{ {
if ((err = parse_server(arg, &serv_addr, &source_addr, interface, &flags))) if ((err = parse_server(arg, &serv_addr, &source_addr, interface, &flags)))
ret_err(err); ret_err(err);
/* server=//1.2.3.4 is special. */
if (strlen(domain) == 0 && lastdomain)
flags |= SERV_FOR_NODOTS;
} }
if (servers_only && option == 'S') if (servers_only && option == 'S')
@@ -2712,6 +2707,12 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
while (1) while (1)
{ {
/* server=//1.2.3.4 is special. */
if (strlen(domain) == 0 && lastdomain)
flags |= SERV_FOR_NODOTS;
else
flags &= ~SERV_FOR_NODOTS;
if (!add_update_server(flags, &serv_addr, &source_addr, interface, domain, &addr)) if (!add_update_server(flags, &serv_addr, &source_addr, interface, domain, &addr))
ret_err(gen_err); ret_err(gen_err);