diff options
| author | Sushma Rai <rsushma@src.gnome.org> | 2005-09-08 08:07:34 +0000 |
|---|---|---|
| committer | Sushma Rai <rsushma@src.gnome.org> | 2005-09-08 08:07:34 +0000 |
| commit | 34129a4237a231414c3740f381b9678150f41165 (patch) | |
| tree | 2f0a3e5739d820f211d732e166eb5bc1a22ff649 | |
| parent | 05b5d5daf8be908a20ef3f9d658e32bc4330db46 (diff) | |
| download | evolution-data-server-gnome-2-10.tar.gz | |
Returning ldap_error from a non-void function query_ldap_root_dse().gnome-2-10
Patch submitted by "sbrabec@suse.cz (Stanislav Brabec)", to fix #302049.
| -rw-r--r-- | addressbook/ChangeLog | 6 | ||||
| -rw-r--r-- | addressbook/backends/ldap/e-book-backend-ldap.c | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 1336c99a0..4ad8c5391 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,9 @@ +2005-09-08 Sushma Rai <rsushma@novell.com> + + * backends/ldap/e-book-backend-ldap.c (query_ldap_root_dse): Returning + ldap error. Slightly modified patch (as done in head) submitted by + "sbrabec@suse.cz (Stanislav Brabec)". Fixes #302049. + 2005-08-20 Sushma Rai <rsushma@novell.com> * backends/ldap/e-book-backend-ldap.c (email_ber): Setting the proper diff --git a/addressbook/backends/ldap/e-book-backend-ldap.c b/addressbook/backends/ldap/e-book-backend-ldap.c index e4d32713d..b52a16405 100644 --- a/addressbook/backends/ldap/e-book-backend-ldap.c +++ b/addressbook/backends/ldap/e-book-backend-ldap.c @@ -588,13 +588,13 @@ query_ldap_root_dse (EBookBackendLDAP *bl) #define MAX_DSE_ATTRS 20 LDAP *ldap = bl->priv->ldap; LDAPMessage *resp; - int ldap_error; + int ldap_error = LDAP_OTHER; char *attrs[MAX_DSE_ATTRS], **values; int i = 0; struct timeval timeout; if (!ldap) - return; + return ldap_error; attrs[i++] = "supportedControl"; attrs[i++] = "supportedExtension"; |