[svn] GnuPG - r3868 - trunk/g10

[svn author dshaw]

Author: dshaw
Date: 2005-08-19 15:37:47 +0200 (Fri, 19 Aug 2005)
New Revision: 3868

Modified:
   trunk/g10/ChangeLog
   trunk/g10/getkey.c
   trunk/g10/options.skel
Log:
* 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.


Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog	2005-08-18 21:14:16 UTC (rev 3867)
+++ trunk/g10/ChangeLog	2005-08-19 13:37:47 UTC (rev 3868)
@@ -1,3 +1,11 @@
+2005-08-19  David Shaw  <dshaw at 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 at jabberwocky.com>
 
 	* g10.c (main), passphrase.c (set_passphrase_from_string): New

Modified: trunk/g10/getkey.c
===================================================================
--- trunk/g10/getkey.c	2005-08-18 21:14:16 UTC (rev 3867)
+++ trunk/g10/getkey.c	2005-08-19 13:37:47 UTC (rev 3868)
@@ -590,11 +590,13 @@
 	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 @@
             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*/

Modified: trunk/g10/options.skel
===================================================================
--- trunk/g10/options.skel	2005-08-18 21:14:16 UTC (rev 3867)
+++ trunk/g10/options.skel	2005-08-19 13:37:47 UTC (rev 3868)
@@ -92,7 +92,6 @@
 #      mailto:pgp-public-keys at 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 at keys.nl.pgp.net
-#keyserver ldap://pgp.surfnet.nl:11370
 #keyserver ldap://keyserver.pgp.com
 
 # Common options for keyserver functions: