diff options
| author | Werner Koch <[email protected]> | 2024-06-24 09:49:05 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2024-06-24 09:49:05 +0000 |
| commit | 4c65dfeb2878ee397edcd9918e32db2c39529101 (patch) | |
| tree | cfa9a3e295dfc02c8f49f58ae17057e7dab1f407 /g10/keyserver.c | |
| parent | sm: Emit user IDs in colon mode even if the Subject is empty. (diff) | |
| download | gnupg-4c65dfeb2878ee397edcd9918e32db2c39529101.tar.gz gnupg-4c65dfeb2878ee397edcd9918e32db2c39529101.zip | |
gpg: Rename recently added import option no-seckeys to only-pubkeys.
* g10/import.c (parse_import_options): Rename option.
* g10/options.h (IMPORT_NO_SECKEY): Rename to IMPORT_ONLY_PUBKEYS.
Change all users.
--
GnuPG-bug-id: 7146
Diffstat (limited to 'g10/keyserver.c')
| -rw-r--r-- | g10/keyserver.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/g10/keyserver.c b/g10/keyserver.c index acb82ef32..069c541d2 100644 --- a/g10/keyserver.c +++ b/g10/keyserver.c @@ -1518,7 +1518,7 @@ keyserver_get_chunk (ctrl_t ctrl, KEYDB_SEARCH_DESC *desc, int ndesc, /* For LDAP servers we reset IMPORT_SELF_SIGS_ONLY and * IMPORT_CLEAN unless they have been set explicitly. */ - options = (opt.keyserver_options.import_options | IMPORT_NO_SECKEY); + options = (opt.keyserver_options.import_options | IMPORT_ONLY_PUBKEYS); if (source && (!strncmp (source, "ldap:", 5) || !strncmp (source, "ldaps:", 6))) { @@ -1747,7 +1747,7 @@ keyserver_import_cert (ctrl_t ctrl, const char *name, int dane_mode, xfree (filtstr); if (!err) err = import_keys_es_stream (ctrl, key, NULL, fpr, fpr_len, - IMPORT_NO_SECKEY, + IMPORT_ONLY_PUBKEYS, NULL, NULL, KEYORG_DANE, NULL); restore_import_filter (save_filt); } @@ -1756,7 +1756,7 @@ keyserver_import_cert (ctrl_t ctrl, const char *name, int dane_mode, { err = import_keys_es_stream (ctrl, key, NULL, fpr, fpr_len, (opt.keyserver_options.import_options - | IMPORT_NO_SECKEY), + | IMPORT_ONLY_PUBKEYS), NULL, NULL, 0, NULL); } @@ -1848,7 +1848,7 @@ keyserver_import_wkd (ctrl_t ctrl, const char *name, unsigned int flags, xfree (filtstr); if (!err) err = import_keys_es_stream (ctrl, key, NULL, fpr, fpr_len, - IMPORT_NO_SECKEY, + IMPORT_ONLY_PUBKEYS, NULL, NULL, KEYORG_WKD, url); } |