Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
BIND
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
582
Issues
582
List
Boards
Labels
Service Desk
Milestones
Merge Requests
110
Merge Requests
110
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
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
ISC Open Source Projects
BIND
Commits
31b7a2fe
Commit
31b7a2fe
authored
Jan 21, 2009
by
Mark Andrews
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
2534. [func] Check NAPTR records regular expressions and
replacement strings to ensure they are syntaxically valid and consistant. [RT #18168]
parent
9fbbfb57
Changes
21
Hide whitespace changes
Inline
Side-by-side
Showing
21 changed files
with
171 additions
and
36 deletions
+171
-36
CHANGES
CHANGES
+4
-0
bin/tests/system/genzone.sh
bin/tests/system/genzone.sh
+3
-3
bin/tests/system/notify/ns2/example1.db
bin/tests/system/notify/ns2/example1.db
+2
-2
bin/tests/system/notify/ns2/example2.db
bin/tests/system/notify/ns2/example2.db
+2
-2
bin/tests/system/notify/ns2/example3.db
bin/tests/system/notify/ns2/example3.db
+2
-2
bin/tests/system/notify/ns2/example4.db
bin/tests/system/notify/ns2/example4.db
+2
-2
bin/tests/system/nsupdate/knowngood.ns1.after
bin/tests/system/nsupdate/knowngood.ns1.after
+1
-1
bin/tests/system/nsupdate/knowngood.ns1.before
bin/tests/system/nsupdate/knowngood.ns1.before
+1
-1
bin/tests/system/nsupdate/ns1/example1.db
bin/tests/system/nsupdate/ns1/example1.db
+2
-2
bin/tests/system/relay/ns2/example1.db
bin/tests/system/relay/ns2/example1.db
+2
-2
bin/tests/system/relay/ns2/example2.db
bin/tests/system/relay/ns2/example2.db
+2
-2
bin/tests/system/relay/ns2/example3.db
bin/tests/system/relay/ns2/example3.db
+2
-2
bin/tests/system/relay/ns2/example4.db
bin/tests/system/relay/ns2/example4.db
+2
-2
bin/tests/system/tsig/ns1/example.db
bin/tests/system/tsig/ns1/example.db
+2
-2
bin/tests/system/xfer/dig1.good
bin/tests/system/xfer/dig1.good
+1
-1
bin/tests/system/xfer/dig2.good
bin/tests/system/xfer/dig2.good
+1
-1
bin/tests/system/xferquota/ns2/example.db
bin/tests/system/xferquota/ns2/example.db
+2
-2
config.h.in
config.h.in
+4
-1
configure
configure
+4
-3
configure.in
configure.in
+2
-2
lib/dns/rdata/in_1/naptr_35.c
lib/dns/rdata/in_1/naptr_35.c
+128
-1
No files found.
CHANGES
View file @
31b7a2fe
2534. [func] Check NAPTR records regular expressions and
replacement strings to ensure they are syntaxically
valid and consistant. [RT #18168]
2533. [doc] ARM: document @ (at-sign). [RT #17144]
2533. [doc] ARM: document @ (at-sign). [RT #17144]
2532. [bug] dig: check the question section of the response to
2532. [bug] dig: check the question section of the response to
...
...
bin/tests/system/genzone.sh
View file @
31b7a2fe
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# PERFORMANCE OF THIS SOFTWARE.
# $Id: genzone.sh,v 1.
8 2007/06/19 23:47:00 tbox
Exp $
# $Id: genzone.sh,v 1.
9 2009/01/21 05:36:44 marka
Exp $
#
#
# Set up a test zone
# Set up a test zone
...
@@ -193,8 +193,8 @@ srv02 SRV 65535 65535 65535 old-slow-box
...
@@ -193,8 +193,8 @@ srv02 SRV 65535 65535 65535 old-slow-box
; type 35
; type 35
naptr01 NAPTR 0 0 "" "" "" .
naptr01 NAPTR 0 0 "" "" "" .
naptr02 NAPTR 65535 65535 blurgh blorf bl
egh
foo.
naptr02 NAPTR 65535 65535 blurgh blorf bl
llbb
foo.
naptr02 NAPTR 65535 65535 "blurgh" "blorf" "bl
egh
" foo.
naptr02 NAPTR 65535 65535 "blurgh" "blorf" "bl
llbb
" foo.
; type 36
; type 36
kx01 KX 10 kdc
kx01 KX 10 kdc
...
...
bin/tests/system/notify/ns2/example1.db
View file @
31b7a2fe
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
; PERFORMANCE OF THIS SOFTWARE.
; PERFORMANCE OF THIS SOFTWARE.
; $Id: example1.db,v 1.1
2 2007/06/19 23:47:04 tbox
Exp $
; $Id: example1.db,v 1.1
3 2009/01/21 05:36:44 marka
Exp $
$ORIGIN .
$ORIGIN .
$TTL 300 ; 5 minutes
$TTL 300 ; 5 minutes
...
@@ -93,7 +93,7 @@ mr02 MR .
...
@@ -93,7 +93,7 @@ mr02 MR .
mx01 MX 10 mail
mx01 MX 10 mail
mx02 MX 10 .
mx02 MX 10 .
naptr01 NAPTR 0 0 "" "" "" .
naptr01 NAPTR 0 0 "" "" "" .
naptr02 NAPTR 65535 65535 "blurgh" "blorf" "bl
egh
" foo.
naptr02 NAPTR 65535 65535 "blurgh" "blorf" "bl
llbb
" foo.
nsap-ptr01 NSAP-PTR foo.
nsap-ptr01 NSAP-PTR foo.
NSAP-PTR .
NSAP-PTR .
nsap01 NSAP 0x47000580005a0000000001e133ffffff00016100
nsap01 NSAP 0x47000580005a0000000001e133ffffff00016100
...
...
bin/tests/system/notify/ns2/example2.db
View file @
31b7a2fe
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
; PERFORMANCE OF THIS SOFTWARE.
; PERFORMANCE OF THIS SOFTWARE.
; $Id: example2.db,v 1.1
2 2007/06/19 23:47:04 tbox
Exp $
; $Id: example2.db,v 1.1
3 2009/01/21 05:36:44 marka
Exp $
$ORIGIN .
$ORIGIN .
$TTL 300 ; 5 minutes
$TTL 300 ; 5 minutes
...
@@ -93,7 +93,7 @@ mr02 MR .
...
@@ -93,7 +93,7 @@ mr02 MR .
mx01 MX 10 mail
mx01 MX 10 mail
mx02 MX 10 .
mx02 MX 10 .
naptr01 NAPTR 0 0 "" "" "" .
naptr01 NAPTR 0 0 "" "" "" .
naptr02 NAPTR 65535 65535 "blurgh" "blorf" "bl
egh
" foo.
naptr02 NAPTR 65535 65535 "blurgh" "blorf" "bl
llbb
" foo.
nsap-ptr01 NSAP-PTR foo.
nsap-ptr01 NSAP-PTR foo.
NSAP-PTR .
NSAP-PTR .
nsap01 NSAP 0x47000580005a0000000001e133ffffff00016100
nsap01 NSAP 0x47000580005a0000000001e133ffffff00016100
...
...
bin/tests/system/notify/ns2/example3.db
View file @
31b7a2fe
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
; PERFORMANCE OF THIS SOFTWARE.
; PERFORMANCE OF THIS SOFTWARE.
; $Id: example3.db,v 1.1
2 2007/06/19 23:47:04 tbox
Exp $
; $Id: example3.db,v 1.1
3 2009/01/21 05:36:44 marka
Exp $
$ORIGIN .
$ORIGIN .
$TTL 300 ; 5 minutes
$TTL 300 ; 5 minutes
...
@@ -93,7 +93,7 @@ mr02 MR .
...
@@ -93,7 +93,7 @@ mr02 MR .
mx01 MX 10 mail
mx01 MX 10 mail
mx02 MX 10 .
mx02 MX 10 .
naptr01 NAPTR 0 0 "" "" "" .
naptr01 NAPTR 0 0 "" "" "" .
naptr02 NAPTR 65535 65535 "blurgh" "blorf" "bl
egh
" foo.
naptr02 NAPTR 65535 65535 "blurgh" "blorf" "bl
llbb
" foo.
nsap-ptr01 NSAP-PTR foo.
nsap-ptr01 NSAP-PTR foo.
NSAP-PTR .
NSAP-PTR .
nsap01 NSAP 0x47000580005a0000000001e133ffffff00016100
nsap01 NSAP 0x47000580005a0000000001e133ffffff00016100
...
...
bin/tests/system/notify/ns2/example4.db
View file @
31b7a2fe
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
; PERFORMANCE OF THIS SOFTWARE.
; PERFORMANCE OF THIS SOFTWARE.
; $Id: example4.db,v 1.1
2 2007/06/19 23:47:04 tbox
Exp $
; $Id: example4.db,v 1.1
3 2009/01/21 05:36:44 marka
Exp $
$ORIGIN .
$ORIGIN .
$TTL 300 ; 5 minutes
$TTL 300 ; 5 minutes
...
@@ -93,7 +93,7 @@ mr02 MR .
...
@@ -93,7 +93,7 @@ mr02 MR .
mx01 MX 10 mail
mx01 MX 10 mail
mx02 MX 10 .
mx02 MX 10 .
naptr01 NAPTR 0 0 "" "" "" .
naptr01 NAPTR 0 0 "" "" "" .
naptr02 NAPTR 65535 65535 "blurgh" "blorf" "bl
egh
" foo.
naptr02 NAPTR 65535 65535 "blurgh" "blorf" "bl
llbb
" foo.
nsap-ptr01 NSAP-PTR foo.
nsap-ptr01 NSAP-PTR foo.
NSAP-PTR .
NSAP-PTR .
nsap01 NSAP 0x47000580005a0000000001e133ffffff00016100
nsap01 NSAP 0x47000580005a0000000001e133ffffff00016100
...
...
bin/tests/system/nsupdate/knowngood.ns1.after
View file @
31b7a2fe
...
@@ -52,7 +52,7 @@ mr02.example.nil. 3600 IN MR .
...
@@ -52,7 +52,7 @@ mr02.example.nil. 3600 IN MR .
mx01.example.nil. 3600 IN MX 10 mail.example.nil.
mx01.example.nil. 3600 IN MX 10 mail.example.nil.
mx02.example.nil. 3600 IN MX 10 .
mx02.example.nil. 3600 IN MX 10 .
naptr01.example.nil. 3600 IN NAPTR 0 0 "" "" "" .
naptr01.example.nil. 3600 IN NAPTR 0 0 "" "" "" .
naptr02.example.nil. 3600 IN NAPTR 65535 65535 "blurgh" "blorf" "bl
egh
" foo.
naptr02.example.nil. 3600 IN NAPTR 65535 65535 "blurgh" "blorf" "bl
llbb
" foo.
ns1.example.nil. 300 IN A 10.53.0.1
ns1.example.nil. 300 IN A 10.53.0.1
ns2.example.nil. 300 IN A 10.53.0.2
ns2.example.nil. 300 IN A 10.53.0.2
nsap-ptr01.example.nil. 3600 IN NSAP-PTR .
nsap-ptr01.example.nil. 3600 IN NSAP-PTR .
...
...
bin/tests/system/nsupdate/knowngood.ns1.before
View file @
31b7a2fe
...
@@ -52,7 +52,7 @@ mr02.example.nil. 3600 IN MR .
...
@@ -52,7 +52,7 @@ mr02.example.nil. 3600 IN MR .
mx01.example.nil. 3600 IN MX 10 mail.example.nil.
mx01.example.nil. 3600 IN MX 10 mail.example.nil.
mx02.example.nil. 3600 IN MX 10 .
mx02.example.nil. 3600 IN MX 10 .
naptr01.example.nil. 3600 IN NAPTR 0 0 "" "" "" .
naptr01.example.nil. 3600 IN NAPTR 0 0 "" "" "" .
naptr02.example.nil. 3600 IN NAPTR 65535 65535 "blurgh" "blorf" "bl
egh
" foo.
naptr02.example.nil. 3600 IN NAPTR 65535 65535 "blurgh" "blorf" "bl
llbb
" foo.
ns1.example.nil. 300 IN A 10.53.0.1
ns1.example.nil. 300 IN A 10.53.0.1
ns2.example.nil. 300 IN A 10.53.0.2
ns2.example.nil. 300 IN A 10.53.0.2
nsap-ptr01.example.nil. 3600 IN NSAP-PTR .
nsap-ptr01.example.nil. 3600 IN NSAP-PTR .
...
...
bin/tests/system/nsupdate/ns1/example1.db
View file @
31b7a2fe
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
; PERFORMANCE OF THIS SOFTWARE.
; PERFORMANCE OF THIS SOFTWARE.
; $Id: example1.db,v 1.
8 2007/06/19 23:47:04 tbox
Exp $
; $Id: example1.db,v 1.
9 2009/01/21 05:36:45 marka
Exp $
$ORIGIN .
$ORIGIN .
$TTL 300 ; 5 minutes
$TTL 300 ; 5 minutes
...
@@ -95,7 +95,7 @@ mr02 MR .
...
@@ -95,7 +95,7 @@ mr02 MR .
mx01 MX 10 mail
mx01 MX 10 mail
mx02 MX 10 .
mx02 MX 10 .
naptr01 NAPTR 0 0 "" "" "" .
naptr01 NAPTR 0 0 "" "" "" .
naptr02 NAPTR 65535 65535 "blurgh" "blorf" "bl
egh
" foo.
naptr02 NAPTR 65535 65535 "blurgh" "blorf" "bl
llbb
" foo.
nsap-ptr01 NSAP-PTR foo.
nsap-ptr01 NSAP-PTR foo.
NSAP-PTR .
NSAP-PTR .
nsap01 NSAP 0x47000580005a0000000001e133ffffff00016100
nsap01 NSAP 0x47000580005a0000000001e133ffffff00016100
...
...
bin/tests/system/relay/ns2/example1.db
View file @
31b7a2fe
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
; PERFORMANCE OF THIS SOFTWARE.
; PERFORMANCE OF THIS SOFTWARE.
; $Id: example1.db,v 1.
7 2007/06/19 23:47:04 tbox
Exp $
; $Id: example1.db,v 1.
8 2009/01/21 05:36:45 marka
Exp $
$ORIGIN .
$ORIGIN .
$TTL 300 ; 5 minutes
$TTL 300 ; 5 minutes
...
@@ -93,7 +93,7 @@ mr02 MR .
...
@@ -93,7 +93,7 @@ mr02 MR .
mx01 MX 10 mail
mx01 MX 10 mail
mx02 MX 10 .
mx02 MX 10 .
naptr01 NAPTR 0 0 "" "" "" .
naptr01 NAPTR 0 0 "" "" "" .
naptr02 NAPTR 65535 65535 "blurgh" "blorf" "bl
egh
" foo.
naptr02 NAPTR 65535 65535 "blurgh" "blorf" "bl
llbb
" foo.
nsap-ptr01 NSAP-PTR foo.
nsap-ptr01 NSAP-PTR foo.
NSAP-PTR .
NSAP-PTR .
nsap01 NSAP 0x47000580005a0000000001e133ffffff00016100
nsap01 NSAP 0x47000580005a0000000001e133ffffff00016100
...
...
bin/tests/system/relay/ns2/example2.db
View file @
31b7a2fe
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
; PERFORMANCE OF THIS SOFTWARE.
; PERFORMANCE OF THIS SOFTWARE.
; $Id: example2.db,v 1.
7 2007/06/19 23:47:04 tbox
Exp $
; $Id: example2.db,v 1.
8 2009/01/21 05:36:45 marka
Exp $
$ORIGIN .
$ORIGIN .
$TTL 300 ; 5 minutes
$TTL 300 ; 5 minutes
...
@@ -93,7 +93,7 @@ mr02 MR .
...
@@ -93,7 +93,7 @@ mr02 MR .
mx01 MX 10 mail
mx01 MX 10 mail
mx02 MX 10 .
mx02 MX 10 .
naptr01 NAPTR 0 0 "" "" "" .
naptr01 NAPTR 0 0 "" "" "" .
naptr02 NAPTR 65535 65535 "blurgh" "blorf" "bl
egh
" foo.
naptr02 NAPTR 65535 65535 "blurgh" "blorf" "bl
llbb
" foo.
nsap-ptr01 NSAP-PTR foo.
nsap-ptr01 NSAP-PTR foo.
NSAP-PTR .
NSAP-PTR .
nsap01 NSAP 0x47000580005a0000000001e133ffffff00016100
nsap01 NSAP 0x47000580005a0000000001e133ffffff00016100
...
...
bin/tests/system/relay/ns2/example3.db
View file @
31b7a2fe
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
; PERFORMANCE OF THIS SOFTWARE.
; PERFORMANCE OF THIS SOFTWARE.
; $Id: example3.db,v 1.
7 2007/06/19 23:47:04 tbox
Exp $
; $Id: example3.db,v 1.
8 2009/01/21 05:36:45 marka
Exp $
$ORIGIN .
$ORIGIN .
$TTL 300 ; 5 minutes
$TTL 300 ; 5 minutes
...
@@ -93,7 +93,7 @@ mr02 MR .
...
@@ -93,7 +93,7 @@ mr02 MR .
mx01 MX 10 mail
mx01 MX 10 mail
mx02 MX 10 .
mx02 MX 10 .
naptr01 NAPTR 0 0 "" "" "" .
naptr01 NAPTR 0 0 "" "" "" .
naptr02 NAPTR 65535 65535 "blurgh" "blorf" "bl
egh
" foo.
naptr02 NAPTR 65535 65535 "blurgh" "blorf" "bl
llbb
" foo.
nsap-ptr01 NSAP-PTR foo.
nsap-ptr01 NSAP-PTR foo.
NSAP-PTR .
NSAP-PTR .
nsap01 NSAP 0x47000580005a0000000001e133ffffff00016100
nsap01 NSAP 0x47000580005a0000000001e133ffffff00016100
...
...
bin/tests/system/relay/ns2/example4.db
View file @
31b7a2fe
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
; PERFORMANCE OF THIS SOFTWARE.
; PERFORMANCE OF THIS SOFTWARE.
; $Id: example4.db,v 1.
7 2007/06/19 23:47:04 tbox
Exp $
; $Id: example4.db,v 1.
8 2009/01/21 05:36:45 marka
Exp $
$ORIGIN .
$ORIGIN .
$TTL 300 ; 5 minutes
$TTL 300 ; 5 minutes
...
@@ -93,7 +93,7 @@ mr02 MR .
...
@@ -93,7 +93,7 @@ mr02 MR .
mx01 MX 10 mail
mx01 MX 10 mail
mx02 MX 10 .
mx02 MX 10 .
naptr01 NAPTR 0 0 "" "" "" .
naptr01 NAPTR 0 0 "" "" "" .
naptr02 NAPTR 65535 65535 "blurgh" "blorf" "bl
egh
" foo.
naptr02 NAPTR 65535 65535 "blurgh" "blorf" "bl
llbb
" foo.
nsap-ptr01 NSAP-PTR foo.
nsap-ptr01 NSAP-PTR foo.
NSAP-PTR .
NSAP-PTR .
nsap01 NSAP 0x47000580005a0000000001e133ffffff00016100
nsap01 NSAP 0x47000580005a0000000001e133ffffff00016100
...
...
bin/tests/system/tsig/ns1/example.db
View file @
31b7a2fe
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
; PERFORMANCE OF THIS SOFTWARE.
; PERFORMANCE OF THIS SOFTWARE.
; $Id: example.db,v 1.
5 2007/06/19 23:47:06 tbox
Exp $
; $Id: example.db,v 1.
6 2009/01/21 05:36:45 marka
Exp $
$ORIGIN .
$ORIGIN .
$TTL 300 ; 5 minutes
$TTL 300 ; 5 minutes
...
@@ -94,7 +94,7 @@ mr02 MR .
...
@@ -94,7 +94,7 @@ mr02 MR .
mx01 MX 10 mail
mx01 MX 10 mail
mx02 MX 10 .
mx02 MX 10 .
naptr01 NAPTR 0 0 "" "" "" .
naptr01 NAPTR 0 0 "" "" "" .
naptr02 NAPTR 65535 65535 "blurgh" "blorf" "
blegh
" foo.
naptr02 NAPTR 65535 65535 "blurgh" "blorf" "
:(.*):\\1:
" foo.
nsap-ptr01 NSAP-PTR foo.
nsap-ptr01 NSAP-PTR foo.
NSAP-PTR .
NSAP-PTR .
nsap01 NSAP 0x47000580005a0000000001e133ffffff00016100
nsap01 NSAP 0x47000580005a0000000001e133ffffff00016100
...
...
bin/tests/system/xfer/dig1.good
View file @
31b7a2fe
...
@@ -40,7 +40,7 @@ mr02.example. 3600 IN MR .
...
@@ -40,7 +40,7 @@ mr02.example. 3600 IN MR .
mx01.example. 3600 IN MX 10 mail.example.
mx01.example. 3600 IN MX 10 mail.example.
mx02.example. 3600 IN MX 10 .
mx02.example. 3600 IN MX 10 .
naptr01.example. 3600 IN NAPTR 0 0 "" "" "" .
naptr01.example. 3600 IN NAPTR 0 0 "" "" "" .
naptr02.example. 3600 IN NAPTR 65535 65535 "blurgh" "blorf" "bl
egh
" foo.
naptr02.example. 3600 IN NAPTR 65535 65535 "blurgh" "blorf" "bl
llbb
" foo.
ns2.example. 3600 IN A 10.53.0.2
ns2.example. 3600 IN A 10.53.0.2
ns3.example. 3600 IN A 10.53.0.3
ns3.example. 3600 IN A 10.53.0.3
nsap-ptr01.example. 3600 IN NSAP-PTR .
nsap-ptr01.example. 3600 IN NSAP-PTR .
...
...
bin/tests/system/xfer/dig2.good
View file @
31b7a2fe
...
@@ -40,7 +40,7 @@ mr02.example. 3600 IN MR .
...
@@ -40,7 +40,7 @@ mr02.example. 3600 IN MR .
mx01.example. 3600 IN MX 10 mail.example.
mx01.example. 3600 IN MX 10 mail.example.
mx02.example. 3600 IN MX 10 .
mx02.example. 3600 IN MX 10 .
naptr01.example. 3600 IN NAPTR 0 0 "" "" "" .
naptr01.example. 3600 IN NAPTR 0 0 "" "" "" .
naptr02.example. 3600 IN NAPTR 65535 65535 "blurgh" "blorf" "bl
egh
" foo.
naptr02.example. 3600 IN NAPTR 65535 65535 "blurgh" "blorf" "bl
llbb
" foo.
ns2.example. 3600 IN A 10.53.0.2
ns2.example. 3600 IN A 10.53.0.2
ns3.example. 3600 IN A 10.53.0.3
ns3.example. 3600 IN A 10.53.0.3
nsap-ptr01.example. 3600 IN NSAP-PTR .
nsap-ptr01.example. 3600 IN NSAP-PTR .
...
...
bin/tests/system/xferquota/ns2/example.db
View file @
31b7a2fe
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
; OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
; PERFORMANCE OF THIS SOFTWARE.
; PERFORMANCE OF THIS SOFTWARE.
; $Id: example.db,v 1.1
2 2007/06/19 23:47:07 tbox
Exp $
; $Id: example.db,v 1.1
3 2009/01/21 05:36:45 marka
Exp $
$ORIGIN .
$ORIGIN .
$TTL 300 ; 5 minutes
$TTL 300 ; 5 minutes
...
@@ -95,7 +95,7 @@ mr02 MR .
...
@@ -95,7 +95,7 @@ mr02 MR .
mx01 MX 10 mail
mx01 MX 10 mail
mx02 MX 10 .
mx02 MX 10 .
naptr01 NAPTR 0 0 "" "" "" .
naptr01 NAPTR 0 0 "" "" "" .
naptr02 NAPTR 65535 65535 "blurgh" "blorf" "
blegh
" foo.
naptr02 NAPTR 65535 65535 "blurgh" "blorf" "
:(.*):\\1:
" foo.
nsap-ptr01 NSAP-PTR foo.
nsap-ptr01 NSAP-PTR foo.
NSAP-PTR .
NSAP-PTR .
nsap01 NSAP 0x47000580005a0000000001e133ffffff00016100
nsap01 NSAP 0x47000580005a0000000001e133ffffff00016100
...
...
config.h.in
View file @
31b7a2fe
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
* PERFORMANCE OF THIS SOFTWARE.
* PERFORMANCE OF THIS SOFTWARE.
*/
*/
/* $Id: config.h.in,v 1.11
2 2009/01/19 01:39:50
marka Exp $ */
/* $Id: config.h.in,v 1.11
4 2009/02/15 22:54:29
marka Exp $ */
/*! \file */
/*! \file */
...
@@ -217,6 +217,9 @@ int sigwait(const unsigned int *set, int *sig);
...
@@ -217,6 +217,9 @@ int sigwait(const unsigned int *set, int *sig);
/* Define to 1 if you have the <net/if6.h> header file. */
/* Define to 1 if you have the <net/if6.h> header file. */
#undef HAVE_NET_IF6_H
#undef HAVE_NET_IF6_H
/* Define to 1 if you have the <regex.h> header file. */
#undef HAVE_REGEX_H
/* Define to 1 if you have the `setlocale' function. */
/* Define to 1 if you have the `setlocale' function. */
#undef HAVE_SETLOCALE
#undef HAVE_SETLOCALE
...
...
configure
View file @
31b7a2fe
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# PERFORMANCE OF THIS SOFTWARE.
#
#
# $Id: configure,v 1.45
0 2009/01/19 01:39:50
marka Exp $
# $Id: configure,v 1.45
1 2009/01/21 05:37:55
marka Exp $
#
#
# Portions Copyright (C) 1996-2001 Nominum, Inc.
# Portions Copyright (C) 1996-2001 Nominum, Inc.
#
#
...
@@ -29,7 +29,7 @@
...
@@ -29,7 +29,7 @@
# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
# From configure.in Revision: 1.46
5
.
# From configure.in Revision: 1.46
6
.
# Guess values for system-dependent variables and create Makefiles.
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.62.
# Generated by GNU Autoconf 2.62.
#
#
...
@@ -20775,7 +20775,8 @@ fi
...
@@ -20775,7 +20775,8 @@ fi
for ac_header in fcntl.h sys/time.h unistd.h sys/sockio.h sys/select.h sys/param.h sys/sysctl.h net/if6.h
for ac_header in fcntl.h regex.h sys/time.h unistd.h sys/sockio.h sys/select.h sys/param.h sys/sysctl.h net/if6.h
do
do
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
configure.in
View file @
31b7a2fe
...
@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(1)dnl
...
@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(1)dnl
esyscmd([sed "s/^/# /" COPYRIGHT])dnl
esyscmd([sed "s/^/# /" COPYRIGHT])dnl
AC_DIVERT_POP()dnl
AC_DIVERT_POP()dnl
AC_REVISION($Revision: 1.46
5
$)
AC_REVISION($Revision: 1.46
6
$)
AC_INIT(lib/dns/name.c)
AC_INIT(lib/dns/name.c)
AC_PREREQ(2.59)
AC_PREREQ(2.59)
...
@@ -257,7 +257,7 @@ esac
...
@@ -257,7 +257,7 @@ esac
AC_HEADER_STDC
AC_HEADER_STDC
AC_CHECK_HEADERS(fcntl.h sys/time.h unistd.h sys/sockio.h sys/select.h sys/param.h sys/sysctl.h net/if6.h,,,
AC_CHECK_HEADERS(fcntl.h
regex.h
sys/time.h unistd.h sys/sockio.h sys/select.h sys/param.h sys/sysctl.h net/if6.h,,,
[$ac_includes_default
[$ac_includes_default
#ifdef HAVE_SYS_PARAM_H
#ifdef HAVE_SYS_PARAM_H
# include <sys/param.h>
# include <sys/param.h>
...
...
lib/dns/rdata/in_1/naptr_35.c
View file @
31b7a2fe
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
* PERFORMANCE OF THIS SOFTWARE.
*/
*/
/* $Id: naptr_35.c,v 1.5
3 2008/02/15 23:46:51 tbox
Exp $ */
/* $Id: naptr_35.c,v 1.5
4 2009/01/21 05:36:45 marka
Exp $ */
/* Reviewed: Thu Mar 16 16:52:50 PST 2000 by bwelling */
/* Reviewed: Thu Mar 16 16:52:50 PST 2000 by bwelling */
...
@@ -25,12 +25,134 @@
...
@@ -25,12 +25,134 @@
#define RDATA_IN_1_NAPTR_35_C
#define RDATA_IN_1_NAPTR_35_C
#define RRTYPE_NAPTR_ATTRIBUTES (0)
#define RRTYPE_NAPTR_ATTRIBUTES (0)
#ifdef HAVE_REGEX_H
#include <regex.h>
#endif
/*
* Check the wire format of the Regexp field.
* Don't allow embeded NUL's.
*/
static
inline
isc_result_t
txt_valid_regex
(
const
unsigned
char
*
txt
)
{
#ifdef HAVE_REGEX_H
regex_t
preg
;
unsigned
int
regflags
=
REG_EXTENDED
;
unsigned
int
nsub
=
0
;
char
regex
[
256
];
char
*
cp
;
#endif
isc_boolean_t
flags
=
ISC_FALSE
;
isc_boolean_t
replace
=
ISC_FALSE
;
unsigned
char
c
;
unsigned
char
delim
;
unsigned
int
len
;
len
=
*
txt
++
;
if
(
len
==
0U
)
return
(
ISC_R_SUCCESS
);
delim
=
*
txt
++
;
len
--
;
/*
* Digits, backslash and flags can't be delimiters.
*/
switch
(
delim
)
{
case
'0'
:
case
'1'
:
case
'2'
:
case
'3'
:
case
'4'
:
case
'5'
:
case
'6'
:
case
'7'
:
case
'8'
:
case
'9'
:
case
'\\'
:
case
'i'
:
case
0
:
return
(
DNS_R_SYNTAX
);
}
#ifdef HAVE_REGEX_H
memset
(
&
preg
,
0
,
sizeof
(
preg
));
cp
=
regex
;
#endif
while
(
len
--
>
0
)
{
c
=
*
txt
++
;
if
(
c
==
0
)
return
(
DNS_R_SYNTAX
);
if
(
c
==
delim
&&
!
replace
)
{
replace
=
ISC_TRUE
;
continue
;
}
else
if
(
c
==
delim
&&
!
flags
)
{
flags
=
ISC_TRUE
;
continue
;
}
else
if
(
c
==
delim
)
return
(
DNS_R_SYNTAX
);
/*
* Flags are not escaped.
*/
if
(
flags
)
{
switch
(
c
)
{
case
'i'
:
#ifdef HAVE_REGEX_H
regflags
|=
REG_ICASE
;
#endif
continue
;
default:
return
(
DNS_R_SYNTAX
);
}
}
#ifdef HAVE_REGEX_H
if
(
!
replace
)
*
cp
++
=
c
;
#endif
if
(
c
==
'\\'
)
{
if
(
len
==
0
)
return
(
DNS_R_SYNTAX
);
c
=
*
txt
++
;
if
(
c
==
0
)
return
(
DNS_R_SYNTAX
);
len
--
;
if
(
replace
)
switch
(
c
)
{
case
'0'
:
return
(
DNS_R_SYNTAX
);
#ifdef HAVE_REGEX_H
case
'1'
:
if
(
nsub
<
1
)
nsub
=
1
;
break
;
case
'2'
:
if
(
nsub
<
2
)
nsub
=
2
;
break
;
case
'3'
:
if
(
nsub
<
3
)
nsub
=
3
;
break
;
case
'4'
:
if
(
nsub
<
4
)
nsub
=
4
;
break
;
case
'5'
:
if
(
nsub
<
5
)
nsub
=
5
;
break
;
case
'6'
:
if
(
nsub
<
6
)
nsub
=
6
;
break
;
case
'7'
:
if
(
nsub
<
7
)
nsub
=
7
;
break
;
case
'8'
:
if
(
nsub
<
8
)
nsub
=
8
;
break
;
case
'9'
:
if
(
nsub
<
9
)
nsub
=
9
;
break
;
#endif
}
#ifdef HAVE_REGEX_H
if
(
!
replace
)
*
cp
++
=
c
;
#endif
}
}
if
(
!
flags
)
return
(
DNS_R_SYNTAX
);
#ifdef HAVE_REGEX_H
*
cp
=
'\0'
;
if
(
regcomp
(
&
preg
,
regex
,
regflags
))
return
(
DNS_R_SYNTAX
);
/*
* Check that substitutions in the replacement string are consistant
* with the regular expression.
*/
if
(
preg
.
re_nsub
<
nsub
)
{
regfree
(
&
preg
);
return
(
DNS_R_SYNTAX
);
}
regfree
(
&
preg
);
#endif
return
(
ISC_R_SUCCESS
);
}
static
inline
isc_result_t
static
inline
isc_result_t
fromtext_in_naptr
(
ARGS_FROMTEXT
)
{
fromtext_in_naptr
(
ARGS_FROMTEXT
)
{
isc_token_t
token
;
isc_token_t
token
;
dns_name_t
name
;
dns_name_t
name
;
isc_buffer_t
buffer
;
isc_buffer_t
buffer
;
unsigned
char
*
regex
;
REQUIRE
(
type
==
35
);
REQUIRE
(
type
==
35
);
REQUIRE
(
rdclass
==
1
);
REQUIRE
(
rdclass
==
1
);
...
@@ -74,9 +196,11 @@ fromtext_in_naptr(ARGS_FROMTEXT) {
...
@@ -74,9 +196,11 @@ fromtext_in_naptr(ARGS_FROMTEXT) {
/*
/*