chiark
/
gitweb
/
~mdw
/
tripe
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
server/test.c: Don't try to trace if it's turned off.
[tripe]
/
server
/
test.c
diff --git
a/server/test.c
b/server/test.c
index db98e37e0455c7922ca45a1fd63ef1be7484feb0..f83cd1e99541a39a229375683adfbf5290364432 100644
(file)
--- a/
server/test.c
+++ b/
server/test.c
@@
-90,11
+90,6
@@
static const char *getarg(void)
static void lastarg(void)
{ if (*args) die(2, "unexpected argument `%s'", *args); }
static void lastarg(void)
{ if (*args) die(2, "unexpected argument `%s'", *args); }
-void iv_addreason(void) { ; }
-void iv_rmreason(void) { ; }
-
-void lp_end(void) { ; }
-
int main(int argc, char *argv[])
{
const char *kr = "keyring";
int main(int argc, char *argv[])
{
const char *kr = "keyring";
@@
-137,7
+132,8
@@
int main(int argc, char *argv[])
args = argv + optind;
km_init(kr, kr, tag);
args = argv + optind;
km_init(kr, kr, tag);
- trace_on(stderr, tr_flags);
+ if (!master) die(3, "failed to load the master key");
+ T( trace_on(stderr, tr_flags); )
arg = getarg();
if (strcmp(arg, "ies-encrypt") == 0) {
arg = getarg();
if (strcmp(arg, "ies-encrypt") == 0) {