diff options
| author | David Shaw <[email protected]> | 2005-11-02 05:22:01 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2005-11-02 05:22:01 +0000 |
| commit | 19de04694e2bf67f9908d8257df255a5cc47a59e (patch) | |
| tree | 5e575b1d7b6d1224be0c7266195dcd85893ad49f /g10/export.c | |
| parent | * gpg.sgml: Document backsign, --require-backsigs, and (diff) | |
| download | gnupg-19de04694e2bf67f9908d8257df255a5cc47a59e.tar.gz gnupg-19de04694e2bf67f9908d8257df255a5cc47a59e.zip | |
* import.c (import_one): Do collapse_uids() before we do any cleaning
so keyserver mangled keys with doubled user IDs can be properly
cleaned - possibly sigs on the different user IDs cancel each other
out.
* import.c (parse_import_options), export.c (parse_export_options):
List "xxx-clean" before the longer options so we don't end up with a
partial match on the longer options.
* trustdb.c (clean_uids_from_key): Return proper number of cleaned
user IDs. Don't count user IDs as cleaned unless we actually delete
something.
Diffstat (limited to '')
| -rw-r--r-- | g10/export.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/g10/export.c b/g10/export.c index ab5bd0f28..053e1c185 100644 --- a/g10/export.c +++ b/g10/export.c @@ -64,12 +64,12 @@ parse_export_options(char *str,unsigned int *options,int noisy) N_("export attribute user IDs (generally photo IDs)")}, {"export-sensitive-revkeys",EXPORT_SENSITIVE_REVKEYS,NULL, N_("export revocation keys that are marked as \"sensitive\"")}, + {"export-clean",EXPORT_CLEAN_SIGS|EXPORT_CLEAN_UIDS,NULL, + N_("all export-clean-* options from above")}, {"export-clean-sigs",EXPORT_CLEAN_SIGS,NULL, N_("remove unusable signatures during export")}, {"export-clean-uids",EXPORT_CLEAN_UIDS,NULL, N_("remove unusable user IDs during export")}, - {"export-clean",EXPORT_CLEAN_SIGS|EXPORT_CLEAN_UIDS,NULL, - N_("all export-clean-* options from above")}, {"export-minimal", EXPORT_MINIMAL|EXPORT_CLEAN_SIGS|EXPORT_CLEAN_UIDS,NULL, N_("export the smallest key possible")}, |