diff options
| author | David Shaw <[email protected]> | 2005-11-12 04:53:03 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2005-11-12 04:53:03 +0000 |
| commit | 40b9d5648ddcf29db0755bf40c33253a50224382 (patch) | |
| tree | c0fb71b9214e7dd5599d1a4f3db6082732e176b4 /g10/options.h | |
| parent | * trustdb.c (clean_uid_from_key, clean_uids_from_key): Significantly (diff) | |
| download | gnupg-40b9d5648ddcf29db0755bf40c33253a50224382.tar.gz gnupg-40b9d5648ddcf29db0755bf40c33253a50224382.zip | |
* trustdb.h, trustdb.c (clean_key): New function to handle key
cleaning from one convenient place.
* options.h, import.c (parse_import_options, clean_sigs_from_all_uids,
import_one): Reduce clean options to two: clean and minimize.
* parse-packet.c (setup_user_id): Remove. (parse_user_id,
parse_attribute): Just use xmalloc_clear instead.
Diffstat (limited to '')
| -rw-r--r-- | g10/options.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/g10/options.h b/g10/options.h index 181f658ca..20544b9a6 100644 --- a/g10/options.h +++ b/g10/options.h @@ -266,8 +266,7 @@ struct { #define IMPORT_SK2PK (1<<3) #define IMPORT_MERGE_ONLY (1<<4) #define IMPORT_MINIMAL (1<<5) -#define IMPORT_CLEAN_SIGS (1<<6) -#define IMPORT_CLEAN_UIDS (1<<7) +#define IMPORT_CLEAN (1<<6) #define EXPORT_LOCAL_SIGS (1<<0) #define EXPORT_ATTRIBUTES (1<<1) |