diff options
| author | David Shaw <[email protected]> | 2004-08-23 19:54:40 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2004-08-23 19:54:40 +0000 |
| commit | 6c5507fff0514347dc10798cdfccb7e44cffd3ff (patch) | |
| tree | 20593bca30ff04ed1cab774579fbe8bf2d0fbb17 | |
| parent | * keyserver.c (keyserver_spawn): Show log line for what keyserver action (diff) | |
| download | gnupg-6c5507fff0514347dc10798cdfccb7e44cffd3ff.tar.gz gnupg-6c5507fff0514347dc10798cdfccb7e44cffd3ff.zip | |
* 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.
Diffstat (limited to '')
| -rw-r--r-- | keyserver/ChangeLog | 4 | ||||
| -rw-r--r-- | keyserver/gpgkeys_hkp.c | 7 | ||||
| -rw-r--r-- | keyserver/gpgkeys_http.c | 4 | ||||
| -rw-r--r-- | keyserver/gpgkeys_ldap.c | 7 |
4 files changed, 4 insertions, 18 deletions
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog index 819edc8c7..3be025e37 100644 --- a/keyserver/ChangeLog +++ b/keyserver/ChangeLog @@ -1,5 +1,9 @@ 2004-08-23 David Shaw <[email protected]> + * 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 diff --git a/keyserver/gpgkeys_hkp.c b/keyserver/gpgkeys_hkp.c index c3e207add..8c0a0f079 100644 --- a/keyserver/gpgkeys_hkp.c +++ b/keyserver/gpgkeys_hkp.c @@ -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) { diff --git a/keyserver/gpgkeys_http.c b/keyserver/gpgkeys_http.c index db98ab0c2..e61351ec8 100644 --- a/keyserver/gpgkeys_http.c +++ b/keyserver/gpgkeys_http.c @@ -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) { diff --git a/keyserver/gpgkeys_ldap.c b/keyserver/gpgkeys_ldap.c index 4bef51e0e..e8fdc53ad 100644 --- a/keyserver/gpgkeys_ldap.c +++ b/keyserver/gpgkeys_ldap.c @@ -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) |