security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-23 10:29:58 +01:00
Code Activity

* gpgkeys_ldap.c (get_key, search_key), gpgkeys_hkp.c (get_key,

Browse Source 
search_key), gpgkeys_http.c (get_key): Do not give informational logs
since this is now done inside gpg.
This commit is contained in:
David Shaw 2004-08-23 19:54:40 +00:00
parent 10eb272a73
commit 6c5507fff0
4 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
keyserver/ChangeLog
View File

@ -1,5 +1,9 @@
2004-08-23 David Shaw <dshaw@jabberwocky.com> 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 * gpgkeys_hkp.c (dehtmlize): Understand the quote character
(i.e. "&quot;") in HTML responses. (i.e. "&quot;") in HTML responses.
(search_key): Search key must be unsigned for url encoder to work (search_key): Search key must be unsigned for url encoder to work

7
keyserver/gpgkeys_hkp.c
View File

@ -249,10 +249,6 @@ get_key(char *getkey)
fprintf(output,"KEY 0x%s BEGIN\n",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); request=malloc(strlen(host)+100);
if(!request) if(!request)
{ {
@ -674,9 +670,6 @@ search_key(char *searchkey)
search[len]='\0'; search[len]='\0';
fprintf(console,("gpgkeys: searching for \"%s\" from HKP server %s\n"),
searchkey,host);
request=malloc(strlen(host)+100+strlen(search)); request=malloc(strlen(host)+100+strlen(search));
if(!request) if(!request)
{ {

4
keyserver/gpgkeys_http.c
View File

@ -74,10 +74,6 @@ get_key(char *getkey)
sprintf(request,"http://%s%s%s%s%s",host,port[0]?":":"", sprintf(request,"http://%s%s%s%s%s",host,port[0]?":":"",
port[0]?port:"",path[0]?"":"/",path); 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); rc=http_open_document(&hd,request,http_flags,proxy[0]?proxy:NULL);
if(rc!=0) if(rc!=0)
{ {

7
keyserver/gpgkeys_ldap.c
View File

@ -1032,10 +1032,6 @@ get_key(char *getkey)
if(!verbose) if(!verbose)
attrs[2]=NULL; /* keep only pgpkey(v2) and pgpcertid */ 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, err=ldap_search_s(ldap,basekeyspacedn,
LDAP_SCOPE_SUBTREE,search,attrs,0,&res); LDAP_SCOPE_SUBTREE,search,attrs,0,&res);
if(err!=0) if(err!=0)
@ -1171,9 +1167,6 @@ search_key(char *searchkey)
if(verbose>2) if(verbose>2)
fprintf(console,"gpgkeys: LDAP search for: %s\n",search); 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, err=ldap_search_s(ldap,basekeyspacedn,
LDAP_SCOPE_SUBTREE,search,attrs,0,&res); LDAP_SCOPE_SUBTREE,search,attrs,0,&res);
if(err!=LDAP_SUCCESS && err!=LDAP_SIZELIMIT_EXCEEDED) if(err!=LDAP_SUCCESS && err!=LDAP_SIZELIMIT_EXCEEDED)