diff options
| -rw-r--r-- | g10/ChangeLog | 8 | ||||
| -rw-r--r-- | g10/getkey.c | 4 | ||||
| -rw-r--r-- | g10/options.skel | 2 |
3 files changed, 12 insertions, 2 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index e7278e00d..52b0e36df 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,11 @@ +2005-08-19 David Shaw <[email protected]> + + * options.skel: Remove the surfnet LDAP keyserver from the list of + samples since it is being shut down. + + * getkey.c (classify_user_id): Disable the '.' and '+' search + modes since they aren't supported yet. + 2005-08-05 David Shaw <[email protected]> * g10.c (main), passphrase.c (set_passphrase_from_string): New diff --git a/g10/getkey.c b/g10/getkey.c index 59f18f6a5..4a8438168 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -590,11 +590,13 @@ classify_user_id( const char *name, KEYDB_SEARCH_DESC *desc ) case 0: /* empty string is an error */ return 0; +#if 0 case '.': /* an email address, compare from end */ mode = KEYDB_SEARCH_MODE_MAILEND; s++; desc->u.name = s; break; +#endif case '<': /* an email address */ mode = KEYDB_SEARCH_MODE_MAIL; @@ -619,11 +621,13 @@ classify_user_id( const char *name, KEYDB_SEARCH_DESC *desc ) desc->u.name = s; break; +#if 0 case '+': /* compare individual words */ mode = KEYDB_SEARCH_MODE_WORDS; s++; desc->u.name = s; break; +#endif case '#': /* local user id */ return 0; /* This is now obsolete and van't not be used anymore*/ diff --git a/g10/options.skel b/g10/options.skel index cf5033bef..37bf87c12 100644 --- a/g10/options.skel +++ b/g10/options.skel @@ -92,7 +92,6 @@ # mailto:[email protected] # # Example LDAP keyservers: -# ldap://pgp.surfnet.nl:11370 # ldap://keyserver.pgp.com # # Regular URL syntax applies, and you can set an alternate port @@ -114,7 +113,6 @@ keyserver hkp://subkeys.pgp.net #keyserver mailto:[email protected] -#keyserver ldap://pgp.surfnet.nl:11370 #keyserver ldap://keyserver.pgp.com # Common options for keyserver functions: |