X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fvlvctrl.c;h=63adab1772a381e8dff7b1cb6f9a00bede6cd398;hb=fff5d3de601a7a980cf7554e3f2e6f4d7ceda834;hp=04b5526a65f6cc6f8f55ecd72a0bf312ba892b14;hpb=c6e4ad6c1216bf976b5977076d1ef72462509b42;p=openldap diff --git a/libraries/libldap/vlvctrl.c b/libraries/libldap/vlvctrl.c index 04b5526a65..63adab1772 100644 --- a/libraries/libldap/vlvctrl.c +++ b/libraries/libldap/vlvctrl.c @@ -1,5 +1,5 @@ /* - * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ /* Adapted for inclusion into OpenLDAP by Kurt D. Zeilenga */ @@ -22,7 +22,6 @@ #include #include #include -#include #include "ldap-int.h" @@ -72,7 +71,7 @@ ---*/ -LIBLDAP_F( int ) +int ldap_create_vlv_control( LDAP *ld, LDAPVLVInfo *vlvinfop, LDAPControl **ctrlp ) @@ -96,7 +95,7 @@ ldap_create_vlv_control( LDAP *ld, if( tag == LBER_ERROR ) goto exit; if (vlvinfop->ldvlv_attrvalue == NULL) { - tag = ber_printf(ber, "t{ii}", + tag = ber_printf(ber, "t{iiN}", LDAP_VLVBYINDEX_IDENTIFIER, vlvinfop->ldvlv_offset, vlvinfop->ldvlv_count); @@ -116,11 +115,11 @@ ldap_create_vlv_control( LDAP *ld, if( tag == LBER_ERROR ) goto exit; } - tag = ber_printf(ber, /*{*/ "}"); + tag = ber_printf(ber, /*{*/ "N}"); if( tag == LBER_ERROR ) goto exit; - ld->ld_errno = ldap_int_create_control( - LDAP_CONTROL_VLVREQUEST, ber, 1, ctrlp); + ld->ld_errno = ldap_create_control( LDAP_CONTROL_VLVREQUEST, + ber, 1, ctrlp); ber_free(ber, 1); return(ld->ld_errno); @@ -188,7 +187,7 @@ exit: ---*/ -LIBLDAP_F( int ) +int ldap_parse_vlv_control( LDAP *ld, LDAPControl **ctrls,