Adapt to changes of c2256ad61a

This should also fix a bug where the commandline input of the lookup
directories given via npa-tool is overwritten with OpenPACE's default.
This commit is contained in:
Frank Morgner
2015-09-03 03:46:02 +02:00
parent 7ce8f53b84
commit 27dd7d09aa

View File

@@ -313,10 +313,6 @@ main (int argc, char **argv)
npa_default_flags |= NPA_FLAG_DISABLE_CHECK_TA;
if (cmdline.disable_ca_checks_flag)
npa_default_flags |= NPA_FLAG_DISABLE_CHECK_CA;
if (cmdline.cvc_dir_given)
cvc_default_dir = cmdline.cvc_dir_arg;
if (cmdline.x509_dir_given)
x509_default_dir = cmdline.cvc_dir_arg;
if (cmdline.info_flag)
@@ -342,6 +338,10 @@ main (int argc, char **argv)
#endif
EAC_init();
if (cmdline.cvc_dir_given)
EAC_set_cvc_default_dir(cmdline.cvc_dir_arg);
if (cmdline.x509_dir_given)
EAC_set_x509_default_dir(cmdline.cvc_dir_arg);
if (cmdline.break_flag) {
/* The biggest buffer sprintf could write with "%llu" */