[evolution-patches] patch for addressbook 42825

[Chris Toshok <toshok ximian com>]

dan suggested this solution: use the correct (but more inefficient and
broken in some cases) query if evolutionPerson is supported, and fall
back to just "sn" if it isn't.

Chris

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
retrieving revision 1.1425
diff -u -r1.1425 ChangeLog
--- ChangeLog	19 May 2003 18:49:06 -0000	1.1425
+++ ChangeLog	19 May 2003 19:56:22 -0000
@@ -1,5 +1,11 @@
 2003-05-19  Chris Toshok  <toshok ximian com>
 
+	* backend/pas/pas-backend-ldap.c (func_beginswith): use the more
+	convoluted (but more correct) query if evolutionPerson is
+	supported.  Fixes #42825.
+
+2003-05-19  Chris Toshok  <toshok ximian com>
+
 	* gui/component/addressbook-component.c
 	(ensure_completion_uris_exist): fix the initial run case.  the
 	config upgrade code creates all elements so we can't just check
Index: backend/pas/pas-backend-ldap.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/backend/pas/pas-backend-ldap.c,v
retrieving revision 1.129
diff -u -r1.129 pas-backend-ldap.c
--- backend/pas/pas-backend-ldap.c	4 Mar 2003 22:00:56 -0000	1.129
+++ backend/pas/pas-backend-ldap.c	19 May 2003 19:56:23 -0000
@@ -2617,7 +2617,8 @@
 			else if (!strcmp (ldap_attr, "fileAs")) {
 				if (ldap_data->bl->priv->evolutionPersonSupported)
 					ldap_data->list = g_list_prepend(ldap_data->list,
-									 g_strdup_printf("(fileAs=%s*)", str));
+								 g_strdup_printf("(|(fileAs=%s*)(&(!(fileAs=*))(sn=%s*)))",
+										 str, str));
 				else 
 					ldap_data->list = g_list_prepend(ldap_data->list,
 									 g_strdup_printf("(sn=%s*)", str));