diff --git a/bin/dig/dig.c b/bin/dig/dig.c index c32a6cf14c..546399c9d6 100644 --- a/bin/dig/dig.c +++ b/bin/dig/dig.c @@ -1388,12 +1388,6 @@ plus_option(char *option, bool is_batchfile, bool *need_clone, } strlcpy(domainopt, value, sizeof(domainopt)); break; - case 's': /* dscp */ - /* obsolete */ - FULLCHECK("dscp"); - fprintf(stderr, ";; +dscp option is obsolete " - "and has no effect"); - break; default: goto invalid_option; } diff --git a/bin/dig/dig.rst b/bin/dig/dig.rst index 7eb2339f3f..32029417f5 100644 --- a/bin/dig/dig.rst +++ b/bin/dig/dig.rst @@ -347,11 +347,6 @@ abbreviation is unambiguous; for example, :option:`+cd` is equivalent to enables search list processing as if the :option:`+search` option were given. -.. option:: +dscp=value - - This option formerly set the DSCP value used when sending a query. - It is now obsolete, and has no effect. - .. option:: +edns[=#], +noedns This option specifies the EDNS version to query with. Valid values are 0 to 255. diff --git a/bin/tests/system/checkconf/good.conf.in b/bin/tests/system/checkconf/good.conf.in index 8ecf392063..f67d7172a3 100644 --- a/bin/tests/system/checkconf/good.conf.in +++ b/bin/tests/system/checkconf/good.conf.in @@ -46,7 +46,6 @@ options { 10.0.0.0/8; }; directory "."; - dscp 41; dump-file "named_dumpdb"; heartbeat-interval 30; hostname none; @@ -54,10 +53,10 @@ options { listen-on port 90 { "any"; }; - listen-on port 100 dscp 33 { + listen-on port 100 { 127.0.0.1/32; }; - listen-on-v6 port 53 dscp 57 { + listen-on-v6 port 53 { "none"; }; match-mapped-addresses yes; @@ -79,10 +78,10 @@ options { }; dnssec-policy "test"; max-ixfr-ratio 90%; - transfer-source 0.0.0.0 dscp 63; + transfer-source 0.0.0.0; zone-statistics none; }; -parental-agents "parents" port 5353 source 10.10.10.10 port 5354 dscp 54 source-v6 2001:db8::10 port 5355 dscp 55 { +parental-agents "parents" port 5353 source 10.10.10.10 port 5354 source-v6 2001:db8::10 port 5355 { 10.10.10.11; 2001:db8::11; }; @@ -95,7 +94,7 @@ view "first" { file "xxx"; update-policy local; max-ixfr-ratio 20%; - notify-source 10.10.10.10 port 53 dscp 55; + notify-source 10.10.10.10 port 53; }; zone "clone" { type primary; @@ -186,7 +185,7 @@ view "fourth" { 1.2.3.5; }; dnssec-policy "test"; - parental-source 10.10.10.10 port 53 dscp 55; + parental-source 10.10.10.10 port 53; }; zone "dnssec-default" { type primary; diff --git a/bin/tools/mdig.c b/bin/tools/mdig.c index f7928c3484..d0bed78d07 100644 --- a/bin/tools/mdig.c +++ b/bin/tools/mdig.c @@ -1314,12 +1314,6 @@ plus_option(char *option, struct query *query, bool global) { } query->dnssec = state; break; - case 's': /* dscp */ - /* obsolete */ - FULLCHECK("dscp"); - fprintf(stderr, ";; +dscp option is obsolete " - "and has no effect"); - break; default: goto invalid_option; } diff --git a/bin/tools/mdig.rst b/bin/tools/mdig.rst index 33948d1475..9bb1998cb5 100644 --- a/bin/tools/mdig.rst +++ b/bin/tools/mdig.rst @@ -161,11 +161,6 @@ The global query options are: they are replaced by the string "[omitted]"; in the DNSKEY case, the key ID is displayed as the replacement, e.g., ``[ key id = value ]``. -.. option:: +dscp=value - - This option formerly set the DSCP value used when sending a query. - It is now obsolete, and has no effect. - .. option:: +multiline, +nomultiline This option toggles printing of records, like the SOA records, in a verbose multi-line format diff --git a/doc/arm/reference.rst b/doc/arm/reference.rst index c229f15a61..dcf1f3b384 100644 --- a/doc/arm/reference.rst +++ b/doc/arm/reference.rst @@ -1599,14 +1599,6 @@ default is used. setting it to 0 removes the limit. Once the limit is exceeded, the server finishes the HTTP session. -.. namedconf:statement:: dscp - :tags: server, query - :short: Sets the Differentiated Services Code Point (DSCP) value (obsolete). - - This option used to set the global Differentiated Services Code Point - (DSCP) value to classify outgoing DNS traffic. It is now obsolete and - has no effect. - .. namedconf:statement:: preferred-glue :tags: query :short: Controls the order of glue records in an A or AAAA response. diff --git a/doc/man/dig.1in b/doc/man/dig.1in index a0ad0ec541..3ce9692fc5 100644 --- a/doc/man/dig.1in +++ b/doc/man/dig.1in @@ -402,12 +402,6 @@ given. .UNINDENT .INDENT 0.0 .TP -.B +dscp=value -This option formerly set the DSCP value used when sending a query. -It is now obsolete, and has no effect. -.UNINDENT -.INDENT 0.0 -.TP .B +edns[=#], +noedns This option specifies the EDNS version to query with. Valid values are 0 to 255. Setting the EDNS version causes an EDNS query to be sent. diff --git a/doc/man/mdig.1in b/doc/man/mdig.1in index 4365a496e6..9979cf849b 100644 --- a/doc/man/mdig.1in +++ b/doc/man/mdig.1in @@ -185,12 +185,6 @@ key ID is displayed as the replacement, e.g., \fB[ key id = value ]\fP\&. .UNINDENT .INDENT 0.0 .TP -.B +dscp=value -This option formerly set the DSCP value used when sending a query. -It is now obsolete, and has no effect. -.UNINDENT -.INDENT 0.0 -.TP .B +multiline, +nomultiline This option toggles printing of records, like the SOA records, in a verbose multi\-line format with human\-readable comments. The default is to print each record on diff --git a/doc/man/named.conf.5in b/doc/man/named.conf.5in index 16ea9e48e7..a4f83bd9e3 100644 --- a/doc/man/named.conf.5in +++ b/doc/man/named.conf.5in @@ -126,7 +126,7 @@ options { allow\-transfer [ port ] [ transport ] { ; ... }; allow\-update { ; ... }; allow\-update\-forwarding { ; ... }; - also\-notify [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source\-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; + also\-notify [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source\-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; answer\-cookie ; attach\-cache ; auth\-nxdomain ; @@ -136,7 +136,7 @@ options { avoid\-v6\-udp\-ports { ; ... }; bindkeys\-file ; blackhole { ; ... }; - catalog\-zones { zone [ default\-primaries [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source\-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... } ] [ zone\-directory ] [ in\-memory ] [ min\-update\-interval ]; ... }; + catalog\-zones { zone [ default\-primaries [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source\-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... } ] [ zone\-directory ] [ in\-memory ] [ min\-update\-interval ]; ... }; check\-dup\-records ( fail | warn | ignore ); check\-integrity ; check\-mx ( fail | warn | ignore ); @@ -182,7 +182,6 @@ options { dnstap\-identity ( | none | hostname ); // not configured dnstap\-output ( file | unix ) [ size ( unlimited | ) ] [ versions ( unlimited | ) ] [ suffix ( increment | timestamp ) ]; // not configured dnstap\-version ( | none ); // not configured - dscp ; // obsolete dual\-stack\-servers [ port ] { ( [ port ] | [ port ] | [ port ] ); ... }; dump\-file ; edns\-udp\-size ; @@ -194,7 +193,7 @@ options { fetches\-per\-zone [ ( drop | fail ) ]; flush\-zones\-on\-shutdown ; forward ( first | only ); - forwarders [ port ] { ( | ) [ port ]; ... }; + forwarders [ port ] { ( | ) [ port ]; ... }; fstrm\-set\-buffer\-hint ; // not configured fstrm\-set\-flush\-timeout ; // not configured fstrm\-set\-input\-queue\-size ; // not configured @@ -370,11 +369,11 @@ options { zone\-statistics ( full | terse | none | ); }; -parental\-agents [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source\-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; // may occur multiple times +parental\-agents [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source\-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; // may occur multiple times plugin ( query ) [ { } ]; // may occur multiple times -primaries [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source\-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; // may occur multiple times +primaries [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source\-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; // may occur multiple times server { bogus ; @@ -434,11 +433,11 @@ view [ ] { allow\-transfer [ port ] [ transport ] { ; ... }; allow\-update { ; ... }; allow\-update\-forwarding { ; ... }; - also\-notify [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source\-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; + also\-notify [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source\-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; attach\-cache ; auth\-nxdomain ; auto\-dnssec ( allow | maintain | off ); // deprecated - catalog\-zones { zone [ default\-primaries [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source\-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... } ] [ zone\-directory ] [ in\-memory ] [ min\-update\-interval ]; ... }; + catalog\-zones { zone [ default\-primaries [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source\-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... } ] [ zone\-directory ] [ in\-memory ] [ min\-update\-interval ]; ... }; check\-dup\-records ( fail | warn | ignore ); check\-integrity ; check\-mx ( fail | warn | ignore ); @@ -492,7 +491,7 @@ view [ ] { fetches\-per\-server [ ( drop | fail ) ]; fetches\-per\-zone [ ( drop | fail ) ]; forward ( first | only ); - forwarders [ port ] { ( | ) [ port ]; ... }; + forwarders [ port ] { ( | ) [ port ]; ... }; ipv4only\-contact ; ipv4only\-enable ; ipv4only\-server ; @@ -660,7 +659,7 @@ zone [ ] { allow\-query\-on { ; ... }; allow\-transfer [ port ] [ transport ] { ; ... }; allow\-update { ; ... }; - also\-notify [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source\-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; + also\-notify [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source\-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; auto\-dnssec ( allow | maintain | off ); // deprecated check\-dup\-records ( fail | warn | ignore ); check\-integrity ; @@ -683,7 +682,7 @@ zone [ ] { dnssec\-update\-mode ( maintain | no\-resign ); file ; forward ( first | only ); - forwarders [ port ] { ( | ) [ port ]; ... }; + forwarders [ port ] { ( | ) [ port ]; ... }; inline\-signing ; ixfr\-from\-differences ; journal ; @@ -702,7 +701,7 @@ zone [ ] { notify\-source\-v6 ( | * ) [ port ( | * ) ]; notify\-to\-soa ; nsec3\-test\-zone ; // test only - parental\-agents [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source\-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; + parental\-agents [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source\-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; parental\-source ( | * ) [ port ( | * ) ]; parental\-source\-v6 ( | * ) [ port ( | * ) ]; serial\-update\-method ( date | increment | unixtime ); @@ -732,7 +731,7 @@ zone [ ] { allow\-query\-on { ; ... }; allow\-transfer [ port ] [ transport ] { ; ... }; allow\-update\-forwarding { ; ... }; - also\-notify [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source\-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; + also\-notify [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source\-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; auto\-dnssec ( allow | maintain | off ); // deprecated check\-names ( fail | warn | ignore ); database ; @@ -745,7 +744,7 @@ zone [ ] { dnssec\-update\-mode ( maintain | no\-resign ); file ; forward ( first | only ); - forwarders [ port ] { ( | ) [ port ]; ... }; + forwarders [ port ] { ( | ) [ port ]; ... }; inline\-signing ; ixfr\-from\-differences ; journal ; @@ -770,10 +769,10 @@ zone [ ] { notify\-source\-v6 ( | * ) [ port ( | * ) ]; notify\-to\-soa ; nsec3\-test\-zone ; // test only - parental\-agents [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source\-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; + parental\-agents [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source\-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; parental\-source ( | * ) [ port ( | * ) ]; parental\-source\-v6 ( | * ) [ port ( | * ) ]; - primaries [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source\-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; + primaries [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source\-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; request\-expire ; request\-ixfr ; sig\-signing\-nodes ; @@ -804,7 +803,7 @@ zone [ ] { allow\-query\-on { ; ... }; allow\-transfer [ port ] [ transport ] { ; ... }; allow\-update\-forwarding { ; ... }; - also\-notify [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source\-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; + also\-notify [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source\-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; check\-names ( fail | warn | ignore ); database ; file ; @@ -828,7 +827,7 @@ zone [ ] { notify\-delay ; notify\-source ( | * ) [ port ( | * ) ]; notify\-source\-v6 ( | * ) [ port ( | * ) ]; - primaries [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source\-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; + primaries [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source\-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; request\-expire ; request\-ixfr ; transfer\-source ( | * ) [ port ( | * ) ]; @@ -851,7 +850,7 @@ zone [ ] { type forward; delegation\-only ; forward ( first | only ); - forwarders [ port ] { ( | ) [ port ]; ... }; + forwarders [ port ] { ( | ) [ port ]; ... }; }; .ft P @@ -889,7 +888,7 @@ zone [ ] { masterfile\-style ( full | relative ); max\-records ; max\-zone\-ttl ( unlimited | ); // deprecated - primaries [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source\-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; + primaries [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source\-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; zone\-statistics ( full | terse | none | ); }; @@ -907,7 +906,7 @@ zone [ ] { allow\-query { ; ... }; allow\-query\-on { ; ... }; forward ( first | only ); - forwarders [ port ] { ( | ) [ port ]; ... }; + forwarders [ port ] { ( | ) [ port ]; ... }; max\-records ; server\-addresses { ( | ); ... }; server\-names { ; ... }; @@ -933,7 +932,7 @@ zone [ ] { dialup ( notify | notify\-passive | passive | refresh | ); file ; forward ( first | only ); - forwarders [ port ] { ( | ) [ port ]; ... }; + forwarders [ port ] { ( | ) [ port ]; ... }; masterfile\-format ( raw | text ); masterfile\-style ( full | relative ); max\-records ; @@ -944,7 +943,7 @@ zone [ ] { min\-refresh\-time ; min\-retry\-time ; multi\-master ; - primaries [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source\-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; + primaries [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source\-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; transfer\-source ( | * ) [ port ( | * ) ]; transfer\-source\-v6 ( | * ) [ port ( | * ) ]; zone\-statistics ( full | terse | none | ); diff --git a/doc/misc/forward.zoneopt b/doc/misc/forward.zoneopt index 148b74c584..211a0901b9 100644 --- a/doc/misc/forward.zoneopt +++ b/doc/misc/forward.zoneopt @@ -2,5 +2,5 @@ zone [ ] { type forward; delegation-only ; forward ( first | only ); - forwarders [ port ] { ( | ) [ port ]; ... }; + forwarders [ port ] { ( | ) [ port ]; ... }; }; diff --git a/doc/misc/mirror.zoneopt b/doc/misc/mirror.zoneopt index 7102c23706..5756c0fdb3 100644 --- a/doc/misc/mirror.zoneopt +++ b/doc/misc/mirror.zoneopt @@ -5,7 +5,7 @@ zone [ ] { allow-query-on { ; ... }; allow-transfer [ port ] [ transport ] { ; ... }; allow-update-forwarding { ; ... }; - also-notify [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; + also-notify [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; check-names ( fail | warn | ignore ); database ; file ; @@ -29,7 +29,7 @@ zone [ ] { notify-delay ; notify-source ( | * ) [ port ( | * ) ]; notify-source-v6 ( | * ) [ port ( | * ) ]; - primaries [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; + primaries [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; request-expire ; request-ixfr ; transfer-source ( | * ) [ port ( | * ) ]; diff --git a/doc/misc/options b/doc/misc/options index ed8cdace58..68cb662666 100644 --- a/doc/misc/options +++ b/doc/misc/options @@ -69,7 +69,7 @@ options { allow-transfer [ port ] [ transport ] { ; ... }; allow-update { ; ... }; allow-update-forwarding { ; ... }; - also-notify [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; + also-notify [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; answer-cookie ; attach-cache ; auth-nxdomain ; @@ -79,7 +79,7 @@ options { avoid-v6-udp-ports { ; ... }; bindkeys-file ; blackhole { ; ... }; - catalog-zones { zone [ default-primaries [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... } ] [ zone-directory ] [ in-memory ] [ min-update-interval ]; ... }; + catalog-zones { zone [ default-primaries [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... } ] [ zone-directory ] [ in-memory ] [ min-update-interval ]; ... }; check-dup-records ( fail | warn | ignore ); check-integrity ; check-mx ( fail | warn | ignore ); @@ -125,7 +125,6 @@ options { dnstap-identity ( | none | hostname ); // not configured dnstap-output ( file | unix ) [ size ( unlimited | ) ] [ versions ( unlimited | ) ] [ suffix ( increment | timestamp ) ]; // not configured dnstap-version ( | none ); // not configured - dscp ; // obsolete dual-stack-servers [ port ] { ( [ port ] | [ port ] | [ port ] ); ... }; dump-file ; edns-udp-size ; @@ -137,7 +136,7 @@ options { fetches-per-zone [ ( drop | fail ) ]; flush-zones-on-shutdown ; forward ( first | only ); - forwarders [ port ] { ( | ) [ port ]; ... }; + forwarders [ port ] { ( | ) [ port ]; ... }; fstrm-set-buffer-hint ; // not configured fstrm-set-flush-timeout ; // not configured fstrm-set-input-queue-size ; // not configured @@ -313,11 +312,11 @@ options { zone-statistics ( full | terse | none | ); }; -parental-agents [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; // may occur multiple times +parental-agents [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; // may occur multiple times plugin ( query ) [ { } ]; // may occur multiple times -primaries [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; // may occur multiple times +primaries [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; // may occur multiple times server { bogus ; @@ -377,11 +376,11 @@ view [ ] { allow-transfer [ port ] [ transport ] { ; ... }; allow-update { ; ... }; allow-update-forwarding { ; ... }; - also-notify [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; + also-notify [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; attach-cache ; auth-nxdomain ; auto-dnssec ( allow | maintain | off ); // deprecated - catalog-zones { zone [ default-primaries [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... } ] [ zone-directory ] [ in-memory ] [ min-update-interval ]; ... }; + catalog-zones { zone [ default-primaries [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... } ] [ zone-directory ] [ in-memory ] [ min-update-interval ]; ... }; check-dup-records ( fail | warn | ignore ); check-integrity ; check-mx ( fail | warn | ignore ); @@ -435,7 +434,7 @@ view [ ] { fetches-per-server [ ( drop | fail ) ]; fetches-per-zone [ ( drop | fail ) ]; forward ( first | only ); - forwarders [ port ] { ( | ) [ port ]; ... }; + forwarders [ port ] { ( | ) [ port ]; ... }; ipv4only-contact ; ipv4only-enable ; ipv4only-server ; diff --git a/doc/misc/primary.zoneopt b/doc/misc/primary.zoneopt index a0c028cf7b..6b1bb177b8 100644 --- a/doc/misc/primary.zoneopt +++ b/doc/misc/primary.zoneopt @@ -4,7 +4,7 @@ zone [ ] { allow-query-on { ; ... }; allow-transfer [ port ] [ transport ] { ; ... }; allow-update { ; ... }; - also-notify [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; + also-notify [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; auto-dnssec ( allow | maintain | off ); // deprecated check-dup-records ( fail | warn | ignore ); check-integrity ; @@ -27,7 +27,7 @@ zone [ ] { dnssec-update-mode ( maintain | no-resign ); file ; forward ( first | only ); - forwarders [ port ] { ( | ) [ port ]; ... }; + forwarders [ port ] { ( | ) [ port ]; ... }; inline-signing ; ixfr-from-differences ; journal ; @@ -46,7 +46,7 @@ zone [ ] { notify-source-v6 ( | * ) [ port ( | * ) ]; notify-to-soa ; nsec3-test-zone ; // test only - parental-agents [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; + parental-agents [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; parental-source ( | * ) [ port ( | * ) ]; parental-source-v6 ( | * ) [ port ( | * ) ]; serial-update-method ( date | increment | unixtime ); diff --git a/doc/misc/redirect.zoneopt b/doc/misc/redirect.zoneopt index 1db015a1f7..84fff6cbab 100644 --- a/doc/misc/redirect.zoneopt +++ b/doc/misc/redirect.zoneopt @@ -8,6 +8,6 @@ zone [ ] { masterfile-style ( full | relative ); max-records ; max-zone-ttl ( unlimited | ); // deprecated - primaries [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; + primaries [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; zone-statistics ( full | terse | none | ); }; diff --git a/doc/misc/secondary.zoneopt b/doc/misc/secondary.zoneopt index 05b3a5ed30..fc4a07be03 100644 --- a/doc/misc/secondary.zoneopt +++ b/doc/misc/secondary.zoneopt @@ -5,7 +5,7 @@ zone [ ] { allow-query-on { ; ... }; allow-transfer [ port ] [ transport ] { ; ... }; allow-update-forwarding { ; ... }; - also-notify [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; + also-notify [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; auto-dnssec ( allow | maintain | off ); // deprecated check-names ( fail | warn | ignore ); database ; @@ -18,7 +18,7 @@ zone [ ] { dnssec-update-mode ( maintain | no-resign ); file ; forward ( first | only ); - forwarders [ port ] { ( | ) [ port ]; ... }; + forwarders [ port ] { ( | ) [ port ]; ... }; inline-signing ; ixfr-from-differences ; journal ; @@ -43,10 +43,10 @@ zone [ ] { notify-source-v6 ( | * ) [ port ( | * ) ]; notify-to-soa ; nsec3-test-zone ; // test only - parental-agents [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; + parental-agents [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; parental-source ( | * ) [ port ( | * ) ]; parental-source-v6 ( | * ) [ port ( | * ) ]; - primaries [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; + primaries [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; request-expire ; request-ixfr ; sig-signing-nodes ; diff --git a/doc/misc/static-stub.zoneopt b/doc/misc/static-stub.zoneopt index 5357528e6f..58fd0ce9eb 100644 --- a/doc/misc/static-stub.zoneopt +++ b/doc/misc/static-stub.zoneopt @@ -3,7 +3,7 @@ zone [ ] { allow-query { ; ... }; allow-query-on { ; ... }; forward ( first | only ); - forwarders [ port ] { ( | ) [ port ]; ... }; + forwarders [ port ] { ( | ) [ port ]; ... }; max-records ; server-addresses { ( | ); ... }; server-names { ; ... }; diff --git a/doc/misc/stub.zoneopt b/doc/misc/stub.zoneopt index b2af973bf2..3fcaff54e1 100644 --- a/doc/misc/stub.zoneopt +++ b/doc/misc/stub.zoneopt @@ -8,7 +8,7 @@ zone [ ] { dialup ( notify | notify-passive | passive | refresh | ); file ; forward ( first | only ); - forwarders [ port ] { ( | ) [ port ]; ... }; + forwarders [ port ] { ( | ) [ port ]; ... }; masterfile-format ( raw | text ); masterfile-style ( full | relative ); max-records ; @@ -19,7 +19,7 @@ zone [ ] { min-refresh-time ; min-retry-time ; multi-master ; - primaries [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; + primaries [ port ] [ source ( | * ) [ port ( | * ) ] ] [ source-v6 ( | * ) [ port ( | * ) ] ] { ( | [ port ] | [ port ] ) [ key ] [ tls ]; ... }; transfer-source ( | * ) [ port ( | * ) ]; transfer-source-v6 ( | * ) [ port ( | * ) ]; zone-statistics ( full | terse | none | ); diff --git a/lib/isccfg/include/isccfg/grammar.h b/lib/isccfg/include/isccfg/grammar.h index 447ba71171..83371179d0 100644 --- a/lib/isccfg/include/isccfg/grammar.h +++ b/lib/isccfg/include/isccfg/grammar.h @@ -169,18 +169,14 @@ struct cfg_rep { struct cfg_obj { const cfg_type_t *type; union { - uint32_t uint32; - uint64_t uint64; - isc_textregion_t string; /*%< null terminated, too */ - bool boolean; - cfg_map_t map; - cfg_list_t list; - cfg_obj_t **tuple; - isc_sockaddr_t sockaddr; - struct { - isc_sockaddr_t sockaddr; - int32_t dscp; - } sockaddrdscp; + uint32_t uint32; + uint64_t uint64; + isc_textregion_t string; /*%< null terminated, too */ + bool boolean; + cfg_map_t map; + cfg_list_t list; + cfg_obj_t **tuple; + isc_sockaddr_t sockaddr; cfg_netprefix_t netprefix; isccfg_duration_t duration; } value; @@ -269,7 +265,6 @@ struct cfg_parser { #define CFG_ADDR_V4PREFIXOK 0x00000002 #define CFG_ADDR_V6OK 0x00000004 #define CFG_ADDR_WILDOK 0x00000008 -#define CFG_ADDR_DSCPOK 0x00000010 #define CFG_ADDR_MASK (CFG_ADDR_V6OK | CFG_ADDR_V4OK) /*@}*/ @@ -308,7 +303,6 @@ extern cfg_type_t cfg_type_bracketed_text; extern cfg_type_t cfg_type_optional_bracketed_text; extern cfg_type_t cfg_type_keyref; extern cfg_type_t cfg_type_sockaddr; -extern cfg_type_t cfg_type_sockaddrdscp; extern cfg_type_t cfg_type_netaddr; extern cfg_type_t cfg_type_netaddr4; extern cfg_type_t cfg_type_netaddr4wild; diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c index 6178b81f4e..935ecc46e6 100644 --- a/lib/isccfg/namedconf.c +++ b/lib/isccfg/namedconf.c @@ -87,9 +87,9 @@ static void cfg_doc_kv_tuple(cfg_printer_t *pctx, const cfg_type_t *type); static cfg_type_t cfg_type_acl; -static cfg_type_t cfg_type_bracketed_dscpsockaddrlist; static cfg_type_t cfg_type_bracketed_namesockaddrkeylist; static cfg_type_t cfg_type_bracketed_netaddrlist; +static cfg_type_t cfg_type_bracketed_sockaddrlist; static cfg_type_t cfg_type_bracketed_sockaddrnameportlist; static cfg_type_t cfg_type_bracketed_http_endpoint_list; static cfg_type_t cfg_type_controls; @@ -117,7 +117,6 @@ static cfg_type_t cfg_type_nameportiplist; static cfg_type_t cfg_type_notifytype; static cfg_type_t cfg_type_optional_allow; static cfg_type_t cfg_type_optional_class; -static cfg_type_t cfg_type_optional_dscp; static cfg_type_t cfg_type_optional_facility; static cfg_type_t cfg_type_optional_keyref; static cfg_type_t cfg_type_optional_port; @@ -163,8 +162,6 @@ static cfg_type_t cfg_type_tkey_dhkey = { "tkey-dhkey", cfg_parse_tuple, static cfg_tuplefielddef_t listenon_tuple_fields[] = { { "port", &cfg_type_optional_port, 0 }, - { "dscp", &cfg_type_uint32, - CFG_CLAUSEFLAG_OBSOLETE | CFG_CLAUSEFLAG_NODOC }, { "tls", &cfg_type_astring, 0 }, #if HAVE_LIBNGHTTP2 { "http", &cfg_type_astring, 0 }, @@ -236,7 +233,6 @@ static cfg_type_t cfg_type_acl = { "acl", cfg_parse_tuple, static cfg_tuplefielddef_t remotes_fields[] = { { "name", &cfg_type_astring, 0 }, { "port", &cfg_type_optional_port, 0 }, - { "dscp", &cfg_type_optional_dscp, CFG_CLAUSEFLAG_OBSOLETE }, { "source", &cfg_type_optional_sourceaddr4, 0 }, { "source-v6", &cfg_type_optional_sourceaddr6, 0 }, { "addresses", &cfg_type_bracketed_namesockaddrkeylist, 0 }, @@ -277,7 +273,6 @@ static cfg_type_t cfg_type_bracketed_namesockaddrkeylist = { static cfg_tuplefielddef_t namesockaddrkeylist_fields[] = { { "port", &cfg_type_optional_port, 0 }, - { "dscp", &cfg_type_optional_dscp, CFG_CLAUSEFLAG_OBSOLETE }, { "source", &cfg_type_optional_sourceaddr4, 0 }, { "source-v6", &cfg_type_optional_sourceaddr6, 0 }, { "addresses", &cfg_type_bracketed_namesockaddrkeylist, 0 }, @@ -294,8 +289,7 @@ static cfg_type_t cfg_type_namesockaddrkeylist = { */ static cfg_tuplefielddef_t portiplist_fields[] = { { "port", &cfg_type_optional_port, 0 }, - { "dscp", &cfg_type_optional_dscp, CFG_CLAUSEFLAG_OBSOLETE }, - { "addresses", &cfg_type_bracketed_dscpsockaddrlist, 0 }, + { "addresses", &cfg_type_bracketed_sockaddrlist, 0 }, { NULL, NULL, 0 } }; static cfg_type_t cfg_type_portiplist = { "portiplist", cfg_parse_tuple, @@ -731,15 +725,6 @@ static cfg_type_t cfg_type_checknames = { "checknames", cfg_parse_tuple, cfg_print_tuple, cfg_doc_tuple, &cfg_rep_tuple, checknames_fields }; -static cfg_type_t cfg_type_bracketed_dscpsockaddrlist = { - "bracketed_sockaddrlist", - cfg_parse_bracketed_list, - cfg_print_bracketed_list, - cfg_doc_bracketed_list, - &cfg_rep_list, - &cfg_type_sockaddrdscp -}; - static cfg_type_t cfg_type_bracketed_netaddrlist = { "bracketed_netaddrlist", cfg_parse_bracketed_list, cfg_print_bracketed_list, @@ -747,6 +732,13 @@ static cfg_type_t cfg_type_bracketed_netaddrlist = { "bracketed_netaddrlist", &cfg_rep_list, &cfg_type_netaddr }; +static cfg_type_t cfg_type_bracketed_sockaddrlist = { "bracketed_sockaddrlist", + cfg_parse_bracketed_list, + cfg_print_bracketed_list, + cfg_doc_bracketed_list, + &cfg_rep_list, + &cfg_type_sockaddr }; + static const char *autodnssec_enums[] = { "allow", "maintain", "off", NULL }; static cfg_type_t cfg_type_autodnssec = { "autodnssec", cfg_parse_enum, cfg_print_ustring, @@ -793,13 +785,6 @@ static cfg_type_t cfg_type_rrsetorder = { "rrsetorder", &cfg_rep_list, &cfg_type_rrsetorderingelement }; -static keyword_type_t dscp_kw = { "dscp", &cfg_type_uint32 }; - -static cfg_type_t cfg_type_optional_dscp = { - "optional_dscp", parse_optional_keyvalue, print_keyvalue, - cfg_doc_void, &cfg_rep_uint32, &dscp_kw -}; - static keyword_type_t port_kw = { "port", &cfg_type_uint32 }; static cfg_type_t cfg_type_optional_port = { @@ -1241,7 +1226,7 @@ static cfg_clausedef_t options_clauses[] = { { "dnstap-version", &cfg_type_qstringornone, CFG_CLAUSEFLAG_NOTCONFIGURED }, #endif /* ifdef HAVE_DNSTAP */ - { "dscp", &cfg_type_uint32, CFG_CLAUSEFLAG_OBSOLETE }, + { "dscp", &cfg_type_uint32, CFG_CLAUSEFLAG_ANCIENT }, { "dump-file", &cfg_type_qstring, 0 }, { "fake-iquery", NULL, CFG_CLAUSEFLAG_ANCIENT }, { "files", &cfg_type_size, CFG_CLAUSEFLAG_ANCIENT }, @@ -3180,9 +3165,7 @@ parse_querysource(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { in_port_t port = 0; unsigned int have_address = 0; unsigned int have_port = 0; - unsigned int have_dscp = 0; const unsigned int *flagp = type->of; - int dscp = -1; if ((*flagp & CFG_ADDR_V4OK) != 0) { isc_netaddr_any(&netaddr); @@ -3208,20 +3191,7 @@ parse_querysource(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { CHECK(cfg_parse_rawport(pctx, CFG_ADDR_WILDOK, &port)); have_port++; - } else if (strcasecmp(TOKEN_STRING(pctx), "dscp") == 0) - { - /* read "dscp" */ - cfg_parser_warning(pctx, 0, - "'dscp' is obsolete and " - "should be removed"); - CHECK(cfg_gettoken(pctx, 0)); - CHECK(cfg_parse_uint32(pctx, NULL, &obj)); - dscp = cfg_obj_asuint32(obj); - cfg_obj_destroy(pctx, &obj); - have_dscp++; - } else if (have_port == 0 && have_dscp == 0 && - have_address == 0) - { + } else if (have_port == 0 && have_address == 0) { return (cfg_parse_sockaddr(pctx, type, ret)); } else { cfg_parser_error(pctx, CFG_LOG_NEAR, @@ -3239,14 +3209,8 @@ parse_querysource(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { return (ISC_R_UNEXPECTEDTOKEN); } - if (have_dscp > 1) { - cfg_parser_error(pctx, 0, "expected at most one dscp"); - return (ISC_R_UNEXPECTEDTOKEN); - } - CHECK(cfg_create_obj(pctx, &cfg_type_querysource, &obj)); isc_sockaddr_fromnetaddr(&obj->value.sockaddr, &netaddr, port); - obj->value.sockaddrdscp.dscp = dscp; *ret = obj; return (ISC_R_SUCCESS); @@ -3264,10 +3228,6 @@ print_querysource(cfg_printer_t *pctx, const cfg_obj_t *obj) { cfg_print_rawaddr(pctx, &na); cfg_print_cstr(pctx, " port "); cfg_print_rawuint(pctx, isc_sockaddr_getport(&obj->value.sockaddr)); - if (obj->value.sockaddrdscp.dscp != -1) { - cfg_print_cstr(pctx, " dscp "); - cfg_print_rawuint(pctx, obj->value.sockaddrdscp.dscp); - } } static void @@ -3294,10 +3254,8 @@ doc_querysource(cfg_printer_t *pctx, const cfg_type_t *type) { cfg_print_cstr(pctx, " | * ) ] port ( | * ) ) )"); } -static unsigned int sockaddr4wild_flags = CFG_ADDR_WILDOK | CFG_ADDR_V4OK | - CFG_ADDR_DSCPOK; -static unsigned int sockaddr6wild_flags = CFG_ADDR_WILDOK | CFG_ADDR_V6OK | - CFG_ADDR_DSCPOK; +static unsigned int sockaddr4wild_flags = CFG_ADDR_WILDOK | CFG_ADDR_V4OK; +static unsigned int sockaddr6wild_flags = CFG_ADDR_WILDOK | CFG_ADDR_V6OK; static cfg_type_t cfg_type_querysource4 = { "querysource4", parse_querysource, NULL, doc_querysource, @@ -3671,7 +3629,6 @@ cfg_type_t cfg_type_sessionkey = { "sessionkey", cfg_parse_mapbody, static cfg_tuplefielddef_t nameport_fields[] = { { "name", &cfg_type_astring, 0 }, { "port", &cfg_type_optional_port, 0 }, - { "dscp", &cfg_type_optional_dscp, CFG_CLAUSEFLAG_OBSOLETE }, { NULL, NULL, 0 } }; diff --git a/lib/isccfg/parser.c b/lib/isccfg/parser.c index 9ff1ed1522..967bc38f1a 100644 --- a/lib/isccfg/parser.c +++ b/lib/isccfg/parser.c @@ -3037,7 +3037,6 @@ parse_netaddr(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { CHECK(cfg_create_obj(pctx, type, &obj)); CHECK(cfg_parse_rawaddr(pctx, flags, &netaddr)); isc_sockaddr_fromnetaddr(&obj->value.sockaddr, &netaddr, 0); - obj->value.sockaddrdscp.dscp = -1; *ret = obj; return (ISC_R_SUCCESS); cleanup: @@ -3211,12 +3210,10 @@ parse_sockaddrsub(cfg_parser_t *pctx, const cfg_type_t *type, int flags, isc_netaddr_t netaddr; in_port_t port = 0; cfg_obj_t *obj = NULL; - int have_port = 0, have_dscp = 0; - cfg_obj_t *dscp = NULL; + int have_port = 0; CHECK(cfg_create_obj(pctx, type, &obj)); CHECK(cfg_parse_rawaddr(pctx, flags, &netaddr)); - obj->value.sockaddrdscp.dscp = -1; for (;;) { CHECK(cfg_peektoken(pctx, 0)); if (pctx->token.type == isc_tokentype_string) { @@ -3224,18 +3221,6 @@ parse_sockaddrsub(cfg_parser_t *pctx, const cfg_type_t *type, int flags, CHECK(cfg_gettoken(pctx, 0)); /* read "port" */ CHECK(cfg_parse_rawport(pctx, flags, &port)); ++have_port; - } else if ((flags & CFG_ADDR_DSCPOK) != 0 && - strcasecmp(TOKEN_STRING(pctx), "dscp") == 0) - { - cfg_parser_warning(pctx, 0, - "'dscp' is obsolete and " - "should be removed"); - CHECK(cfg_gettoken(pctx, 0)); /* read "dscp" */ - CHECK(cfg_parse_uint32(pctx, NULL, &dscp)); - obj->value.sockaddrdscp.dscp = - cfg_obj_asuint32(dscp); - cfg_obj_destroy(pctx, &dscp); - ++have_dscp; } else { break; } @@ -3249,11 +3234,6 @@ parse_sockaddrsub(cfg_parser_t *pctx, const cfg_type_t *type, int flags, goto cleanup; } - if (have_dscp > 1) { - cfg_parser_error(pctx, 0, "expected at most one dscp"); - result = ISC_R_UNEXPECTEDTOKEN; - goto cleanup; - } isc_sockaddr_fromnetaddr(&obj->value.sockaddr, &netaddr, port); *ret = obj; return (ISC_R_SUCCESS); @@ -3268,12 +3248,6 @@ cfg_type_t cfg_type_sockaddr = { "sockaddr", cfg_parse_sockaddr, cfg_print_sockaddr, cfg_doc_sockaddr, &cfg_rep_sockaddr, &sockaddr_flags }; -static unsigned int sockaddrdscp_flags = CFG_ADDR_V4OK | CFG_ADDR_V6OK | - CFG_ADDR_DSCPOK; -cfg_type_t cfg_type_sockaddrdscp = { "sockaddr", cfg_parse_sockaddr, - cfg_print_sockaddr, cfg_doc_sockaddr, - &cfg_rep_sockaddr, &sockaddrdscp_flags }; - isc_result_t cfg_parse_sockaddr(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) { @@ -3305,10 +3279,6 @@ cfg_print_sockaddr(cfg_printer_t *pctx, const cfg_obj_t *obj) { cfg_print_cstr(pctx, " port "); cfg_print_rawuint(pctx, port); } - if (obj->value.sockaddrdscp.dscp != -1) { - cfg_print_cstr(pctx, " dscp "); - cfg_print_rawuint(pctx, obj->value.sockaddrdscp.dscp); - } } void