diff options
| author | David Shaw <[email protected]> | 2004-01-30 16:49:28 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2004-01-30 16:49:28 +0000 |
| commit | 0030198cad5fa6524579d012015b0c950cb85ae6 (patch) | |
| tree | 4cebb4bccc311ce5ff9df969d3ff038b7c66c36d /g10/keylist.c | |
| parent | * getkey.c: Set MAX_PK_CACHE_ENTRIES and MAX_UID_CACHE_ENTRIES to (diff) | |
| download | gnupg-0030198cad5fa6524579d012015b0c950cb85ae6.tar.gz gnupg-0030198cad5fa6524579d012015b0c950cb85ae6.zip | |
* g10.c (main, rm_group): Add --ungroup command to remove a particular
group. (add_group): When adding a group with the same name as an already
existing group, merge the two groups. (list_config): Show an error message
when listing a config item that doesn't exist. (main): Replace -z0 trick
for no compression.
* packet.h, keyedit.c (show_key_with_all_names_colon), keylist.c
(list_keyblock_colon), mainproc.c (list_node, proc_tree): Minor cleanup to
remove local_id, which is no longer used.
Diffstat (limited to 'g10/keylist.c')
| -rw-r--r-- | g10/keylist.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/g10/keylist.c b/g10/keylist.c index 29cf9462d..5983e9656 100644 --- a/g10/keylist.c +++ b/g10/keylist.c @@ -949,15 +949,12 @@ list_keyblock_colon( KBNODE keyblock, int secret, int fpr ) ulti_hack = 1; putchar(trustletter); } - printf(":%u:%d:%08lX%08lX:%s:%s:", + printf(":%u:%d:%08lX%08lX:%s:%s::", nbits_from_pk( pk ), pk->pubkey_algo, (ulong)keyid[0],(ulong)keyid[1], colon_datestr_from_pk( pk ), colon_strtime (pk->expiredate) ); - if( pk->local_id ) - printf("%lu", pk->local_id ); - putchar(':'); if( !opt.fast_list_mode && !opt.no_expensive_trust_checks ) putchar( get_ownertrust_info(pk) ); putchar(':'); @@ -1079,7 +1076,7 @@ list_keyblock_colon( KBNODE keyblock, int secret, int fpr ) if(trustletter) printf("%c", trustletter ); } - printf(":%u:%d:%08lX%08lX:%s:%s:", + printf(":%u:%d:%08lX%08lX:%s:%s:::::", nbits_from_pk( pk2 ), pk2->pubkey_algo, (ulong)keyid2[0],(ulong)keyid2[1], @@ -1087,12 +1084,6 @@ list_keyblock_colon( KBNODE keyblock, int secret, int fpr ) colon_strtime (pk2->expiredate) /* fixme: add LID and ownertrust here */ ); - if( pk->local_id ) /* use the local_id of the main key??? */ - printf("%lu", pk->local_id ); - putchar(':'); - putchar(':'); - putchar(':'); - putchar(':'); print_capabilities (pk2, NULL, NULL); putchar('\n'); if( fpr > 1 ) |