From 489b9c6ebb50376f3a7caff14e3b2e6d6cfab58b Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Mon, 24 Jun 2024 11:49:05 +0200 Subject: [PATCH] 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 --- doc/gpg.texi | 2 +- g10/import.c | 4 ++-- g10/keyserver.c | 8 ++++---- g10/options.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/gpg.texi b/doc/gpg.texi index b533bfdee..408374f90 100644 --- a/doc/gpg.texi +++ b/doc/gpg.texi @@ -2147,7 +2147,7 @@ are available for all keyserver types, some common options are: this option is not used with HKP keyservers, as they do not support retrieving keys by subkey id. - @item no-seckeys + @item only-pubkeys Do now allow to import secret keys. @item timeout diff --git a/g10/import.c b/g10/import.c index 82c119425..dc0dc0d03 100644 --- a/g10/import.c +++ b/g10/import.c @@ -212,7 +212,7 @@ parse_import_options(char *str,unsigned int *options,int noisy) /* New options. Right now, without description string. */ {"ignore-attributes", IMPORT_IGNORE_ATTRIBUTES, NULL, NULL}, - {"no-seckeys", IMPORT_NO_SECKEY, NULL, NULL}, + {"only-pubkeys", IMPORT_ONLY_PUBKEYS, NULL, NULL}, /* Hidden options which are enabled by default and are provided * in case of problems with the respective implementation. */ @@ -3189,7 +3189,7 @@ import_secret_one (ctrl_t ctrl, kbnode_t keyblock, } stats->secret_read++; - if ((options & IMPORT_NO_SECKEY)) + if ((options & IMPORT_ONLY_PUBKEYS)) { if (!for_migration) log_error (_("importing secret keys not allowed\n")); diff --git a/g10/keyserver.c b/g10/keyserver.c index 57c7538ae..11a02f295 100644 --- a/g10/keyserver.c +++ b/g10/keyserver.c @@ -1520,7 +1520,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))) { @@ -1749,7 +1749,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); } @@ -1758,7 +1758,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); } @@ -1851,7 +1851,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); } diff --git a/g10/options.h b/g10/options.h index 50fa4ad86..e4535b3b9 100644 --- a/g10/options.h +++ b/g10/options.h @@ -400,7 +400,7 @@ EXTERN_UNLESS_MAIN_MODULE int memory_stat_debug_mode; #define IMPORT_MERGE_ONLY (1<<4) #define IMPORT_MINIMAL (1<<5) #define IMPORT_CLEAN (1<<6) -#define IMPORT_NO_SECKEY (1<<7) +#define IMPORT_ONLY_PUBKEYS (1<<7) #define IMPORT_KEEP_OWNERTTRUST (1<<8) #define IMPORT_EXPORT (1<<9) #define IMPORT_RESTORE (1<<10)