diff options
| author | David Shaw <[email protected]> | 2005-03-17 16:42:41 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2005-03-17 16:42:41 +0000 |
| commit | efa0dd21a2b2c47314485064a20f810cd9a24edb (patch) | |
| tree | 595ca9c2d8a60a3bb0f629a1cc6e4b77f7e4c4b4 /keyserver/ksutil.c | |
| parent | * configure.ac: Move the LDAP detecting code to m4/ldap.m4. (diff) | |
| download | gnupg-efa0dd21a2b2c47314485064a20f810cd9a24edb.tar.gz gnupg-efa0dd21a2b2c47314485064a20f810cd9a24edb.zip | |
* gpgkeys_curl.c, gpgkeys_finger.c, gpgkeys_ldap.c: Start using
parse_ks_options and remove a lot of common code.
* ksutil.h, ksutil.c (parse_ks_options): Parse OPAQUE, and default
debug with no arguments to 1.
Diffstat (limited to 'keyserver/ksutil.c')
| -rw-r--r-- | keyserver/ksutil.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/keyserver/ksutil.c b/keyserver/ksutil.c index 223f52e8b..c0dc5f66d 100644 --- a/keyserver/ksutil.c +++ b/keyserver/ksutil.c @@ -110,6 +110,7 @@ parse_ks_options(char *line,struct ks_options *opt) char scheme[MAX_SCHEME+1]; char auth[MAX_AUTH+1]; char path[URLMAX_PATH+1]; + char opaque[MAX_OPAQUE+1]; char option[MAX_OPTION+1]; if(line[0]=='#') @@ -174,6 +175,15 @@ parse_ks_options(char *line,struct ks_options *opt) return 0; } + if(sscanf(line,"OPAQUE %" MKSTRING(MAX_OPAQUE) "s\n",opaque)==1) + { + opaque[MAX_OPAQUE]='\0'; + opt->opaque=strdup(opaque); + if(!opt->opaque) + return KEYSERVER_NO_MEMORY; + return 0; + } + if(sscanf(line,"VERSION %d\n",&version)==1) { if(version!=KEYSERVER_PROTO_VERSION) @@ -236,6 +246,8 @@ parse_ks_options(char *line,struct ks_options *opt) opt->debug=0; else if(start[5]=='=') opt->debug=atoi(&start[6]); + else if(start[5]=='\0') + opt->debug=1; } else if(strncasecmp(start,"timeout",7)==0) { |