security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

* options.skel: Remove the surfnet LDAP keyserver from the list of

Browse Source 
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:
David Shaw 2005-08-19 13:37:47 +00:00
parent 70bf6d9204
commit bd146d5fcc
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
g10/ChangeLog
View File

@ -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> 2005-08-05 David Shaw <dshaw@jabberwocky.com>
* g10.c (main), passphrase.c (set_passphrase_from_string): New * g10.c (main), passphrase.c (set_passphrase_from_string): New

4
g10/getkey.c
View File

@ -590,11 +590,13 @@ classify_user_id( const char *name, KEYDB_SEARCH_DESC *desc )
case 0: /* empty string is an error */ case 0: /* empty string is an error */
return 0; return 0;
#if 0
case '.': /* an email address, compare from end */ case '.': /* an email address, compare from end */
mode = KEYDB_SEARCH_MODE_MAILEND; mode = KEYDB_SEARCH_MODE_MAILEND;
s++; s++;
desc->u.name = s; desc->u.name = s;
break; break;
#endif
case '<': /* an email address */ case '<': /* an email address */
mode = KEYDB_SEARCH_MODE_MAIL; mode = KEYDB_SEARCH_MODE_MAIL;
@ -619,11 +621,13 @@ classify_user_id( const char *name, KEYDB_SEARCH_DESC *desc )
desc->u.name = s; desc->u.name = s;
break; break;
#if 0
case '+': /* compare individual words */ case '+': /* compare individual words */
mode = KEYDB_SEARCH_MODE_WORDS; mode = KEYDB_SEARCH_MODE_WORDS;
s++; s++;
desc->u.name = s; desc->u.name = s;
break; break;
#endif
case '#': /* local user id */ case '#': /* local user id */
return 0; /* This is now obsolete and van't not be used anymore*/ return 0; /* This is now obsolete and van't not be used anymore*/

2
g10/options.skel
View File

@ -92,7 +92,6 @@
# mailto:pgp-public-keys@keys.pgp.net # mailto:pgp-public-keys@keys.pgp.net
# #
# Example LDAP keyservers: # Example LDAP keyservers:
# ldap://pgp.surfnet.nl:11370
# ldap://keyserver.pgp.com # ldap://keyserver.pgp.com
# #
# Regular URL syntax applies, and you can set an alternate port # Regular URL syntax applies, and you can set an alternate port
@ -114,7 +113,6 @@
keyserver hkp://subkeys.pgp.net keyserver hkp://subkeys.pgp.net
#keyserver mailto:pgp-public-keys@keys.nl.pgp.net #keyserver mailto:pgp-public-keys@keys.nl.pgp.net
#keyserver ldap://pgp.surfnet.nl:11370
#keyserver ldap://keyserver.pgp.com #keyserver ldap://keyserver.pgp.com
# Common options for keyserver functions: # Common options for keyserver functions: