make erase incompatible with all other actions.
thus we don't need to worry about if the pin/so-pin was passed for the old structures (before erase) or the new ones (if used with create). git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3966 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
parent
b83ed7ed71
commit
72d5ebb79c
|
@ -2639,10 +2639,16 @@ handle_option(const struct option *opt)
|
|||
|
||||
if ((opt_pins[OPT_PIN2&3] || opt_pins[OPT_PUK2&3]) && opt_no_sopin) {
|
||||
fprintf(stderr, "Error: "
|
||||
"The --no-so-pin option and --so-pin/--so-puk are mutually\n"
|
||||
"The --no-so-pin option and --so-pin/--so-puk are mutually"
|
||||
"exclusive.\n");
|
||||
util_print_usage_and_die(app_name, options, option_help);
|
||||
}
|
||||
|
||||
if ((opt_actions & (1 << ACTION_ERASE)) &&
|
||||
(opt_actions != (1 << ACTION_ERASE))) {
|
||||
fprintf(stderr, "Error: erasing a card is incompatible with all other actions\n");
|
||||
util_print_usage_and_die(app_name, options, option_help);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
Loading…
Reference in New Issue