security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-03-28 22:49:59 +01:00
Code Activity

* ksutil.c (init_ks_options, parse_ks_options): Provide a default "/"

Browse Source 
path unless overridden by the config.  Allow config to specify items
multiple times and take the last specified item.
This commit is contained in:
David Shaw 2005-06-05 14:34:47 +00:00
parent c347404bfd
commit 34ff103d2a
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
keyserver/ChangeLog
View File

@ -1,3 +1,9 @@
2005-06-05 David Shaw <dshaw@jabberwocky.com>
* ksutil.c (init_ks_options, parse_ks_options): Provide a default
"/" path unless overridden by the config. Allow config to specify
items multiple times and take the last specified item.
2005-06-04 David Shaw <dshaw@jabberwocky.com> 2005-06-04 David Shaw <dshaw@jabberwocky.com>
* gpgkeys_hkp.c, gpgkeys_oldhkp.c: Add support for HKP servers * gpgkeys_hkp.c, gpgkeys_oldhkp.c: Add support for HKP servers

12
keyserver/ksutil.c
View File

@ -87,6 +87,12 @@ init_ks_options(void)
opt->action=KS_UNKNOWN; opt->action=KS_UNKNOWN;
opt->flags.check_cert=1; opt->flags.check_cert=1;
opt->timeout=DEFAULT_KEYSERVER_TIMEOUT; opt->timeout=DEFAULT_KEYSERVER_TIMEOUT;
opt->path=strdup("/");
if(!opt->path)
{
free(opt);
opt=NULL;
}
} }
return opt; return opt;
@ -144,6 +150,7 @@ parse_ks_options(char *line,struct ks_options *opt)
if(sscanf(line,"HOST %" MKSTRING(MAX_HOST) "s\n",host)==1) if(sscanf(line,"HOST %" MKSTRING(MAX_HOST) "s\n",host)==1)
{ {
host[MAX_HOST]='\0'; host[MAX_HOST]='\0';
free(opt->host);
opt->host=strdup(host); opt->host=strdup(host);
if(!opt->host) if(!opt->host)
return KEYSERVER_NO_MEMORY; return KEYSERVER_NO_MEMORY;
@ -153,6 +160,7 @@ parse_ks_options(char *line,struct ks_options *opt)
if(sscanf(line,"PORT %" MKSTRING(MAX_PORT) "s\n",port)==1) if(sscanf(line,"PORT %" MKSTRING(MAX_PORT) "s\n",port)==1)
{ {
port[MAX_PORT]='\0'; port[MAX_PORT]='\0';
free(opt->port);
opt->port=strdup(port); opt->port=strdup(port);
if(!opt->port) if(!opt->port)
return KEYSERVER_NO_MEMORY; return KEYSERVER_NO_MEMORY;
@ -162,6 +170,7 @@ parse_ks_options(char *line,struct ks_options *opt)
if(sscanf(line,"SCHEME %" MKSTRING(MAX_SCHEME) "s\n",scheme)==1) if(sscanf(line,"SCHEME %" MKSTRING(MAX_SCHEME) "s\n",scheme)==1)
{ {
scheme[MAX_SCHEME]='\0'; scheme[MAX_SCHEME]='\0';
free(opt->scheme);
opt->scheme=strdup(scheme); opt->scheme=strdup(scheme);
if(!opt->scheme) if(!opt->scheme)
return KEYSERVER_NO_MEMORY; return KEYSERVER_NO_MEMORY;
@ -171,6 +180,7 @@ parse_ks_options(char *line,struct ks_options *opt)
if(sscanf(line,"AUTH %" MKSTRING(MAX_AUTH) "s\n",auth)==1) if(sscanf(line,"AUTH %" MKSTRING(MAX_AUTH) "s\n",auth)==1)
{ {
auth[MAX_AUTH]='\0'; auth[MAX_AUTH]='\0';
free(opt->auth);
opt->auth=strdup(auth); opt->auth=strdup(auth);
if(!opt->auth) if(!opt->auth)
return KEYSERVER_NO_MEMORY; return KEYSERVER_NO_MEMORY;
@ -180,6 +190,7 @@ parse_ks_options(char *line,struct ks_options *opt)
if(sscanf(line,"PATH %" MKSTRING(URLMAX_PATH) "s\n",path)==1) if(sscanf(line,"PATH %" MKSTRING(URLMAX_PATH) "s\n",path)==1)
{ {
path[URLMAX_PATH]='\0'; path[URLMAX_PATH]='\0';
free(opt->path);
opt->path=strdup(path); opt->path=strdup(path);
if(!opt->path) if(!opt->path)
return KEYSERVER_NO_MEMORY; return KEYSERVER_NO_MEMORY;
@ -189,6 +200,7 @@ parse_ks_options(char *line,struct ks_options *opt)
if(sscanf(line,"OPAQUE %" MKSTRING(MAX_OPAQUE) "s\n",opaque)==1) if(sscanf(line,"OPAQUE %" MKSTRING(MAX_OPAQUE) "s\n",opaque)==1)
{ {
opaque[MAX_OPAQUE]='\0'; opaque[MAX_OPAQUE]='\0';
free(opt->opaque);
opt->opaque=strdup(opaque); opt->opaque=strdup(opaque);
if(!opt->opaque) if(!opt->opaque)
return KEYSERVER_NO_MEMORY; return KEYSERVER_NO_MEMORY;