security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-01 16:33:02 +01:00
Code Activity

* g10.c (add_keyserver_url), keyedit.c (keyedit_menu), sign.c

Browse Source 
(mk_notation_policy_etc): Clarify a few strings.  It's a "preferred
keyserver URL".

* g10.c (main): Use "keyserver-url" instead of "preferred-keyserver" for
the sake of short and simple commands.
This commit is contained in:
David Shaw 2003-08-31 23:49:07 +00:00
parent 653da12d2c
commit 858a0a511e
4 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
g10/ChangeLog
View File

@ -1,3 +1,12 @@
2003-08-31 David Shaw <dshaw@jabberwocky.com>
* g10.c (add_keyserver_url), keyedit.c (keyedit_menu), sign.c
(mk_notation_policy_etc): Clarify a few strings. It's a
"preferred keyserver URL".
* g10.c (main): Use "keyserver-url" instead of
"preferred-keyserver" for the sake of short and simple commands.
2003-08-30 David Shaw <dshaw@jabberwocky.com> 2003-08-30 David Shaw <dshaw@jabberwocky.com>
* main.h, keygen.c (keygen_add_keyserver_url): Signature callback * main.h, keygen.c (keygen_add_keyserver_url): Signature callback
@ -9,7 +18,8 @@
* build-packet.c (build_sig_subpkt): Set preferred keyserver flag * build-packet.c (build_sig_subpkt): Set preferred keyserver flag
while building a preferred keyserver subpacket. while building a preferred keyserver subpacket.
* keylist.c (show_policy_url): Policy URLs might be UTF8. * keylist.c (show_policy_url, show_keyserver_url): URLs might be
UTF8.
* keyedit.c (menu_addrevoker): Fix leaking a few bytes. * keyedit.c (menu_addrevoker): Fix leaking a few bytes.

10
g10/g10.c
View File

@ -556,7 +556,7 @@ static ARGPARSE_OPTS opts[] = {
{ oCertPolicyURL, "cert-policy-url", 2, "@" }, { oCertPolicyURL, "cert-policy-url", 2, "@" },
{ oShowPolicyURL, "show-policy-url", 0, "@" }, { oShowPolicyURL, "show-policy-url", 0, "@" },
{ oNoShowPolicyURL, "no-show-policy-url", 0, "@" }, { oNoShowPolicyURL, "no-show-policy-url", 0, "@" },
{ oSigKeyserverURL, "sig-preferred-keyserver", 2, "@" }, { oSigKeyserverURL, "sig-keyserver-url", 2, "@" },
{ oShowNotation, "show-notation", 0, "@" }, { oShowNotation, "show-notation", 0, "@" },
{ oNoShowNotation, "no-show-notation", 0, "@" }, { oNoShowNotation, "no-show-notation", 0, "@" },
{ oComment, "comment", 2, "@" }, { oComment, "comment", 2, "@" },
@ -1761,7 +1761,7 @@ main( int argc, char **argv )
{"show-photos",LIST_SHOW_PHOTOS}, {"show-photos",LIST_SHOW_PHOTOS},
{"show-policy-url",LIST_SHOW_POLICY}, {"show-policy-url",LIST_SHOW_POLICY},
{"show-notation",LIST_SHOW_NOTATION}, {"show-notation",LIST_SHOW_NOTATION},
{"show-preferred-keyserver",LIST_SHOW_KEYSERVER}, {"show-keyserver-url",LIST_SHOW_KEYSERVER},
{"show-validity",LIST_SHOW_VALIDITY}, {"show-validity",LIST_SHOW_VALIDITY},
{"show-long-keyid",LIST_SHOW_LONG_KEYID}, {"show-long-keyid",LIST_SHOW_LONG_KEYID},
{"show-keyring",LIST_SHOW_KEYRING}, {"show-keyring",LIST_SHOW_KEYRING},
@ -1786,7 +1786,7 @@ main( int argc, char **argv )
{"show-photos",VERIFY_SHOW_PHOTOS}, {"show-photos",VERIFY_SHOW_PHOTOS},
{"show-policy-url",VERIFY_SHOW_POLICY}, {"show-policy-url",VERIFY_SHOW_POLICY},
{"show-notation",VERIFY_SHOW_NOTATION}, {"show-notation",VERIFY_SHOW_NOTATION},
{"show-preferred-keyserver",VERIFY_SHOW_KEYSERVER}, {"show-keyserver-url",VERIFY_SHOW_KEYSERVER},
{"show-validity",VERIFY_SHOW_VALIDITY}, {"show-validity",VERIFY_SHOW_VALIDITY},
{"show-long-keyid",VERIFY_SHOW_LONG_KEYID}, {"show-long-keyid",VERIFY_SHOW_LONG_KEYID},
{NULL,0} {NULL,0}
@ -3171,8 +3171,8 @@ add_keyserver_url( const char *string, int which )
if(which) if(which)
BUG(); BUG();
else else
log_error(_("the given signature preferred keyserver " log_error(_("the given signature preferred"
"URL is invalid\n")); " keyserver URL is invalid\n"));
} }
if(which) if(which)

2
g10/keyedit.c
View File

@ -1156,7 +1156,7 @@ keyedit_menu( const char *username, STRLIST locusr, STRLIST commands,
{ N_("showpref"), cmdSHOWPREF , 0,1,0, N_("list preferences (verbose)") }, { N_("showpref"), cmdSHOWPREF , 0,1,0, N_("list preferences (verbose)") },
{ N_("setpref") , cmdSETPREF , 1,1,0, N_("set preference list") }, { N_("setpref") , cmdSETPREF , 1,1,0, N_("set preference list") },
{ N_("updpref") , cmdUPDPREF , 1,1,0, N_("updated preferences") }, { N_("updpref") , cmdUPDPREF , 1,1,0, N_("updated preferences") },
{ N_("keyserver"),cmdPREFKS , 1,1,0, N_("set preferred keyserver")}, { N_("keyserver"),cmdPREFKS , 1,1,0, N_("set preferred keyserver URL")},
{ N_("passwd") , cmdPASSWD , 1,1,0, N_("change the passphrase") }, { N_("passwd") , cmdPASSWD , 1,1,0, N_("change the passphrase") },
{ N_("trust") , cmdTRUST , 0,1,0, N_("change the ownertrust") }, { N_("trust") , cmdTRUST , 0,1,0, N_("change the ownertrust") },
{ N_("revsig") , cmdREVSIG , 0,1,0, N_("revoke signatures") }, { N_("revsig") , cmdREVSIG , 0,1,0, N_("revoke signatures") },

4
g10/sign.c
View File

@ -183,8 +183,8 @@ mk_notation_policy_etc( PKT_signature *sig,
s=pct_expando(string,&args); s=pct_expando(string,&args);
if(!s) if(!s)
{ {
log_error(_("WARNING: unable to %%-expand preferred keyserver url " log_error(_("WARNING: unable to %%-expand preferred keyserver URL"
"(too large). Using unexpanded.\n")); " (too large). Using unexpanded.\n"));
s=m_strdup(string); s=m_strdup(string);
} }