diff options
32 files changed, 32 insertions, 32 deletions
diff --git a/regress/sbin/pfctl/pfail10.ok b/regress/sbin/pfctl/pfail10.ok index c9eb8cb9d9c..a373bdab8cb 100644 --- a/regress/sbin/pfctl/pfail10.ok +++ b/regress/sbin/pfctl/pfail10.ok @@ -1,4 +1,4 @@ stdin:4: Rules must be in order: options, normalization, queueing, translation, filtering -pfctl: Syntax error in file: pf rules not loaded +pfctl: Syntax error in config file: pf rules not loaded nat on lo0 inet all -> 127.0.0.1 pass in on lo1 all diff --git a/regress/sbin/pfctl/pfail11.ok b/regress/sbin/pfctl/pfail11.ok index 928f7f3b201..53bb7d1ac6e 100644 --- a/regress/sbin/pfctl/pfail11.ok +++ b/regress/sbin/pfctl/pfail11.ok @@ -1,7 +1,7 @@ stdin:2: syntax error stdin:4: Rules must be in order: options, normalization, queueing, translation, filtering stdin:5: Rules must be in order: options, normalization, queueing, translation, filtering -pfctl: Syntax error in file: pf rules not loaded +pfctl: Syntax error in config file: pf rules not loaded set optimization aggressive set timeout tcp.closing 6 pass in all diff --git a/regress/sbin/pfctl/pfail12.ok b/regress/sbin/pfctl/pfail12.ok index 18d0fa8afdf..807d43a06e4 100644 --- a/regress/sbin/pfctl/pfail12.ok +++ b/regress/sbin/pfctl/pfail12.ok @@ -2,4 +2,4 @@ stdin:2: dst port only applies to tcp/udp stdin:2: rpool port only applies to tcp/udp stdin:2: skipping rule due to errors stdin:2: rule expands to no valid combination -pfctl: Syntax error in file: pf rules not loaded +pfctl: Syntax error in config file: pf rules not loaded diff --git a/regress/sbin/pfctl/pfail13.ok b/regress/sbin/pfctl/pfail13.ok index 8ba4eedabae..eb80e3735d5 100644 --- a/regress/sbin/pfctl/pfail13.ok +++ b/regress/sbin/pfctl/pfail13.ok @@ -1,3 +1,3 @@ stdin:1: syntax error stdin:2: syntax error -pfctl: Syntax error in file: pf rules not loaded +pfctl: Syntax error in config file: pf rules not loaded diff --git a/regress/sbin/pfctl/pfail14.ok b/regress/sbin/pfctl/pfail14.ok index fe4057f082c..11d0a5a8de2 100644 --- a/regress/sbin/pfctl/pfail14.ok +++ b/regress/sbin/pfctl/pfail14.ok @@ -1,4 +1,4 @@ stdin:1: dynamic addresses require address family (inet/inet6) stdin:1: skipping rule due to errors stdin:1: rule expands to no valid combination -pfctl: Syntax error in file: pf rules not loaded +pfctl: Syntax error in config file: pf rules not loaded diff --git a/regress/sbin/pfctl/pfail15.ok b/regress/sbin/pfctl/pfail15.ok index 6adad86415d..70553862813 100644 --- a/regress/sbin/pfctl/pfail15.ok +++ b/regress/sbin/pfctl/pfail15.ok @@ -1,3 +1,3 @@ stdin:3: string too long stdin:3: syntax error -pfctl: Syntax error in file: pf rules not loaded +pfctl: Syntax error in config file: pf rules not loaded diff --git a/regress/sbin/pfctl/pfail17.ok b/regress/sbin/pfctl/pfail17.ok index ca3b01c8fee..dcef64335ea 100644 --- a/regress/sbin/pfctl/pfail17.ok +++ b/regress/sbin/pfctl/pfail17.ok @@ -1,3 +1,3 @@ stdin:3: syntax error stdin:4: syntax error -pfctl: Syntax error in file: pf rules not loaded +pfctl: Syntax error in config file: pf rules not loaded diff --git a/regress/sbin/pfctl/pfail18.ok b/regress/sbin/pfctl/pfail18.ok index 0db59bcc48f..09879908b9a 100644 --- a/regress/sbin/pfctl/pfail18.ok +++ b/regress/sbin/pfctl/pfail18.ok @@ -1,5 +1,5 @@ stdin:6: queue toads has no parent -pfctl: Syntax error in file: pf rules not loaded +pfctl: Syntax error in config file: pf rules not loaded altq on lo0 cbq bandwidth 10Mb tbrsize 1824 queue { frenchs eat frogs } queue frenchs bandwidth 30% cbq( default ) queue eat bandwidth 30% diff --git a/regress/sbin/pfctl/pfail19.ok b/regress/sbin/pfctl/pfail19.ok index 03e3fc02e4b..9e0d3a0eb12 100644 --- a/regress/sbin/pfctl/pfail19.ok +++ b/regress/sbin/pfctl/pfail19.ok @@ -5,4 +5,4 @@ stdin:5: invalid use of table <sometable> as the source address of a binat rule stdin:6: invalid use of table <sometable> in a route expression stdin:7: invalid use of table <sometable> in a route expression stdin:8: invalid use of table <sometable> in a route expression -pfctl: Syntax error in file: pf rules not loaded +pfctl: Syntax error in config file: pf rules not loaded diff --git a/regress/sbin/pfctl/pfail2.ok b/regress/sbin/pfctl/pfail2.ok index b3dbe028438..c0403f847d6 100644 --- a/regress/sbin/pfctl/pfail2.ok +++ b/regress/sbin/pfctl/pfail2.ok @@ -4,4 +4,4 @@ stdin:3: rule expands to no valid combination stdin:4: proto icmp6 doesn't match address family inet stdin:4: skipping rule due to errors stdin:4: rule expands to no valid combination -pfctl: Syntax error in file: pf rules not loaded +pfctl: Syntax error in config file: pf rules not loaded diff --git a/regress/sbin/pfctl/pfail20.ok b/regress/sbin/pfctl/pfail20.ok index d5967f82969..a7739808dab 100644 --- a/regress/sbin/pfctl/pfail20.ok +++ b/regress/sbin/pfctl/pfail20.ok @@ -1,4 +1,4 @@ stdin:3: address family not given and translation address expands to multiple address families stdin:4: address family not given and translation address expands to multiple address families stdin:5: rule expands to no valid combination -pfctl: Syntax error in file: pf rules not loaded +pfctl: Syntax error in config file: pf rules not loaded diff --git a/regress/sbin/pfctl/pfail21.ok b/regress/sbin/pfctl/pfail21.ok index cff42f16547..451439d67aa 100644 --- a/regress/sbin/pfctl/pfail21.ok +++ b/regress/sbin/pfctl/pfail21.ok @@ -1,2 +1,2 @@ stdin:3: interface nonexistant0 does not exist -pfctl: Syntax error in file: pf rules not loaded +pfctl: Syntax error in config file: pf rules not loaded diff --git a/regress/sbin/pfctl/pfail22.ok b/regress/sbin/pfctl/pfail22.ok index 7e1f5f08bba..001be4c9d46 100644 --- a/regress/sbin/pfctl/pfail22.ok +++ b/regress/sbin/pfctl/pfail22.ok @@ -1,2 +1,2 @@ stdin:3: interface gibsnich0 doesn't exist -pfctl: Syntax error in file: pf rules not loaded +pfctl: Syntax error in config file: pf rules not loaded diff --git a/regress/sbin/pfctl/pfail23.ok b/regress/sbin/pfctl/pfail23.ok index ac6712514a9..c7dda1608c0 100644 --- a/regress/sbin/pfctl/pfail23.ok +++ b/regress/sbin/pfctl/pfail23.ok @@ -2,4 +2,4 @@ stdin:2: illegal port value 65536 stdin:6: flags only apply to tcp stdin:7: flags only apply to tcp stdin:10: no routing address with matching address family found. -pfctl: Syntax error in file: pf rules not loaded +pfctl: Syntax error in config file: pf rules not loaded diff --git a/regress/sbin/pfctl/pfail24.ok b/regress/sbin/pfctl/pfail24.ok index f12590db67c..91fd799efef 100644 --- a/regress/sbin/pfctl/pfail24.ok +++ b/regress/sbin/pfctl/pfail24.ok @@ -9,4 +9,4 @@ stdin:8: fromto parameter not supported in binat-anchor stdin:9: fromto parameter not supported in binat-anchor stdin:10: fromto parameter not supported in binat-anchor stdin:11: fromto parameter not supported in binat-anchor -pfctl: Syntax error in file: pf rules not loaded +pfctl: Syntax error in config file: pf rules not loaded diff --git a/regress/sbin/pfctl/pfail25.ok b/regress/sbin/pfctl/pfail25.ok index 4ed0f2a87bf..32472e95942 100644 --- a/regress/sbin/pfctl/pfail25.ok +++ b/regress/sbin/pfctl/pfail25.ok @@ -9,4 +9,4 @@ stdin:8: fragcache cannot be respecified stdin:9: fragcache cannot be respecified stdin:10: fragcache cannot be respecified stdin:11: random-id cannot be respecified -pfctl: Syntax error in file: pf rules not loaded +pfctl: Syntax error in config file: pf rules not loaded diff --git a/regress/sbin/pfctl/pfail26.ok b/regress/sbin/pfctl/pfail26.ok index 35149819a4b..2232dc7eed2 100644 --- a/regress/sbin/pfctl/pfail26.ok +++ b/regress/sbin/pfctl/pfail26.ok @@ -2,4 +2,4 @@ stdin:3: anchor name 'too-long-anchor1' too long stdin:4: anchor name 'too-long-anchor2' too long stdin:5: anchor name 'too-long-anchor3' too long stdin:6: anchor name 'too-long-anchor4' too long -pfctl: Syntax error in file: pf rules not loaded +pfctl: Syntax error in config file: pf rules not loaded diff --git a/regress/sbin/pfctl/pfail27.ok b/regress/sbin/pfctl/pfail27.ok index cee8451056d..d2aebc489dd 100644 --- a/regress/sbin/pfctl/pfail27.ok +++ b/regress/sbin/pfctl/pfail27.ok @@ -1,4 +1,4 @@ stdin:3: source port parameter not supported in rdr-anchor stdin:4: destination port list expansion not supported in rdr-anchor stdin:5: destination port operators not supported in rdr-anchor -pfctl: Syntax error in file: pf rules not loaded +pfctl: Syntax error in config file: pf rules not loaded diff --git a/regress/sbin/pfctl/pfail28.ok b/regress/sbin/pfctl/pfail28.ok index 56e7fad5b78..b6931e68bca 100644 --- a/regress/sbin/pfctl/pfail28.ok +++ b/regress/sbin/pfctl/pfail28.ok @@ -1,3 +1,3 @@ stdin:3: proto list expansion not supported in binat-anchor stdin:4: fromto parameter not supported in binat-anchor -pfctl: Syntax error in file: pf rules not loaded +pfctl: Syntax error in config file: pf rules not loaded diff --git a/regress/sbin/pfctl/pfail29.ok b/regress/sbin/pfctl/pfail29.ok index 2dd96104edc..fa617a7248c 100644 --- a/regress/sbin/pfctl/pfail29.ok +++ b/regress/sbin/pfctl/pfail29.ok @@ -1,2 +1,2 @@ stdin:3: no scheduler specified! -pfctl: Syntax error in file: pf rules not loaded +pfctl: Syntax error in config file: pf rules not loaded diff --git a/regress/sbin/pfctl/pfail3.ok b/regress/sbin/pfctl/pfail3.ok index 3cede88a87b..4e35bdcae84 100644 --- a/regress/sbin/pfctl/pfail3.ok +++ b/regress/sbin/pfctl/pfail3.ok @@ -1,4 +1,4 @@ stdin:1: proto icmp6 doesn't match address family inet stdin:1: skipping rule due to errors stdin:1: rule expands to no valid combination -pfctl: Syntax error in file: pf rules not loaded +pfctl: Syntax error in config file: pf rules not loaded diff --git a/regress/sbin/pfctl/pfail30.ok b/regress/sbin/pfctl/pfail30.ok index 909595fd409..88d0e2b25c4 100644 --- a/regress/sbin/pfctl/pfail30.ok +++ b/regress/sbin/pfctl/pfail30.ok @@ -14,4 +14,4 @@ stdin:15: binat ip versions must match stdin:16: no translation address with matching address family found. stdin:17: binat ip versions must match stdin:18: binat ip versions must match -pfctl: Syntax error in file: pf rules not loaded +pfctl: Syntax error in config file: pf rules not loaded diff --git a/regress/sbin/pfctl/pfail31.ok b/regress/sbin/pfctl/pfail31.ok index e2d091ca296..982f153941f 100644 --- a/regress/sbin/pfctl/pfail31.ok +++ b/regress/sbin/pfctl/pfail31.ok @@ -1,7 +1,7 @@ stdin:6: unknown interface nothere0 stdin:7: queue q_ext_std has no parent stdin:8: queue q_ext_p2p has no parent -pfctl: Syntax error in file: pf rules not loaded +pfctl: Syntax error in config file: pf rules not loaded lan_if = "lo0" ext_if = "nothere0" altq on lo0 cbq bandwidth 512Kb tbrsize 33224 queue { q_lan_std } diff --git a/regress/sbin/pfctl/pfail32.ok b/regress/sbin/pfctl/pfail32.ok index 96bf886a39b..5438aba3f8a 100644 --- a/regress/sbin/pfctl/pfail32.ok +++ b/regress/sbin/pfctl/pfail32.ok @@ -1,5 +1,5 @@ queue zwei already exists on interface gif3 -pfctl: Syntax error in file: pf rules not loaded +pfctl: Syntax error in config file: pf rules not loaded altq on gif3 cbq bandwidth 100Kb tbrsize 1280 queue { eins zwei } queue eins cbq( default ) { zwei } queue zwei diff --git a/regress/sbin/pfctl/pfail33.ok b/regress/sbin/pfctl/pfail33.ok index cabbc86a391..73696a5d006 100644 --- a/regress/sbin/pfctl/pfail33.ok +++ b/regress/sbin/pfctl/pfail33.ok @@ -1,2 +1,2 @@ stdin:3: unknown cbq flag "invalid" -pfctl: Syntax error in file: pf rules not loaded +pfctl: Syntax error in config file: pf rules not loaded diff --git a/regress/sbin/pfctl/pfail34.ok b/regress/sbin/pfctl/pfail34.ok index 7459b3670e2..45d15315432 100644 --- a/regress/sbin/pfctl/pfail34.ok +++ b/regress/sbin/pfctl/pfail34.ok @@ -1,2 +1,2 @@ stdin:3: unknown priq flag "invalid" -pfctl: Syntax error in file: pf rules not loaded +pfctl: Syntax error in config file: pf rules not loaded diff --git a/regress/sbin/pfctl/pfail4.ok b/regress/sbin/pfctl/pfail4.ok index f2e3e39d504..4c52bc80294 100644 --- a/regress/sbin/pfctl/pfail4.ok +++ b/regress/sbin/pfctl/pfail4.ok @@ -1,2 +1,2 @@ stdin:3: syntax error -pfctl: Syntax error in file: pf rules not loaded +pfctl: Syntax error in config file: pf rules not loaded diff --git a/regress/sbin/pfctl/pfail5.ok b/regress/sbin/pfctl/pfail5.ok index 3cede88a87b..4e35bdcae84 100644 --- a/regress/sbin/pfctl/pfail5.ok +++ b/regress/sbin/pfctl/pfail5.ok @@ -1,4 +1,4 @@ stdin:1: proto icmp6 doesn't match address family inet stdin:1: skipping rule due to errors stdin:1: rule expands to no valid combination -pfctl: Syntax error in file: pf rules not loaded +pfctl: Syntax error in config file: pf rules not loaded diff --git a/regress/sbin/pfctl/pfail6.ok b/regress/sbin/pfctl/pfail6.ok index eb1f5291002..e24f1447c36 100644 --- a/regress/sbin/pfctl/pfail6.ok +++ b/regress/sbin/pfctl/pfail6.ok @@ -1,4 +1,4 @@ stdin:1: icmp-type mismatch stdin:1: skipping rule due to errors stdin:1: rule expands to no valid combination -pfctl: Syntax error in file: pf rules not loaded +pfctl: Syntax error in config file: pf rules not loaded diff --git a/regress/sbin/pfctl/pfail7.ok b/regress/sbin/pfctl/pfail7.ok index eb1f5291002..e24f1447c36 100644 --- a/regress/sbin/pfctl/pfail7.ok +++ b/regress/sbin/pfctl/pfail7.ok @@ -1,4 +1,4 @@ stdin:1: icmp-type mismatch stdin:1: skipping rule due to errors stdin:1: rule expands to no valid combination -pfctl: Syntax error in file: pf rules not loaded +pfctl: Syntax error in config file: pf rules not loaded diff --git a/regress/sbin/pfctl/pfail8.ok b/regress/sbin/pfctl/pfail8.ok index 0c1e8b5611f..368b2667946 100644 --- a/regress/sbin/pfctl/pfail8.ok +++ b/regress/sbin/pfctl/pfail8.ok @@ -1,3 +1,3 @@ stdin:1: no routing address with matching address family found. stdin:2: no routing address with matching address family found. -pfctl: Syntax error in file: pf rules not loaded +pfctl: Syntax error in config file: pf rules not loaded diff --git a/regress/sbin/pfctl/pfail9.ok b/regress/sbin/pfctl/pfail9.ok index f0cab3d47f1..778d60cfb8e 100644 --- a/regress/sbin/pfctl/pfail9.ok +++ b/regress/sbin/pfctl/pfail9.ok @@ -1,4 +1,4 @@ stdin:5: Rules must be in order: options, normalization, queueing, translation, filtering -pfctl: Syntax error in file: pf rules not loaded +pfctl: Syntax error in config file: pf rules not loaded scrub in on lo0 all fragment reassemble pass in on lo1 all |