mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
See ChangeLog: Thu Dec 9 10:31:05 CET 1999 Werner Koch
This commit is contained in:
parent
5553cc985e
commit
a8d59e6d53
20 changed files with 795 additions and 74 deletions
|
@ -1,3 +1,7 @@
|
|||
Thu Dec 9 10:31:05 CET 1999 Werner Koch <wk@gnupg.de>
|
||||
|
||||
* hkp.c: i18n the strings.
|
||||
|
||||
Sat Dec 4 15:32:20 CET 1999 Werner Koch <wk@gnupg.de>
|
||||
|
||||
* trustdb.c (verify_key): Shortcut for ultimately trusted keys.
|
||||
|
|
18
g10/hkp.c
18
g10/hkp.c
|
@ -59,7 +59,7 @@ hkp_ask_import( u32 *keyid )
|
|||
|
||||
if( !opt.keyserver_name )
|
||||
return -1;
|
||||
log_info("requesting key %08lX from %s ...\n", (ulong)keyid[1],
|
||||
log_info(_("requesting key %08lX from %s ...\n"), (ulong)keyid[1],
|
||||
opt.keyserver_name );
|
||||
request = m_alloc( strlen( opt.keyserver_name ) + 100 );
|
||||
/* hkp does not accept the long keyid - we should really write a
|
||||
|
@ -68,7 +68,7 @@ hkp_ask_import( u32 *keyid )
|
|||
opt.keyserver_name, (ulong)keyid[1] );
|
||||
rc = http_open_document( &hd, request, hflags );
|
||||
if( rc ) {
|
||||
log_info("can't get key from keyserver: %s\n",
|
||||
log_info(_("can't get key from keyserver: %s\n"),
|
||||
rc == G10ERR_NETWORK? strerror(errno)
|
||||
: g10_errstr(rc) );
|
||||
}
|
||||
|
@ -91,7 +91,7 @@ hkp_import( STRLIST users )
|
|||
return -1;
|
||||
#else
|
||||
if( !opt.keyserver_name ) {
|
||||
log_error("no keyserver known (use option --keyserver)\n");
|
||||
log_error(_("no keyserver known (use option --keyserver)\n"));
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
@ -99,7 +99,7 @@ hkp_import( STRLIST users )
|
|||
u32 kid[2];
|
||||
int type = classify_user_id( users->d, kid, NULL, NULL, NULL );
|
||||
if( type != 10 && type != 11 ) {
|
||||
log_info("%s: not a valid key ID\n", users->d );
|
||||
log_info(_("%s: not a valid key ID\n"), users->d );
|
||||
continue;
|
||||
}
|
||||
hkp_ask_import( kid );
|
||||
|
@ -124,7 +124,7 @@ hkp_export( STRLIST users )
|
|||
unsigned int hflags = opt.honor_http_proxy? HTTP_FLAG_TRY_PROXY : 0;
|
||||
|
||||
if( !opt.keyserver_name ) {
|
||||
log_error("no keyserver known (use option --keyserver)\n");
|
||||
log_error(_("no keyserver known (use option --keyserver)\n"));
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
@ -146,7 +146,7 @@ hkp_export( STRLIST users )
|
|||
sprintf( request, "x-hkp://%s:11371/pks/add", opt.keyserver_name );
|
||||
rc = http_open( &hd, HTTP_REQ_POST, request , hflags );
|
||||
if( rc ) {
|
||||
log_error("can't connect to `%s': %s\n",
|
||||
log_error(_("can't connect to `%s': %s\n"),
|
||||
opt.keyserver_name,
|
||||
rc == G10ERR_NETWORK? strerror(errno)
|
||||
: g10_errstr(rc) );
|
||||
|
@ -170,7 +170,7 @@ hkp_export( STRLIST users )
|
|||
|
||||
rc = http_wait_response( &hd, &status );
|
||||
if( rc ) {
|
||||
log_error("error sending to `%s': %s\n",
|
||||
log_error(_("error sending to `%s': %s\n"),
|
||||
opt.keyserver_name, g10_errstr(rc) );
|
||||
}
|
||||
else {
|
||||
|
@ -182,10 +182,10 @@ hkp_export( STRLIST users )
|
|||
}
|
||||
#endif
|
||||
if( (status/100) == 2 )
|
||||
log_info("success sending to `%s' (status=%u)\n",
|
||||
log_info(_("success sending to `%s' (status=%u)\n"),
|
||||
opt.keyserver_name, status );
|
||||
else
|
||||
log_error("failed sending to `%s': status=%u\n",
|
||||
log_error(_("failed sending to `%s': status=%u\n"),
|
||||
opt.keyserver_name, status );
|
||||
}
|
||||
http_close( &hd );
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue