From cc807016aa6f35f6f9bbb03f75a31ba5045a262c Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Sat, 12 May 2018 22:20:36 +0100
Subject: [PATCH] server/keymgmt.c (kh_reopen): Promote the happy path.

---
 server/keymgmt.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/server/keymgmt.c b/server/keymgmt.c
index 7386408f..00c32953 100644
--- a/server/keymgmt.c
+++ b/server/keymgmt.c
@@ -279,14 +279,13 @@ static int kh_reopen(keyhalf *kh)
 	   "io-error", "?ERRNO", A_END);
     DESTROY(kf);
     return (-1);
-  } else {
-    if (kh->kf) {
-      key_close(kh->kf);
-      DESTROY(kh->kf);
-    }
-    kh->kf = kf;
-    return (0);
   }
+  if (kh->kf) {
+    key_close(kh->kf);
+    DESTROY(kh->kf);
+  }
+  kh->kf = kf;
+  return (0);
 }
 
 /* --- @kh_init@ --- *
-- 
2.11.0