diff options
Diffstat (limited to '')
| -rw-r--r-- | g10/ChangeLog | 4 | ||||
| -rw-r--r-- | g10/getkey.c | 2 | ||||
| -rw-r--r-- | g10/keyedit.c | 5 | ||||
| -rw-r--r-- | g10/pkclist.c | 1 | ||||
| -rw-r--r-- | g10/status.c | 2 | ||||
| -rw-r--r-- | g10/status.h | 2 |
6 files changed, 15 insertions, 1 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index bbd0e8656..0345c7f00 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,5 +1,9 @@ 2001-09-07 Werner Koch <[email protected]> + * status.c, status.h: Added NO_RECP and ALREADY_SIGNED. + * pkclist.c (build_pk_list): Issue NO_RECP. + * keyedit.c (sign_uids): Added experimental ALREADY_SIGNED + * hkp.c (hkp_import): Use log_error. Bug reported by Neal H Walfield. diff --git a/g10/getkey.c b/g10/getkey.c index 65796239f..31ace1703 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -2067,7 +2067,7 @@ lookup( GETKEY_CTX ctx, KBNODE *ret_keyblock, int secmode ) found: if( rc && rc != -1 ) - log_error("enum_keyblocks_read failed: %s\n", g10_errstr(rc)); + log_error("keydb_search failed: %s\n", g10_errstr(rc)); if( !rc ) { *ret_keyblock = ctx->keyblock; /* return the keyblock */ diff --git a/g10/keyedit.c b/g10/keyedit.c index 033220de1..d1cc9da38 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -290,10 +290,15 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified, int local ) && (node->pkt->pkt.signature->sig_class&~3) == 0x10 ) { if( sk_keyid[0] == node->pkt->pkt.signature->keyid[0] && sk_keyid[1] == node->pkt->pkt.signature->keyid[1] ) { + char buf[50]; + /* Fixme: see whether there is a revocation in which * case we should allow to sign it again. */ tty_printf(_("Already signed by key %08lX\n"), (ulong)sk_keyid[1] ); + sprintf (buf, "%08lX%08lX", + (ulong)sk->keyid[0], (ulong)sk->keyid[1] ); + write_status_text (STATUS_ALREADY_SIGNED, buf); uidnode->flag &= ~NODFLG_MARK_A; /* remove mark */ } } diff --git a/g10/pkclist.c b/g10/pkclist.c index e09d55418..cad60c059 100644 --- a/g10/pkclist.c +++ b/g10/pkclist.c @@ -1047,6 +1047,7 @@ build_pk_list( STRLIST remusr, PK_LIST *ret_pk_list, unsigned use ) if( !rc && !any_recipients ) { log_error(_("no valid addressees\n")); + write_status_text (STATUS_NO_RECP, "0"); rc = G10ERR_NO_USER_ID; } diff --git a/g10/status.c b/g10/status.c index 7a7ddf850..415484743 100644 --- a/g10/status.c +++ b/g10/status.c @@ -141,6 +141,8 @@ get_status_string ( int no ) case STATUS_USERID_HINT : s = "USERID_HINT"; break; case STATUS_UNEXPECTED : s = "UNEXPECTED"; break; case STATUS_INV_RECP : s = "INV_RECP"; break; + case STATUS_NO_RECP : s = "NO_RECP"; break; + case STATUS_ALREADY_SIGNED : s = "ALREADY_SIGNED"; break; default: s = "?"; break; } return s; diff --git a/g10/status.h b/g10/status.h index 840df62ec..9706e3fd7 100644 --- a/g10/status.h +++ b/g10/status.h @@ -91,6 +91,8 @@ #define STATUS_USERID_HINT 59 #define STATUS_UNEXPECTED 60 #define STATUS_INV_RECP 61 +#define STATUS_NO_RECP 62 +#define STATUS_ALREADY_SIGNED 63 /*-- status.c --*/ |