chiark / gitweb /
config: Tidy up ipif setting
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 7 Aug 2021 17:50:40 +0000 (18:50 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 7 Aug 2021 18:52:04 +0000 (19:52 +0100)
We can and should just use `ordinary(..,Global)` directly.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
src/config.rs

index 557602efd530541905024c6e1edc23348ce08311..c373549af83e7b51a279ef040f4285807f127816 100644 (file)
@@ -671,10 +671,7 @@ impl<'c> ResolveContext<'c> {
     assert_eq!(skl, SKL::PerClient); // we tolerate it in per-client sections
     match self.end {
       LinkEnd::Client => self.ordinary(key, SKL::PerClient)?,
-      LinkEnd::Server => {
-        self.first_of(key, SKL::Global)?
-          .unwrap_or_default()
-      },
+      LinkEnd::Server => self.ordinary(key, SKL::Global)?,
     }
   }