From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 7 Aug 2021 17:50:40 +0000 (+0100)
Subject: config: Tidy up ipif setting
X-Git-Tag: hippotat/1.0.0~265
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=92d22b25e401e29ffdbf7d5136bb2016d37570d1;p=hippotat.git

config: Tidy up ipif setting

We can and should just use `ordinary(..,Global)` directly.

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

diff --git a/src/config.rs b/src/config.rs
index 557602e..c373549 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -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)?,
     }
   }