ITS#5762

diff --git a/CHANGES b/CHANGES
index e03db01ff66396c4fe4de2861d2d1ecc0d533978..27080f6e71620919d22beb2fcc2d85281abf86eb 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@ OpenLDAP 2.4 Change Log
 
 OpenLDAP 2.4.13 Engineering
        Fixed liblutil hex conversion (ITS#5699)
+       Fixed libldap error code return (ITS#5762)
        Added slapd dn.this ACL limits (ITS#5734)
        Fixed slapd nameUIDPretty bitstring parsing (ITS#5750)
        Fixed slapd overlay/database open with real structure (ITS#5724)

diff --git a/libraries/libldap/pagectrl.c b/libraries/libldap/pagectrl.c
index 8aac0c892a4ee644b9a7b1896574e5fa1d9a68ee..063e807bf051344650954700b816bc24924fcd54 100644 (file)
--- a/libraries/libldap/pagectrl.c
+++ b/libraries/libldap/pagectrl.c
@@ -1,3 +1,4 @@
+/* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
  * Copyright 1998-2008 The OpenLDAP Foundation.
@@ -71,6 +72,7 @@ ldap_create_page_control_value(
 
        value->bv_val = NULL;
        value->bv_len = 0;
+       ld->ld_errno = LDAP_SUCCESS;
 
        if ( cookie == NULL ) {
                cookie = &null_cookie;

diff --git a/libraries/libldap/sortctrl.c b/libraries/libldap/sortctrl.c
index 80faea92e33ec072e5d049c92f5aaca10cb87923..d5b6ac746f440e433a0ed6d95d116a5dc2958594 100644 (file)
--- a/libraries/libldap/sortctrl.c
+++ b/libraries/libldap/sortctrl.c
@@ -304,6 +304,7 @@ ldap_create_sort_control_value(
 
        value->bv_val = NULL;
        value->bv_len = 0;
+       ld->ld_errno = LDAP_SUCCESS;
 
        ber = ldap_alloc_ber_with_options( ld );
        if ( ber == NULL) {

diff --git a/libraries/libldap/stctrl.c b/libraries/libldap/stctrl.c
index 8aba9466741fdb1c8465adf6c974a48dadabcb99..d02d2d210f1ca295dab3e7ca2a0b9a16a574e1ee 100644 (file)
--- a/libraries/libldap/stctrl.c
+++ b/libraries/libldap/stctrl.c
@@ -60,6 +60,7 @@ param_error:;
        }
 
        assert( LDAP_VALID( ld ) );
+       ld->ld_errno = LDAP_SUCCESS;
 
        /* check sizes according to I.D. */
        if ( sessionSourceIp == NULL ) {

diff --git a/libraries/libldap/vlvctrl.c b/libraries/libldap/vlvctrl.c
index d92084148e974c727d69eb6fca36884799bcf521..f0acaf910201f7a1452b2076130d33ca3eacaad5 100644 (file)
--- a/libraries/libldap/vlvctrl.c
+++ b/libraries/libldap/vlvctrl.c
@@ -101,6 +101,7 @@ ldap_create_vlv_control_value(
 
        value->bv_val = NULL;
        value->bv_len = 0;
+       ld->ld_errno = LDAP_SUCCESS;
 
        ber = ldap_alloc_ber_with_options( ld );
        if ( ber == NULL ) {