aboutsummaryrefslogtreecommitdiffstats
path: root/keyserver/ksutil.c
diff options
context:
space:
mode:
Diffstat (limited to 'keyserver/ksutil.c')
-rw-r--r--keyserver/ksutil.c42
1 files changed, 21 insertions, 21 deletions
diff --git a/keyserver/ksutil.c b/keyserver/ksutil.c
index 287f50224..595637756 100644
--- a/keyserver/ksutil.c
+++ b/keyserver/ksutil.c
@@ -298,27 +298,6 @@ parse_ks_options(char *line,struct ks_options *opt)
return KEYSERVER_NO_MEMORY;
}
}
- else if(strcasecmp(start,"exact-email")==0
- || strcasecmp(start,"exact-mail")==0)
- {
- if(no)
- opt->flags.exact_email=0;
- else
- {
- opt->flags.exact_email=1;
- opt->flags.exact_name=0;
- }
- }
- else if(strcasecmp(start,"exact-name")==0)
- {
- if(no)
- opt->flags.exact_name=0;
- else
- {
- opt->flags.exact_name=1;
- opt->flags.exact_email=0;
- }
- }
}
return -1;
@@ -356,6 +335,27 @@ print_nocr(FILE *stream,const char *str)
}
}
+enum ks_search_type
+classify_ks_search(const char **search)
+{
+ switch(**search)
+ {
+ default:
+ return KS_SEARCH_SUBSTR;
+ case '*':
+ (*search)++;
+ return KS_SEARCH_SUBSTR;
+ case '=':
+ (*search)++;
+ return KS_SEARCH_EXACT;
+ case '<':
+ return KS_SEARCH_MAIL;
+ case '@':
+ (*search)++;
+ return KS_SEARCH_MAILSUB;
+ }
+}
+
#if defined (HAVE_LIBCURL) || defined (FAKE_CURL)
int
curl_err_to_gpg_err(CURLcode error)