diff options
43 files changed, 4 insertions, 43 deletions
diff --git a/regress/sbin/pfctl/pfail1.ok b/regress/sbin/pfctl/pfail1.ok index 872dc1bebb5..619c212332f 100644 --- a/regress/sbin/pfctl/pfail1.ok +++ b/regress/sbin/pfctl/pfail1.ok @@ -7,6 +7,5 @@ stdin:4: rule expands to no valid combination stdin:5: port only applies to tcp/udp stdin:5: skipping rule due to errors stdin:5: rule expands to no valid combination -pfctl: Syntax error in config file: pf rules not loaded pass in all pass in all diff --git a/regress/sbin/pfctl/pfail10.ok b/regress/sbin/pfctl/pfail10.ok index afc63f03bcc..43ac1316a59 100644 --- a/regress/sbin/pfctl/pfail10.ok +++ b/regress/sbin/pfctl/pfail10.ok @@ -1,4 +1,3 @@ stdin:4: Rules must be in order: options, normalization, queueing, translation, filtering -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 20a1b6c96e9..ec71004fd35 100644 --- a/regress/sbin/pfctl/pfail11.ok +++ b/regress/sbin/pfctl/pfail11.ok @@ -1,7 +1,6 @@ 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 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 807d43a06e4..aaaadba0e3f 100644 --- a/regress/sbin/pfctl/pfail12.ok +++ b/regress/sbin/pfctl/pfail12.ok @@ -2,4 +2,3 @@ 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 config file: pf rules not loaded diff --git a/regress/sbin/pfctl/pfail13.ok b/regress/sbin/pfctl/pfail13.ok index eb80e3735d5..1c4256eecfc 100644 --- a/regress/sbin/pfctl/pfail13.ok +++ b/regress/sbin/pfctl/pfail13.ok @@ -1,3 +1,2 @@ stdin:1: syntax error stdin:2: syntax error -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 11d0a5a8de2..bb2f05334af 100644 --- a/regress/sbin/pfctl/pfail14.ok +++ b/regress/sbin/pfctl/pfail14.ok @@ -1,4 +1,3 @@ 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 config file: pf rules not loaded diff --git a/regress/sbin/pfctl/pfail15.ok b/regress/sbin/pfctl/pfail15.ok index 70553862813..74c787fbb16 100644 --- a/regress/sbin/pfctl/pfail15.ok +++ b/regress/sbin/pfctl/pfail15.ok @@ -1,3 +1,2 @@ stdin:3: string too long stdin:3: syntax error -pfctl: Syntax error in config file: pf rules not loaded diff --git a/regress/sbin/pfctl/pfail16.ok b/regress/sbin/pfctl/pfail16.ok index bd66789f841..7c4bd5dfc2f 100644 --- a/regress/sbin/pfctl/pfail16.ok +++ b/regress/sbin/pfctl/pfail16.ok @@ -8,4 +8,3 @@ no IP address found for 256.0.0.1 stdin:5: could not parse host specification no IP address found for 10.0.0.0:network stdin:6: could not parse host specification -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 dcef64335ea..26474e7c7f6 100644 --- a/regress/sbin/pfctl/pfail17.ok +++ b/regress/sbin/pfctl/pfail17.ok @@ -1,3 +1,2 @@ stdin:3: syntax error stdin:4: syntax error -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 09879908b9a..7d0550d2a6e 100644 --- a/regress/sbin/pfctl/pfail18.ok +++ b/regress/sbin/pfctl/pfail18.ok @@ -1,5 +1,4 @@ stdin:6: queue toads has no parent -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 9e0d3a0eb12..1e49c73d0c4 100644 --- a/regress/sbin/pfctl/pfail19.ok +++ b/regress/sbin/pfctl/pfail19.ok @@ -5,4 +5,3 @@ 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 config file: pf rules not loaded diff --git a/regress/sbin/pfctl/pfail2.ok b/regress/sbin/pfctl/pfail2.ok index c0403f847d6..88b54b7aca2 100644 --- a/regress/sbin/pfctl/pfail2.ok +++ b/regress/sbin/pfctl/pfail2.ok @@ -4,4 +4,3 @@ 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 config file: pf rules not loaded diff --git a/regress/sbin/pfctl/pfail20.ok b/regress/sbin/pfctl/pfail20.ok index a7739808dab..5a677e2987a 100644 --- a/regress/sbin/pfctl/pfail20.ok +++ b/regress/sbin/pfctl/pfail20.ok @@ -1,4 +1,3 @@ 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 config file: pf rules not loaded diff --git a/regress/sbin/pfctl/pfail21.ok b/regress/sbin/pfctl/pfail21.ok index 451439d67aa..3928f52133e 100644 --- a/regress/sbin/pfctl/pfail21.ok +++ b/regress/sbin/pfctl/pfail21.ok @@ -1,2 +1 @@ stdin:3: interface nonexistant0 does not exist -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 001be4c9d46..3ce1fa97adf 100644 --- a/regress/sbin/pfctl/pfail22.ok +++ b/regress/sbin/pfctl/pfail22.ok @@ -1,2 +1 @@ stdin:3: interface gibsnich0 doesn't exist -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 c7dda1608c0..250966e5175 100644 --- a/regress/sbin/pfctl/pfail23.ok +++ b/regress/sbin/pfctl/pfail23.ok @@ -2,4 +2,3 @@ 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 config file: pf rules not loaded diff --git a/regress/sbin/pfctl/pfail24.ok b/regress/sbin/pfctl/pfail24.ok index 91fd799efef..a7a8b98d28d 100644 --- a/regress/sbin/pfctl/pfail24.ok +++ b/regress/sbin/pfctl/pfail24.ok @@ -9,4 +9,3 @@ 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 config file: pf rules not loaded diff --git a/regress/sbin/pfctl/pfail25.ok b/regress/sbin/pfctl/pfail25.ok index 32472e95942..8a25d0a1813 100644 --- a/regress/sbin/pfctl/pfail25.ok +++ b/regress/sbin/pfctl/pfail25.ok @@ -9,4 +9,3 @@ 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 config file: pf rules not loaded diff --git a/regress/sbin/pfctl/pfail26.ok b/regress/sbin/pfctl/pfail26.ok index 2232dc7eed2..b8a9fe4fae8 100644 --- a/regress/sbin/pfctl/pfail26.ok +++ b/regress/sbin/pfctl/pfail26.ok @@ -2,4 +2,3 @@ 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 config file: pf rules not loaded diff --git a/regress/sbin/pfctl/pfail27.ok b/regress/sbin/pfctl/pfail27.ok index d2aebc489dd..36316fec7e7 100644 --- a/regress/sbin/pfctl/pfail27.ok +++ b/regress/sbin/pfctl/pfail27.ok @@ -1,4 +1,3 @@ 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 config file: pf rules not loaded diff --git a/regress/sbin/pfctl/pfail28.ok b/regress/sbin/pfctl/pfail28.ok index b6931e68bca..95d9ac74579 100644 --- a/regress/sbin/pfctl/pfail28.ok +++ b/regress/sbin/pfctl/pfail28.ok @@ -1,3 +1,2 @@ stdin:3: proto list expansion not supported in binat-anchor stdin:4: fromto parameter not supported in binat-anchor -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 fa617a7248c..96f10cd46f3 100644 --- a/regress/sbin/pfctl/pfail29.ok +++ b/regress/sbin/pfctl/pfail29.ok @@ -1,2 +1 @@ stdin:3: no scheduler specified! -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 4e35bdcae84..e38b02245a1 100644 --- a/regress/sbin/pfctl/pfail3.ok +++ b/regress/sbin/pfctl/pfail3.ok @@ -1,4 +1,3 @@ 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 config file: pf rules not loaded diff --git a/regress/sbin/pfctl/pfail30.ok b/regress/sbin/pfctl/pfail30.ok index 88d0e2b25c4..3092a566ae5 100644 --- a/regress/sbin/pfctl/pfail30.ok +++ b/regress/sbin/pfctl/pfail30.ok @@ -14,4 +14,3 @@ 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 config file: pf rules not loaded diff --git a/regress/sbin/pfctl/pfail31.ok b/regress/sbin/pfctl/pfail31.ok index 982f153941f..d764118a4fa 100644 --- a/regress/sbin/pfctl/pfail31.ok +++ b/regress/sbin/pfctl/pfail31.ok @@ -1,7 +1,6 @@ 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 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 5438aba3f8a..00ddc58ea2a 100644 --- a/regress/sbin/pfctl/pfail32.ok +++ b/regress/sbin/pfctl/pfail32.ok @@ -1,5 +1,4 @@ queue zwei already exists on interface gif3 -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 73696a5d006..fd910e98ee8 100644 --- a/regress/sbin/pfctl/pfail33.ok +++ b/regress/sbin/pfctl/pfail33.ok @@ -1,2 +1 @@ stdin:3: unknown cbq flag "invalid" -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 45d15315432..2a9767dfc60 100644 --- a/regress/sbin/pfctl/pfail34.ok +++ b/regress/sbin/pfctl/pfail34.ok @@ -1,2 +1 @@ stdin:3: unknown priq flag "invalid" -pfctl: Syntax error in config file: pf rules not loaded diff --git a/regress/sbin/pfctl/pfail35.ok b/regress/sbin/pfctl/pfail35.ok index 7f06abf1c09..fd991bb6408 100644 --- a/regress/sbin/pfctl/pfail35.ok +++ b/regress/sbin/pfctl/pfail35.ok @@ -1,3 +1,4 @@ stdin:4: linkshare already specified -pfctl: Syntax error in config file: pf rules not loaded +pfctl: should have one default queue on lo0 +pfctl: errors in altq config altq on lo0 hfsc bandwidth 10Mb tbrsize 1824 queue { eins } diff --git a/regress/sbin/pfctl/pfail36.ok b/regress/sbin/pfctl/pfail36.ok index 550c089ac4f..f12b7923612 100644 --- a/regress/sbin/pfctl/pfail36.ok +++ b/regress/sbin/pfctl/pfail36.ok @@ -1,3 +1,4 @@ stdin:4: upperlimit already specified -pfctl: Syntax error in config file: pf rules not loaded +pfctl: should have one default queue on lo0 +pfctl: errors in altq config altq on lo0 hfsc bandwidth 10Mb tbrsize 1824 queue { eins } diff --git a/regress/sbin/pfctl/pfail37.ok b/regress/sbin/pfctl/pfail37.ok index d4f4bccafc4..ef1c08a87f7 100644 --- a/regress/sbin/pfctl/pfail37.ok +++ b/regress/sbin/pfctl/pfail37.ok @@ -1,2 +1 @@ stdin:1: tag too long, max 15 chars -pfctl: Syntax error in config file: pf rules not loaded diff --git a/regress/sbin/pfctl/pfail38.ok b/regress/sbin/pfctl/pfail38.ok index 57f53ce50fc..400524150a2 100644 --- a/regress/sbin/pfctl/pfail38.ok +++ b/regress/sbin/pfctl/pfail38.ok @@ -2,4 +2,3 @@ stdin:1: tag too long, max 15 chars stdin:2: tag too long, max 15 chars stdin:3: tag too long, max 15 chars stdin:4: tag too long, max 15 chars -pfctl: Syntax error in config file: pf rules not loaded diff --git a/regress/sbin/pfctl/pfail39.ok b/regress/sbin/pfctl/pfail39.ok index 37f38c18eb7..162b00e01c9 100644 --- a/regress/sbin/pfctl/pfail39.ok +++ b/regress/sbin/pfctl/pfail39.ok @@ -1,2 +1 @@ stdin:2: tag too long, max 15 chars -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 4c52bc80294..626816dca20 100644 --- a/regress/sbin/pfctl/pfail4.ok +++ b/regress/sbin/pfctl/pfail4.ok @@ -1,2 +1 @@ stdin:3: syntax error -pfctl: Syntax error in config file: pf rules not loaded diff --git a/regress/sbin/pfctl/pfail40.ok b/regress/sbin/pfctl/pfail40.ok index a4619e222b5..7995038c28e 100644 --- a/regress/sbin/pfctl/pfail40.ok +++ b/regress/sbin/pfctl/pfail40.ok @@ -2,4 +2,3 @@ invalid netmask stdin:2: could not parse host specification invalid netmask stdin:3: could not parse host specification -pfctl: Syntax error in config file: pf rules not loaded diff --git a/regress/sbin/pfctl/pfail41.ok b/regress/sbin/pfctl/pfail41.ok index 39cd91a6965..b5a39aaff72 100644 --- a/regress/sbin/pfctl/pfail41.ok +++ b/regress/sbin/pfctl/pfail41.ok @@ -1,3 +1,2 @@ no IP address found for 10.0.0.0.1 stdin:2: could not parse host specification -pfctl: Syntax error in config file: pf rules not loaded diff --git a/regress/sbin/pfctl/pfail42.ok b/regress/sbin/pfctl/pfail42.ok index a6159df7792..9d3c5c90d4a 100644 --- a/regress/sbin/pfctl/pfail42.ok +++ b/regress/sbin/pfctl/pfail42.ok @@ -1,4 +1,3 @@ netmask 64 invalid for IPv4 address stdin:3: skipping rule due to errors stdin:3: rule expands to no valid combination -pfctl: Syntax error in config file: pf rules not loaded diff --git a/regress/sbin/pfctl/pfail43.ok b/regress/sbin/pfctl/pfail43.ok index a68ec191f6b..dc3b1b0eaad 100644 --- a/regress/sbin/pfctl/pfail43.ok +++ b/regress/sbin/pfctl/pfail43.ok @@ -6,4 +6,3 @@ no IP address found for 1.1.1.1.1 stdin:6: could not parse host specification no IP address found for 1.1.1.1.1 stdin:7: could not parse host specification -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 4e35bdcae84..e38b02245a1 100644 --- a/regress/sbin/pfctl/pfail5.ok +++ b/regress/sbin/pfctl/pfail5.ok @@ -1,4 +1,3 @@ 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 config file: pf rules not loaded diff --git a/regress/sbin/pfctl/pfail6.ok b/regress/sbin/pfctl/pfail6.ok index e24f1447c36..80ba75ee4a1 100644 --- a/regress/sbin/pfctl/pfail6.ok +++ b/regress/sbin/pfctl/pfail6.ok @@ -1,4 +1,3 @@ stdin:1: icmp-type mismatch stdin:1: skipping rule due to errors stdin:1: rule expands to no valid combination -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 e24f1447c36..80ba75ee4a1 100644 --- a/regress/sbin/pfctl/pfail7.ok +++ b/regress/sbin/pfctl/pfail7.ok @@ -1,4 +1,3 @@ stdin:1: icmp-type mismatch stdin:1: skipping rule due to errors stdin:1: rule expands to no valid combination -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 368b2667946..dc2471e7158 100644 --- a/regress/sbin/pfctl/pfail8.ok +++ b/regress/sbin/pfctl/pfail8.ok @@ -1,3 +1,2 @@ stdin:1: no routing address with matching address family found. stdin:2: no routing address with matching address family found. -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 8dd18de856b..08453ae4ac9 100644 --- a/regress/sbin/pfctl/pfail9.ok +++ b/regress/sbin/pfctl/pfail9.ok @@ -1,4 +1,3 @@ stdin:5: Rules must be in order: options, normalization, queueing, translation, filtering -pfctl: Syntax error in config file: pf rules not loaded scrub in on lo0 all fragment reassemble pass in on lo1 all |