Don't pass NULL hostname to ldap_pvt_tls_check_hostname, use "localhost"

[openldap] / libraries / libldap / vlvctrl.c

diff --git a/libraries/libldap/vlvctrl.c b/libraries/libldap/vlvctrl.c
index 04b5526a65f6cc6f8f55ecd72a0bf312ba892b14..8cfd03a5b55f8d409f07d987762cff8171f74a4a 100644 (file)
--- a/libraries/libldap/vlvctrl.c
+++ b/libraries/libldap/vlvctrl.c
@@ -22,7 +22,6 @@
 #include <ac/stdlib.h>
 #include <ac/string.h>
 #include <ac/time.h>
-#include <ac/ctype.h>
 
 #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,