Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
D
Dnsmasq
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nanahira
Dnsmasq
Commits
3ad3f3bb
Commit
3ad3f3bb
authored
Dec 16, 2014
by
Simon Kelley
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix breakage of --domain=<domain>,<subnet>,local
parent
ad946d55
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
2 deletions
+20
-2
CHANGELOG
CHANGELOG
+4
-0
src/option.c
src/option.c
+16
-2
No files found.
CHANGELOG
View file @
3ad3f3bb
...
@@ -10,6 +10,10 @@ version 2.73
...
@@ -10,6 +10,10 @@ version 2.73
Use inotify for checking on updates to /etc/resolv.conf and
Use inotify for checking on updates to /etc/resolv.conf and
friends under Linux. This fixes race conditions when the files are
friends under Linux. This fixes race conditions when the files are
updated rapidly and saves CPU by noy polling.
updated rapidly and saves CPU by noy polling.
Fix breakage of --domain=<domain>,<subnet>,local - only reverse
queries were intercepted. THis appears to have been broken
since 2.69. Thanks to Josh Stone for finding the bug.
version 2.72
version 2.72
...
...
src/option.c
View file @
3ad3f3bb
...
@@ -1941,10 +1941,17 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
...
@@ -1941,10 +1941,17 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
else
else
{
{
/* generate the equivalent of
/* generate the equivalent of
local=/<domain>/
local=/xxx.yyy.zzz.in-addr.arpa/ */
local=/xxx.yyy.zzz.in-addr.arpa/ */
struct
server
*
serv
=
add_rev4
(
new
->
start
,
msize
);
struct
server
*
serv
=
add_rev4
(
new
->
start
,
msize
);
serv
->
flags
|=
SERV_NO_ADDR
;
serv
->
flags
|=
SERV_NO_ADDR
;
/* local=/<domain>/ */
serv
=
opt_malloc
(
sizeof
(
struct
server
));
memset
(
serv
,
0
,
sizeof
(
struct
server
));
serv
->
domain
=
d
;
serv
->
flags
=
SERV_HAS_DOMAIN
|
SERV_NO_ADDR
;
serv
->
next
=
daemon
->
servers
;
daemon
->
servers
=
serv
;
}
}
}
}
}
}
...
@@ -1978,10 +1985,17 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
...
@@ -1978,10 +1985,17 @@ static int one_opt(int option, char *arg, char *errstr, char *gen_err, int comma
else
else
{
{
/* generate the equivalent of
/* generate the equivalent of
local=/<domain>/
local=/xxx.yyy.zzz.ip6.arpa/ */
local=/xxx.yyy.zzz.ip6.arpa/ */
struct
server
*
serv
=
add_rev6
(
&
new
->
start6
,
msize
);
struct
server
*
serv
=
add_rev6
(
&
new
->
start6
,
msize
);
serv
->
flags
|=
SERV_NO_ADDR
;
serv
->
flags
|=
SERV_NO_ADDR
;
/* local=/<domain>/ */
serv
=
opt_malloc
(
sizeof
(
struct
server
));
memset
(
serv
,
0
,
sizeof
(
struct
server
));
serv
->
domain
=
d
;
serv
->
flags
=
SERV_HAS_DOMAIN
|
SERV_NO_ADDR
;
serv
->
next
=
daemon
->
servers
;
daemon
->
servers
=
serv
;
}
}
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment