diff options
| author | Werner Koch <[email protected]> | 2014-12-03 10:28:10 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2014-12-03 10:28:10 +0000 |
| commit | 17b4662984b4669d8dcbbd6705ccfbe6c263319c (patch) | |
| tree | 9a05c91ba2c9cd32ca141f2af6f57f1d769f4dff /g10/encrypt.c | |
| parent | agent: Replace some sprintf. (diff) | |
| download | gnupg-17b4662984b4669d8dcbbd6705ccfbe6c263319c.tar.gz gnupg-17b4662984b4669d8dcbbd6705ccfbe6c263319c.zip | |
gpg: Remove option aliases --[no-]throw-keyid and --notation-data.
* g10/gpg.c (opts): Remove them.
* g10/options.h (opt): s/throw_keyid/throw_keyids/ and change users.
--
See mails starting
http://lists.gnupg.org/pipermail/gnupg-devel/2014-November/029128.html
Diffstat (limited to 'g10/encrypt.c')
| -rw-r--r-- | g10/encrypt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/g10/encrypt.c b/g10/encrypt.c index 518b54422..b6925445f 100644 --- a/g10/encrypt.c +++ b/g10/encrypt.c @@ -867,9 +867,9 @@ write_pubkey_enc_from_list (PK_LIST pk_list, DEK *dek, iobuf_t out) enc = xmalloc_clear ( sizeof *enc ); enc->pubkey_algo = pk->pubkey_algo; keyid_from_pk( pk, enc->keyid ); - enc->throw_keyid = (opt.throw_keyid || (pk_list->flags&1)); + enc->throw_keyid = (opt.throw_keyids || (pk_list->flags&1)); - if (opt.throw_keyid && (PGP6 || PGP7 || PGP8)) + if (opt.throw_keyids && (PGP6 || PGP7 || PGP8)) { log_info(_("you may not use %s while in %s mode\n"), "--throw-keyids",compliance_option_string()); |