mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-22 10:19:57 +01:00
* 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.
This commit is contained in:
parent
70bf6d9204
commit
bd146d5fcc
@ -1,3 +1,11 @@
|
||||
2005-08-19 David Shaw <dshaw@jabberwocky.com>
|
||||
|
||||
* 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 <dshaw@jabberwocky.com>
|
||||
|
||||
* g10.c (main), passphrase.c (set_passphrase_from_string): New
|
||||
|
@ -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*/
|
||||
|
@ -92,7 +92,6 @@
|
||||
# mailto:pgp-public-keys@keys.pgp.net
|
||||
#
|
||||
# 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:pgp-public-keys@keys.nl.pgp.net
|
||||
#keyserver ldap://pgp.surfnet.nl:11370
|
||||
#keyserver ldap://keyserver.pgp.com
|
||||
|
||||
# Common options for keyserver functions:
|
||||
|
Loading…
x
Reference in New Issue
Block a user