diff options
| author | David Shaw <[email protected]> | 2004-12-22 18:07:21 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2004-12-22 18:07:21 +0000 |
| commit | 0361c6f01b94ebf6a390caf4524b2369233218ae (patch) | |
| tree | 2d179a37c255cde99f1d939d7accd915f01b1840 /keyserver/gpgkeys_http.c | |
| parent | * keyserver.c (keyserver_typemap): New. Map certain keyserver types to a (diff) | |
| download | gnupg-0361c6f01b94ebf6a390caf4524b2369233218ae.tar.gz gnupg-0361c6f01b94ebf6a390caf4524b2369233218ae.zip | |
* gpgkeys_curl.c (get_key, writer): New function to wrap around fwrite to
avoid DLL access problem on win32.
* gpgkeys_http.c (main, get_key): Properly pass authentication info
through to the http library.
Diffstat (limited to '')
| -rw-r--r-- | keyserver/gpgkeys_http.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/keyserver/gpgkeys_http.c b/keyserver/gpgkeys_http.c index 6c9768e42..dad141fd6 100644 --- a/keyserver/gpgkeys_http.c +++ b/keyserver/gpgkeys_http.c @@ -41,7 +41,7 @@ extern int optind; static int verbose=0; static unsigned int http_flags=0; -static char host[80]={'\0'},proxy[80]={'\0'},port[10]={'\0'},path[1024]={'\0'}; +static char auth[128]={'\0'},host[80]={'\0'},proxy[80]={'\0'},port[10]={'\0'},path[1024]={'\0'}; static FILE *input=NULL,*output=NULL,*console=NULL; #define BEGIN "-----BEGIN PGP PUBLIC KEY BLOCK-----" @@ -72,8 +72,8 @@ get_key(char *getkey) return KEYSERVER_NO_MEMORY; } - sprintf(request,"http://%s%s%s%s%s",host,port[0]?":":"", - port[0]?port:"",path[0]?"":"/",path); + sprintf(request,"http://%s%s%s%s%s%s%s",auth[0]?auth:"",auth[0]?"@":"", + host,port[0]?":":"",port[0]?port:"",path[0]?"":"/",path); rc=http_open_document(&hd,request,http_flags,proxy[0]?proxy:NULL); if(rc!=0) @@ -219,6 +219,12 @@ main(int argc,char *argv[]) continue; } + if(sscanf(line,"AUTH %127s\n",auth)==1) + { + auth[127]='\0'; + continue; + } + if(sscanf(line,"HOST %79s\n",host)==1) { host[79]='\0'; |