aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcus Brinkmann <[email protected]>2005-10-16 19:38:32 +0000
committerMarcus Brinkmann <[email protected]>2005-10-16 19:38:32 +0000
commit378f4d3a7ad570dd99edb87ddf48e9752006c297 (patch)
tree6b02b85f39ad3629b83a9994fd2865c7395c9000
parent2005-10-07 Marcus Brinkmann <[email protected]> (diff)
downloadgpgme-378f4d3a7ad570dd99edb87ddf48e9752006c297.tar.gz
gpgme-378f4d3a7ad570dd99edb87ddf48e9752006c297.zip
2005-10-16 Marcus Brinkmann <[email protected]>
* rungpg.c (gpg_edit): Don't add a key argument if in card edit mode.
-rw-r--r--gpgme/ChangeLog5
-rw-r--r--gpgme/rungpg.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index d77adcf5..880ec6bc 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-16 Marcus Brinkmann <[email protected]>
+
+ * rungpg.c (gpg_edit): Don't add a key argument if in card edit
+ mode.
+
2005-10-06 Marcus Brinkmann <[email protected]>
* Makefile.am (gpgme.dll gpgme.dll.a): Use $(srcdir) for
diff --git a/gpgme/rungpg.c b/gpgme/rungpg.c
index 33c46eda..44db825d 100644
--- a/gpgme/rungpg.c
+++ b/gpgme/rungpg.c
@@ -1356,7 +1356,7 @@ gpg_edit (void *engine, int type, gpgme_key_t key, gpgme_data_t out,
err = add_data (gpg, out, 1, 1);
if (!err)
err = add_arg (gpg, "--");
- if (!err)
+ if (!err && type == 0)
{
const char *s = key->subkeys ? key->subkeys->fpr : NULL;
if (!s)