diff options
Diffstat (limited to '')
| -rw-r--r-- | g10/ChangeLog | 4 | ||||
| -rw-r--r-- | g10/keyedit.c | 40 | ||||
| -rw-r--r-- | g10/keygen.c | 5 |
3 files changed, 34 insertions, 15 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 04f1e63f0..5a7b44c97 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,5 +1,9 @@ 2004-09-16 David Shaw <[email protected]> + * keygen.c (keygen_add_keyserver_url), keyedit.c + (menu_set_keyserver_url): Allow setting a keyserver URL of "none" + to remove an existing keyserver URL. + * keyedit.c (menu_set_keyserver_url): Confirm replacement of a keyserver URL before overwriting the old one. diff --git a/g10/keyedit.c b/g10/keyedit.c index a087365af..6078823bc 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -3270,8 +3270,7 @@ menu_set_keyserver_url (const char *url, u32 keyid[2]; int selected, select_all; int modified = 0; - char *answer; - struct keyserver_spec *keyserver; + char *answer,*uri; no_primary_warning(pub_keyblock); @@ -3288,13 +3287,21 @@ menu_set_keyserver_url (const char *url, } } - /* Sanity check the format */ - keyserver=parse_keyserver_uri(answer,1,NULL,0); - m_free(answer); - if(!keyserver) + if(ascii_strcasecmp(answer,"none")==0) + uri=NULL; + else { - log_info(_("could not parse keyserver URL\n")); - return 0; + struct keyserver_spec *keyserver=NULL; + /* Sanity check the format */ + keyserver=parse_keyserver_uri(answer,1,NULL,0); + m_free(answer); + if(!keyserver) + { + log_info(_("could not parse keyserver URL\n")); + return 0; + } + uri=m_strdup(keyserver->uri); + free_keyserver_spec(keyserver); } select_all = !count_selected_uids (pub_keyblock); @@ -3349,22 +3356,27 @@ menu_set_keyserver_url (const char *url, tty_printf("Current preferred keyserver for user" " ID \"%s\": %.*s\n",user,plen,p); if(!cpr_get_answer_is_yes("keyedit.confirm_keyserver", - _("Are you sure you want" - " to replace it? (y/N) "))) + uri?_("Are you sure you want to replace it? (y/N) "): + _("Are you sure you want to delete it? (y/N) "))) continue; } + else if(uri==NULL) + { + /* There is no current keyserver URL, so there + is no point in trying to un-set it. */ + continue; + } rc = update_keysig_packet (&newsig, sig, main_pk, uid, NULL, sk, - keygen_add_keyserver_url, - keyserver->uri ); + keygen_add_keyserver_url, uri ); if( rc ) { log_error ("update_keysig_packet failed: %s\n", g10_errstr(rc)); - free_keyserver_spec(keyserver); free_secret_key( sk ); + m_free(uri); return 0; } /* replace the packet */ @@ -3382,7 +3394,7 @@ menu_set_keyserver_url (const char *url, } } - free_keyserver_spec(keyserver); + m_free(uri); free_secret_key( sk ); return modified; } diff --git a/g10/keygen.c b/g10/keygen.c index 3b5a409c0..6bf1c0cbd 100644 --- a/g10/keygen.c +++ b/g10/keygen.c @@ -599,7 +599,10 @@ keygen_add_keyserver_url(PKT_signature *sig, void *opaque) { const char *url=opaque; - build_sig_subpkt(sig,SIGSUBPKT_PREF_KS,url,strlen(url)); + if(url) + build_sig_subpkt(sig,SIGSUBPKT_PREF_KS,url,strlen(url)); + else + delete_sig_subpkt (sig->hashed,SIGSUBPKT_PREF_KS); return 0; } |