From ab8f20f873299e4364899bdcd3e6be518ffd4ffc Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Mon, 19 May 2003 20:30:24 +0000 Subject: i2003-05-19 Chris Toshok * backend/pas/pas-backend-ldap.c (func_beginswith): use the more convoluted (but more correct) query if evolutionPerson is supported. Fixes #42825. svn path=/trunk/; revision=21270 --- addressbook/ChangeLog | 6 ++++++ addressbook/backend/pas/pas-backend-ldap.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 71cb31aa2a..b1c12cb82f 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,9 @@ +2003-05-19 Chris Toshok + + * 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 * backend/ebook/e-destination.c (use_default_book_cb): handle the 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)); -- cgit v1.2.3