Merge remote branch 'mdb/mdb.master'

[openldap] / libraries / libldap / vlvctrl.c

diff --git a/libraries/libldap/vlvctrl.c b/libraries/libldap/vlvctrl.c
index ed30953816270a7a408e3f94f7a0848589dc933f..9a55a4b5235a13bb2e911680cea5fcace2f955f2 100644 (file)
--- a/libraries/libldap/vlvctrl.c
+++ b/libraries/libldap/vlvctrl.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2006 The OpenLDAP Foundation.
+ * Copyright 1998-2011 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -27,9 +27,6 @@
  * can be found in the file "build/LICENSE-2.0.1" in this distribution
  * of OpenLDAP Software.
  */
-/* Portions Copyright (C) The Internet Society (1997)
- * ASN.1 fragments are from RFC 2251; see RFC for full legal notices.
- */
 
 #include "portable.h"
 
@@ -50,8 +47,7 @@
    
    Create and encode the Virtual List View control.
 
-   ld        (IN)  An LDAP session handle, as obtained from a call to
-                                  ldap_init().
+   ld        (IN)  An LDAP session handle.
    
    vlvinfop  (IN)  The address of an LDAPVLVInfo structure whose contents 
                                   are used to construct the value of the control
@@ -96,14 +92,16 @@ ldap_create_vlv_control_value(
        BerElement *ber;
 
        if ( ld == NULL || vlvinfop == NULL || value == NULL ) {
-               ld->ld_errno = LDAP_PARAM_ERROR;
-               return ld->ld_errno;
+               if ( ld )
+                       ld->ld_errno = LDAP_PARAM_ERROR;
+               return LDAP_PARAM_ERROR;
        }
 
        assert( LDAP_VALID( ld ) );
 
        value->bv_val = NULL;
        value->bv_len = 0;
+       ld->ld_errno = LDAP_SUCCESS;
 
        ber = ldap_alloc_ber_with_options( ld );
        if ( ber == NULL ) {
@@ -171,8 +169,7 @@ error_return:;
    
    Create and encode the Virtual List View control.
 
-   ld        (IN)  An LDAP session handle, as obtained from a call to
-                                  ldap_init().
+   ld        (IN)  An LDAP session handle.
    
    vlvinfop  (IN)  The address of an LDAPVLVInfo structure whose contents 
                                   are used to construct the value of the control
@@ -222,11 +219,10 @@ ldap_create_vlv_control(
 
        ld->ld_errno = ldap_create_vlv_control_value( ld, vlvinfop, &value );
        if ( ld->ld_errno == LDAP_SUCCESS ) {
-               ld->ld_errno = ldap_create_control( LDAP_CONTROL_VLVREQUEST,
-                       NULL, 1, ctrlp );
-               if ( ld->ld_errno == LDAP_SUCCESS ) {
-                       (*ctrlp)->ldctl_value = value;
-               } else {
+
+               ld->ld_errno = ldap_control_create( LDAP_CONTROL_VLVREQUEST,
+                       1, &value, 0, ctrlp );
+               if ( ld->ld_errno != LDAP_SUCCESS ) {
                        LDAP_FREE( value.bv_val );
                }
        }
@@ -291,15 +287,15 @@ ldap_create_vlv_control(
 
 int
 ldap_parse_vlvresponse_control(
-       LDAP           *ld,
-       LDAPControl    *ctrl,
-       unsigned long  *target_posp,
-       unsigned long  *list_countp,
+       LDAP *ld,
+       LDAPControl *ctrl,
+       ber_int_t *target_posp,
+       ber_int_t *list_countp,
        struct berval  **contextp,
-       int            *errcodep )
+       ber_int_t *errcodep )
 {
        BerElement  *ber;
-       unsigned long pos, count, err;
+       ber_int_t pos, count, err;
        ber_tag_t tag, berTag;
        ber_len_t berLen;
 
@@ -356,15 +352,9 @@ ldap_parse_vlvresponse_control(
        ber_free(ber, 1);
 
        /* Return data to the caller for items that were requested. */
-       if (target_posp) {
-               *target_posp = pos;
-       }
-       if (list_countp) {
-               *list_countp = count;
-       }
-       if (errcodep) {
-               *errcodep = err;
-       }
+       if (target_posp) *target_posp = pos;
+       if (list_countp) *list_countp = count;
+       if (errcodep) *errcodep = err;
 
        ld->ld_errno = LDAP_SUCCESS;
        return(ld->ld_errno);