From: Ian Jackson Date: Sat, 7 Aug 2021 18:11:34 +0000 (+0100) Subject: config: Rename ClientAgnostic to Global X-Git-Tag: hippotat/1.0.0~276 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=9c1e2f74daa8da529084be823f8395402fb8ba93;p=hippotat.git config: Rename ClientAgnostic to Global NFC yet, but we are going to change this. Signed-off-by: Ian Jackson --- diff --git a/src/config.rs b/src/config.rs index 77f3401..2bdb75b 100644 --- a/src/config.rs +++ b/src/config.rs @@ -519,7 +519,7 @@ enum SectionKindList { PerClient, Limited, Limits, - ClientAgnostic, + Global, ServerName, } use SectionKindList as SKL; @@ -541,7 +541,7 @@ impl SectionKindList { SKL::Limits => matches!(s, SN::ServerLimit(_) | SN::GlobalLimit), - SKL::ClientAgnostic => matches!(s, SN::Common + SKL::Global => matches!(s, SN::Common | SN::Server(_)), SKL::Limited => SKL::PerClient.contains(s) @@ -660,7 +660,7 @@ impl<'c> ResolveContext<'c> { match self.end { LinkEnd::Client => self.ordinary(key)?, LinkEnd::Server => { - self.first_of(key, SKL::ClientAgnostic)? + self.first_of(key, SKL::Global)? .unwrap_or_default() }, }