diff options
| author | David Shaw <[email protected]> | 2005-08-26 04:24:46 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2005-08-26 04:24:46 +0000 |
| commit | aec65a94d8df51606cc75516c7693cdf8b1d6787 (patch) | |
| tree | 7cf6fce0f43ef016d377c6d40bb54930a08847d8 /keyserver/ksutil.h | |
| parent | * gpg.sgml: Fix documentation for setpref/updpref, document (diff) | |
| download | gnupg-aec65a94d8df51606cc75516c7693cdf8b1d6787.tar.gz gnupg-aec65a94d8df51606cc75516c7693cdf8b1d6787.zip | |
* ksutil.h, ksutil.c (parse_ks_options): Remove exact-name and
exact-email. (classify_ks_search): Mimic the gpg search modes instead
with *, =, <, and @.
* gpgkeys_ldap.c (search_key), gpgkeys_hkp.c (search_key): Call them
here. Suggested by Jason Harris.
Diffstat (limited to '')
| -rw-r--r-- | keyserver/ksutil.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/keyserver/ksutil.h b/keyserver/ksutil.h index e9d875f06..8e00e7902 100644 --- a/keyserver/ksutil.h +++ b/keyserver/ksutil.h @@ -74,6 +74,9 @@ int register_timeout(void); enum ks_action {KS_UNKNOWN=0,KS_GET,KS_SEND,KS_SEARCH}; +enum ks_search_type {KS_SEARCH_SUBSTR,KS_SEARCH_EXACT, + KS_SEARCH_MAIL,KS_SEARCH_MAILSUB}; + struct ks_options { enum ks_action action; @@ -89,8 +92,6 @@ struct ks_options unsigned int include_revoked:1; unsigned int include_subkeys:1; unsigned int check_cert:1; - unsigned int exact_name:1; - unsigned int exact_email:1; } flags; unsigned int verbose; unsigned int debug; @@ -103,6 +104,7 @@ void free_ks_options(struct ks_options *opt); int parse_ks_options(char *line,struct ks_options *opt); const char *ks_action_to_string(enum ks_action action); void print_nocr(FILE *stream,const char *str); +enum ks_search_type classify_ks_search(const char **search); #if defined (HAVE_LIBCURL) || defined (FAKE_CURL) int curl_err_to_gpg_err(CURLcode error); |