diff options
Diffstat (limited to 'addressbook')
| -rw-r--r-- | addressbook/ChangeLog | 7 | ||||
| -rw-r--r-- | addressbook/gui/component/addressbook-config.c | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index be66dc78ae..8ee16a9368 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,10 @@ +2006-06-12 simon.zheng <simon.zheng@sun.com> + + Fix for #336453 + + * gui/component/addressbook-config.c: (addressbook_ldap_init): + Add SunLDAP library support - a variant of Netscape LDAP. + 2006-06-12 Devashish Sharma <sdevashish@novell.com> * gui/contact-editor/e-contact-editor.c : If company name diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c index 3f80c40604..654b66c6c7 100644 --- a/addressbook/gui/component/addressbook-config.c +++ b/addressbook/gui/component/addressbook-config.c @@ -57,7 +57,9 @@ #ifdef HAVE_LDAP #ifndef G_OS_WIN32 #include <ldap.h> +#ifndef SUNLDAP #include <ldap_schema.h> +#endif #else #include <winldap.h> #include "openldap-extract.h" @@ -267,7 +269,7 @@ addressbook_ldap_init (GtkWidget *window, ESource *source) } ldap_error = ldap_set_option (ldap, LDAP_OPT_PROTOCOL_VERSION, &protocol_version); - if (LDAP_OPT_SUCCESS != ldap_error) + if (LDAP_SUCCESS != ldap_error) g_warning ("failed to set protocol version to LDAPv3"); /* XXX do TLS if it's configured in */ |