Force re-scan of devices during recovery

6eac006 was a little too aggressive about the caching
thing.

Author: arekinath

ebox-cmd.c

@@ -367,6 +367,19 @@ local_unlock_agent(struct piv_ecdh_box *box)
 	return (err);
 }
 
+void
+release_context(void)
+{
+	if (ebox_ctx_init) {
+		if (ebox_enum_tokens != NULL) {
+			piv_release(ebox_enum_tokens);
+			ebox_enum_tokens = NULL;
+		}
+		SCardReleaseContext(ebox_ctx);
+		ebox_ctx_init = B_FALSE;
+	}
+}
+
 errf_t *
 local_unlock(struct piv_ecdh_box *box, struct sshkey *cak, const char *name)
 {
@@ -484,7 +497,8 @@ local_unlock(struct piv_ecdh_box *box, struct sshkey *cak, const char *name)
 	err = ERRF_OK;
 
 out:
-	piv_release(tokens);
+	if (tokens != ebox_enum_tokens)
+		piv_release(tokens);
 	return (err);
 }
 
@@ -934,6 +948,7 @@ interactive_recovery(struct ebox_config *config, const char *what)
 		fprintf(stderr, "-- Local device %s --\n",
 		    state->ps_ans->a_text);
 partagain:
+		release_context();
 		error = local_unlock(ebox_part_box(part),
 		    ebox_tpl_part_cak(tpart), ebox_tpl_part_name(tpart));
 		if (error && !errf_caused_by(error, "NotFoundError"))

ebox-cmd.h

@@ -63,6 +63,8 @@ enum ebox_exit_status {
 #define	EBOX_MAX_SIZE		16384
 #define	BASE64_LINE_LEN		65
 
+void release_context(void);
+
 char *piv_token_shortid(struct piv_token *pk);
 const char *pin_type_to_name(enum piv_pin type);
 void assert_pin(struct piv_token *pk, const char *partname, boolean_t prompt);

pivy-box.c

@@ -942,6 +942,7 @@ interactive_unlock_ebox(struct ebox *ebox)
 	if (ebox_tpl_config_type(tconfig) == EBOX_PRIMARY) {
 		part = ebox_config_next_part(config, NULL);
 		tpart = ebox_part_tpl(part);
+		release_context();
 		error = local_unlock(ebox_part_box(part),
 		    ebox_tpl_part_cak(tpart),
 		    ebox_tpl_part_name(tpart));

pivy-luks.c

@@ -154,6 +154,7 @@ unlock_or_recover(struct ebox *ebox, const char *descr, boolean_t *recovered)
 	if (ebox_tpl_config_type(tconfig) == EBOX_PRIMARY) {
 		part = ebox_config_next_part(config, NULL);
 		tpart = ebox_part_tpl(part);
+		release_context();
 		error = local_unlock(ebox_part_box(part),
 		    ebox_tpl_part_cak(tpart),
 		    ebox_tpl_part_name(tpart));

pivy-zfs.c

@@ -156,6 +156,7 @@ unlock_or_recover(struct ebox *ebox, const char *descr, boolean_t *recovered)
 	if (ebox_tpl_config_type(tconfig) == EBOX_PRIMARY) {
 		part = ebox_config_next_part(config, NULL);
 		tpart = ebox_part_tpl(part);
+		release_context();
 		error = local_unlock(ebox_part_box(part),
 		    ebox_tpl_part_cak(tpart),
 		    ebox_tpl_part_name(tpart));