4492. [bug] irs_resconf_load failed to initialise sortlistnxt

causing bad writes if resolv.conf contained a sortlist directive. [RT #43459]
2016-10-27 13:17:58 +11:00
parent 8eaf918adf
commit 55b78fff62
26 changed files with 243 additions and 13 deletions
--- a/lib/irs/tests/testdata/domain.conf
+++ b/lib/irs/tests/testdata/domain.conf
@@ -0,0 +1 @@
+domain example.com
--- a/lib/irs/tests/testdata/nameserver-v4.conf
+++ b/lib/irs/tests/testdata/nameserver-v4.conf
@@ -0,0 +1 @@
+nameserver 10.0.0.1
--- a/lib/irs/tests/testdata/nameserver-v6.conf
+++ b/lib/irs/tests/testdata/nameserver-v6.conf
@@ -0,0 +1 @@
+nameserver 2001:DB8::1
--- a/lib/irs/tests/testdata/options-debug.conf
+++ b/lib/irs/tests/testdata/options-debug.conf
@@ -0,0 +1 @@
+options debug
--- a/lib/irs/tests/testdata/options-ndots.conf
+++ b/lib/irs/tests/testdata/options-ndots.conf
@@ -0,0 +1 @@
+option ndots:2
--- a/lib/irs/tests/testdata/options-timeout.conf
+++ b/lib/irs/tests/testdata/options-timeout.conf
@@ -0,0 +1 @@
+options timeout:1
--- a/lib/irs/tests/testdata/options-unknown.conf
+++ b/lib/irs/tests/testdata/options-unknown.conf
@@ -0,0 +1 @@
+options unknown
--- a/lib/irs/tests/testdata/options.conf
+++ b/lib/irs/tests/testdata/options.conf
@@ -0,0 +1 @@
+options unknown debug timeout:1 ndots:2
--- a/lib/irs/tests/testdata/port.conf
+++ b/lib/irs/tests/testdata/port.conf
@@ -0,0 +1 @@
+port 5300
--- a/lib/irs/tests/testdata/resolv.conf
+++ b/lib/irs/tests/testdata/resolv.conf
@@ -0,0 +1,8 @@
+port 5300
+nameserver 10.0.0.1
+nameserver 2001:DB8::1
+search example.com example.net
+sortlist 130.155.160.0/255.255.240.0 130.155.0.0
+timeout 10
+unknown directive
+options unknown debug timeout:1 ndots:2
--- a/lib/irs/tests/testdata/search.conf
+++ b/lib/irs/tests/testdata/search.conf
@@ -0,0 +1 @@
+search example.com example.net
--- a/lib/irs/tests/testdata/sortlist-v4.conf
+++ b/lib/irs/tests/testdata/sortlist-v4.conf
@@ -0,0 +1 @@
+sortlist 130.155.160.0/255.255.240.0 130.155.0.0
--- a/lib/irs/tests/testdata/timeout.conf
+++ b/lib/irs/tests/testdata/timeout.conf
@@ -0,0 +1 @@
+timeout 10
--- a/lib/irs/tests/testdata/unknown.conf
+++ b/lib/irs/tests/testdata/unknown.conf
@@ -0,0 +1 @@
+unknown directive
				`@@ -0,0 +1 @@`
				`sortlist 130.155.160.0/255.255.240.0 130.155.0.0`