Retuning 'other error' for invalid DN, instead of 'contact not found'

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 75627b4..c276d2a 100644 (file)
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,4 +1,10 @@
 2005-08-05  Sushma Rai  <rsushma@novell.com>
+       
+       * backends/ldap/e-book-backend-ldap.c (ldap_error_to_response):
+       Handling LDAP_INVALID_DN_SYNTAX error code, so that we don't get the
+       misleading error message "contact not found".
+
+2005-08-05  Sushma Rai  <rsushma@novell.com>
 
        * backends/groupwise/e-book-backend-groupwise.c 
        (e_book_backend_groupwise_get_contact_list): If cache is up-to-date and

diff --git a/addressbook/backends/ldap/e-book-backend-ldap.c b/addressbook/backends/ldap/e-book-backend-ldap.c
index 9bcd761..0df28a1 100644 (file)
--- a/addressbook/backends/ldap/e-book-backend-ldap.c
+++ b/addressbook/backends/ldap/e-book-backend-ldap.c
@@ -934,6 +934,8 @@ ldap_error_to_response (int ldap_error)
 {
        if (ldap_error == LDAP_SUCCESS)
                return GNOME_Evolution_Addressbook_Success;
+       else if (ldap_error == LDAP_INVALID_DN_SYNTAX)
+               return GNOME_Evolution_Addressbook_OtherError;
        else if (LDAP_NAME_ERROR (ldap_error))
                return GNOME_Evolution_Addressbook_ContactNotFound;
        else if (ldap_error == LDAP_INSUFFICIENT_ACCESS)