diff options
| author | Werner Koch <[email protected]> | 2025-08-01 13:56:38 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2025-08-01 13:56:38 +0000 |
| commit | 242ced25509f1aefc257e9844495c3b5803e1486 (patch) | |
| tree | 7b6bb149ef3f5a82102d1b2a1ea06fb2107e1fd6 /g10/import.c | |
| parent | gpgtar: Do not close stderr when calling gpg. (diff) | |
| download | gnupg-242ced25509f1aefc257e9844495c3b5803e1486.tar.gz gnupg-242ced25509f1aefc257e9844495c3b5803e1486.zip | |
gpg: Try to retrieve a key from LDAP before sending it.
* g10/options.h (KEYSERVER_UPDATE_BEFORE_SEND): New.
* g10/keyserver-internal.h (KEYSERVER_IMPORT_FLAG_SILENT): New.
(KEYSERVER_IMPORT_FLAG_ONLYFPR): New.
(KEYSERVER_IMPORT_FLAG_UPDSEND): New.
* g10/gpg.c (main): Set default keyserver_options to
update-before-send.
* g10/keyserver.c (keyserver_opts): Add option "update-before-send".
(keyserver_export): Add optional arg assume_new_key.
(keyserver_import): Add arg flags. Act upon the new
KEYSERVER_IMPORT_FLAG_xxx values and pass flags on.
(keyserver_get_chunk): Ditto.
(keyserver_put): Add optional arg assume_new_key. Implement
update-before-send feature.
* g10/import.c (import_one_real): Take care of IMPORT_MERGE_ONLY when
passes in the option arg. Required for the update-before-send
feature.
--
This featureis enabled by default bu can be disabled using
--keyserver-flags no-update-before-send .
GnuPG-bug-id: 7730
Diffstat (limited to 'g10/import.c')
| -rw-r--r-- | g10/import.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/import.c b/g10/import.c index 6e33ac976..1ee818d61 100644 --- a/g10/import.c +++ b/g10/import.c @@ -2234,7 +2234,7 @@ import_one_real (ctrl_t ctrl, log_error (_("key %s: public key not found: %s\n"), keystr(keyid), gpg_strerror (err)); } - else if (err && (opt.import_options&IMPORT_MERGE_ONLY) ) + else if (err && ((opt.import_options|options)&IMPORT_MERGE_ONLY) ) { if (opt.verbose && !silent ) log_info( _("key %s: new key - skipped\n"), keystr(keyid)); |