~mdw
/
tripe
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
server/tripe.c: Establish the stdio admin client early.
[tripe]
/
server
/
keymgmt.c
diff --git
a/server/keymgmt.c
b/server/keymgmt.c
index
7386408
..
6ee65bc
100644
(file)
--- a/
server/keymgmt.c
+++ b/
server/keymgmt.c
@@
-275,18
+275,15
@@
static int kh_reopen(keyhalf *kh)
key_file *kf = CREATE(key_file);
if (key_open(kf, kh->kr, KOPEN_READ, keymoan, kh)) {
key_file *kf = CREATE(key_file);
if (key_open(kf, kh->kr, KOPEN_READ, keymoan, kh)) {
- a_warn("KEYMGMT", "%s-keyring", kh->kind, "%s", kh->kr,
- "io-error", "?ERRNO", A_END);
DESTROY(kf);
return (-1);
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@ --- *
@@
-308,8
+305,7
@@
static void kh_init(keyhalf *kh, const char *kr)
sym_create(&kh->tab);
kh->kf = 0;
sym_create(&kh->tab);
kh->kf = 0;
- if (kh_reopen(kh))
- die(EXIT_FAILURE, "failed to load %s keyring `%s'", kh->kind, kr);
+ if (kh_reopen(kh)) exit(EXIT_FAILURE);
}
/* --- @kh_load@ --- *
}
/* --- @kh_load@ --- *