mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-23 10:29:58 +01:00
* gpgkeys_ldap.c (get_key, search_key), gpgkeys_hkp.c (get_key,
search_key), gpgkeys_http.c (get_key): Do not give informational logs since this is now done inside gpg.
This commit is contained in:
parent
10eb272a73
commit
6c5507fff0
@ -1,5 +1,9 @@
|
||||
2004-08-23 David Shaw <dshaw@jabberwocky.com>
|
||||
|
||||
* gpgkeys_ldap.c (get_key, search_key), gpgkeys_hkp.c (get_key,
|
||||
search_key), gpgkeys_http.c (get_key): Do not give informational
|
||||
logs since this is now done inside gpg.
|
||||
|
||||
* gpgkeys_hkp.c (dehtmlize): Understand the quote character
|
||||
(i.e. """) in HTML responses.
|
||||
(search_key): Search key must be unsigned for url encoder to work
|
||||
|
@ -249,10 +249,6 @@ get_key(char *getkey)
|
||||
|
||||
fprintf(output,"KEY 0x%s BEGIN\n",getkey);
|
||||
|
||||
if(verbose)
|
||||
fprintf(console,"gpgkeys: requesting key 0x%s from hkp://%s%s%s\n",
|
||||
getkey,host,port[0]?":":"",port[0]?port:"");
|
||||
|
||||
request=malloc(strlen(host)+100);
|
||||
if(!request)
|
||||
{
|
||||
@ -674,9 +670,6 @@ search_key(char *searchkey)
|
||||
|
||||
search[len]='\0';
|
||||
|
||||
fprintf(console,("gpgkeys: searching for \"%s\" from HKP server %s\n"),
|
||||
searchkey,host);
|
||||
|
||||
request=malloc(strlen(host)+100+strlen(search));
|
||||
if(!request)
|
||||
{
|
||||
|
@ -74,10 +74,6 @@ get_key(char *getkey)
|
||||
sprintf(request,"http://%s%s%s%s%s",host,port[0]?":":"",
|
||||
port[0]?port:"",path[0]?"":"/",path);
|
||||
|
||||
if(verbose)
|
||||
fprintf(console,"gpgkeys: requesting key 0x%s from http://%s%s%s%s%s\n",
|
||||
getkey,host,port[0]?":":"",port[0]?port:"",path[0]?"":"/",path);
|
||||
|
||||
rc=http_open_document(&hd,request,http_flags,proxy[0]?proxy:NULL);
|
||||
if(rc!=0)
|
||||
{
|
||||
|
@ -1032,10 +1032,6 @@ get_key(char *getkey)
|
||||
if(!verbose)
|
||||
attrs[2]=NULL; /* keep only pgpkey(v2) and pgpcertid */
|
||||
|
||||
if(verbose)
|
||||
fprintf(console,"gpgkeys: requesting key 0x%s from ldap://%s%s%s\n",
|
||||
getkey,host,portstr[0]?":":"",portstr[0]?portstr:"");
|
||||
|
||||
err=ldap_search_s(ldap,basekeyspacedn,
|
||||
LDAP_SCOPE_SUBTREE,search,attrs,0,&res);
|
||||
if(err!=0)
|
||||
@ -1171,9 +1167,6 @@ search_key(char *searchkey)
|
||||
if(verbose>2)
|
||||
fprintf(console,"gpgkeys: LDAP search for: %s\n",search);
|
||||
|
||||
fprintf(console,("gpgkeys: searching for \"%s\" from LDAP server %s\n"),
|
||||
searchkey,host);
|
||||
|
||||
err=ldap_search_s(ldap,basekeyspacedn,
|
||||
LDAP_SCOPE_SUBTREE,search,attrs,0,&res);
|
||||
if(err!=LDAP_SUCCESS && err!=LDAP_SIZELIMIT_EXCEEDED)
|
||||
|
Loading…
x
Reference in New Issue
Block a user