diff options
| -rw-r--r-- | keyserver/ChangeLog | 5 | ||||
| -rw-r--r-- | keyserver/gpgkeys_hkp.c | 7 | ||||
| -rw-r--r-- | keyserver/gpgkeys_ldap.c | 7 |
3 files changed, 13 insertions, 6 deletions
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog index ec8ed3a19..9b5dc1f33 100644 --- a/keyserver/ChangeLog +++ b/keyserver/ChangeLog @@ -1,3 +1,8 @@ +2002-07-04 David Shaw <dshaw@jabberwocky.com> + + * gpgkeys_ldap.c (get_key), gpgkeys_hkp.c (get_key): Display + keyserver URI as a URI, but only if verbose. + 2002-07-01 David Shaw <dshaw@jabberwocky.com> * gpgkeys_hkp.c (parse_hkp_index): Error if the keyserver returns diff --git a/keyserver/gpgkeys_hkp.c b/keyserver/gpgkeys_hkp.c index 76b3cc87f..7e163e7a7 100644 --- a/keyserver/gpgkeys_hkp.c +++ b/keyserver/gpgkeys_hkp.c @@ -40,6 +40,7 @@ int verbose=0,include_disabled=0,include_revoked=0; char *basekeyspacedn=NULL; char host[80]; +char portstr[10]; FILE *input=NULL,*output=NULL,*console=NULL,*server=NULL; struct keylist @@ -287,8 +288,9 @@ int get_key(char *getkey) if(verbose>2) fprintf(console,"gpgkeys: HKP fetch for: %s\n",search); - fprintf(console,"gpgkeys: requesting key 0x%s from HKP keyserver %s\n", - getkey,host); + if(verbose) + fprintf(console,"gpgkeys: requesting key 0x%s from hkp://%s%s%s\n", + getkey,host,portstr?":":"",portstr?portstr:""); err=http_get("get",search); if(err!=0) @@ -724,7 +726,6 @@ int main(int argc,char *argv[]) while(fgets(line,MAX_LINE,input)!=NULL) { char commandstr[7]; - char portstr[10]; char optionstr[30]; char hash; diff --git a/keyserver/gpgkeys_ldap.c b/keyserver/gpgkeys_ldap.c index 8471e19bd..7f13599a9 100644 --- a/keyserver/gpgkeys_ldap.c +++ b/keyserver/gpgkeys_ldap.c @@ -43,6 +43,7 @@ int verbose=0,include_disabled=0,include_revoked=0,include_subkeys=0; char *basekeyspacedn=NULL; char host[80]; +char portstr[10]; FILE *input=NULL,*output=NULL,*console=NULL; LDAP *ldap=NULL; @@ -227,8 +228,9 @@ int get_key(char *getkey) if(!verbose) attrs[1]=NULL; - fprintf(console,"gpgkeys: requesting key 0x%s from LDAP keyserver %s\n", - getkey,host); + if(verbose) + fprintf(console,"gpgkeys: requesting key 0x%s from ldap://%s%s%s\n", + getkey,host,portstr?":":"",portstr?portstr:""); err=ldap_search_s(ldap,basekeyspacedn, LDAP_SCOPE_SUBTREE,search,attrs,0,&res); @@ -659,7 +661,6 @@ int main(int argc,char *argv[]) while(fgets(line,MAX_LINE,input)!=NULL) { char commandstr[7]; - char portstr[10]; char optionstr[30]; char hash; |