aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2019-02-21 07:40:59 +0000
committerWerner Koch <[email protected]>2019-02-25 07:50:31 +0000
commit0eb8095626be71160dfa66284a7b0a6a57cb03e3 (patch)
treea48cf9c4300ce3a5c58d767f397a9302b3a0f709
parentsm: Fix certificate creation with key on card. (diff)
downloadgnupg-0eb8095626be71160dfa66284a7b0a6a57cb03e3.tar.gz
gnupg-0eb8095626be71160dfa66284a7b0a6a57cb03e3.zip
scd: Don't let the "undefined" app cause a conflict error.
* scd/app.c (check_conflict): Ignore "undefined". Signed-off-by: Werner Koch <[email protected]> (cherry picked from commit 5ecc7a02609dde65096ddb12e0ff8f6bce3b774a)
-rw-r--r--scd/app.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/scd/app.c b/scd/app.c
index ac9a6582c..bb33a56c3 100644
--- a/scd/app.c
+++ b/scd/app.c
@@ -121,6 +121,9 @@ check_conflict (app_t app, const char *name)
if (!app || !name || (app->apptype && !ascii_strcasecmp (app->apptype, name)))
return 0;
+ if (app->apptype && !strcmp (app->apptype, "UNDEFINED"))
+ return 0;
+
log_info ("application '%s' in use - can't switch\n",
app->apptype? app->apptype : "<null>");