aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/ChangeLog6
-rw-r--r--addressbook/backend/pas/pas-backend-ldap.c3
2 files changed, 8 insertions, 1 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 71cb31aa2a..b1c12cb82f 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -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>
+
* backend/ebook/e-destination.c (use_default_book_cb): handle the
case where @book == NULL, which can happen if there was a problem
opening the default book. Should fix #43005.
diff --git a/addressbook/backend/pas/pas-backend-ldap.c b/addressbook/backend/pas/pas-backend-ldap.c
index 237bc8597c..aff94077ca 100644
--- a/addressbook/backend/pas/pas-backend-ldap.c
+++ b/addressbook/backend/pas/pas-backend-ldap.c
@@ -2617,7 +2617,8 @@ func_beginswith(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *da
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));