chiark
/
gitweb
/
~mdw
/
tripe
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
7737eb8
)
server/keymgmt.c (kh_reopen): Promote the happy path.
author
Mark Wooding
<mdw@distorted.org.uk>
Sat, 12 May 2018 21:20:36 +0000
(22:20 +0100)
committer
Mark Wooding
<mdw@distorted.org.uk>
Fri, 25 Jan 2019 12:10:31 +0000
(12:10 +0000)
server/keymgmt.c
patch
|
blob
|
blame
|
history
diff --git
a/server/keymgmt.c
b/server/keymgmt.c
index 7386408f71cdb13ec65003879a8aa30c666336c0..00c329532479e1c3cda27f19676ac1f78ec20047 100644
(file)
--- 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);
"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@ --- *
}
/* --- @kh_init@ --- *