diff options
| author | Chris Toshok <toshok@src.gnome.org> | 2003-05-20 04:30:24 +0800 |
|---|---|---|
| committer | Chris Toshok <toshok@src.gnome.org> | 2003-05-20 04:30:24 +0800 |
| commit | ab8f20f873299e4364899bdcd3e6be518ffd4ffc (patch) | |
| tree | 5a51bdfda30d0815685a30f3151c0ff110cec1d4 | |
| parent | 6052618948ddc67076b41c4fe9b14f44ad9a727b (diff) | |
| download | gsoc2013-evolution-ab8f20f873299e4364899bdcd3e6be518ffd4ffc.tar.gz gsoc2013-evolution-ab8f20f873299e4364899bdcd3e6be518ffd4ffc.tar.zst gsoc2013-evolution-ab8f20f873299e4364899bdcd3e6be518ffd4ffc.zip | |
i2003-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.
svn path=/trunk/; revision=21270
| -rw-r--r-- | addressbook/ChangeLog | 6 | ||||
| -rw-r--r-- | addressbook/backend/pas/pas-backend-ldap.c | 3 |
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)); |