security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

* gpgkeys_ldap.c (get_key), gpgkeys_hkp.c (get_key): Display keyserver URI

Browse Source 
as a URI, but only if verbose.
This commit is contained in:
David Shaw 2002-07-04 14:14:08 +00:00
parent 1c3fae007b
commit a811246420
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
keyserver/ChangeLog
View File

@ -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> 2002-07-01 David Shaw <dshaw@jabberwocky.com>
* gpgkeys_hkp.c (parse_hkp_index): Error if the keyserver returns * gpgkeys_hkp.c (parse_hkp_index): Error if the keyserver returns

7
keyserver/gpgkeys_hkp.c
View File

@ -40,6 +40,7 @@
int verbose=0,include_disabled=0,include_revoked=0; int verbose=0,include_disabled=0,include_revoked=0;
char *basekeyspacedn=NULL; char *basekeyspacedn=NULL;
char host[80]; char host[80];
char portstr[10];
FILE *input=NULL,*output=NULL,*console=NULL,*server=NULL; FILE *input=NULL,*output=NULL,*console=NULL,*server=NULL;
struct keylist struct keylist
@ -287,8 +288,9 @@ int get_key(char *getkey)
if(verbose>2) if(verbose>2)
fprintf(console,"gpgkeys: HKP fetch for: %s\n",search); fprintf(console,"gpgkeys: HKP fetch for: %s\n",search);
fprintf(console,"gpgkeys: requesting key 0x%s from HKP keyserver %s\n", if(verbose)
getkey,host); fprintf(console,"gpgkeys: requesting key 0x%s from hkp://%s%s%s\n",
getkey,host,portstr?":":"",portstr?portstr:"");
err=http_get("get",search); err=http_get("get",search);
if(err!=0) if(err!=0)
@ -724,7 +726,6 @@ int main(int argc,char *argv[])
while(fgets(line,MAX_LINE,input)!=NULL) while(fgets(line,MAX_LINE,input)!=NULL)
{ {
char commandstr[7]; char commandstr[7];
char portstr[10];
char optionstr[30]; char optionstr[30];
char hash; char hash;

7
keyserver/gpgkeys_ldap.c
View File

@ -43,6 +43,7 @@
int verbose=0,include_disabled=0,include_revoked=0,include_subkeys=0; int verbose=0,include_disabled=0,include_revoked=0,include_subkeys=0;
char *basekeyspacedn=NULL; char *basekeyspacedn=NULL;
char host[80]; char host[80];
char portstr[10];
FILE *input=NULL,*output=NULL,*console=NULL; FILE *input=NULL,*output=NULL,*console=NULL;
LDAP *ldap=NULL; LDAP *ldap=NULL;
@ -227,8 +228,9 @@ int get_key(char *getkey)
if(!verbose) if(!verbose)
attrs[1]=NULL; attrs[1]=NULL;
fprintf(console,"gpgkeys: requesting key 0x%s from LDAP keyserver %s\n", if(verbose)
getkey,host); fprintf(console,"gpgkeys: requesting key 0x%s from ldap://%s%s%s\n",
getkey,host,portstr?":":"",portstr?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);
@ -659,7 +661,6 @@ int main(int argc,char *argv[])
while(fgets(line,MAX_LINE,input)!=NULL) while(fgets(line,MAX_LINE,input)!=NULL)
{ {
char commandstr[7]; char commandstr[7];
char portstr[10];
char optionstr[30]; char optionstr[30];
char hash; char hash;