X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fcldap.c;h=58a6abc9041d6d08b13c672f254e979bc6df80f9;hb=1fd3c797a822ac121a481f5ba686779d6e620ed8;hp=7d4f34a4399eeb867a4f438d9e4791b1f38f3ce4;hpb=21c70857f1029309d6bc5a5b6a93d7537494b742;p=openldap

diff --git a/libraries/libldap/cldap.c b/libraries/libldap/cldap.c
index 7d4f34a439..58a6abc904 100644
--- a/libraries/libldap/cldap.c
+++ b/libraries/libldap/cldap.c
@@ -98,7 +98,7 @@ cldap_open( char *host, int port )
        return NULL;
     }
 	
-    ld->ld_version = LDAP_VERSION;
+    ld->ld_version = LDAP_VERSION2;
 
     sock.sin_family = AF_INET;
     sock.sin_port = htons( port );
@@ -279,7 +279,8 @@ cldap_result( LDAP *ld, int msgid, LDAPMessage **res,
     Sockbuf 		*sb = &ld->ld_sb;
     BerElement		ber;
     char		*logdn;
-    int			ret, id, fromaddr, i;
+    int			ret, fromaddr, i;
+	ber_int_t	id;
     struct timeval	tv;
 
     fromaddr = -1;
@@ -406,8 +407,10 @@ static int
 cldap_parsemsg( LDAP *ld, int msgid, BerElement *ber,
 	LDAPMessage **res, char *base )
 {
-    unsigned long	tag, len;
-    int			baselen, slen, rc;
+    ber_tag_t	tag;
+	ber_len_t	len;
+    int			baselen, slen;
+	ber_tag_t	rc;
     char		*dn, *p, *cookie;
     LDAPMessage		*chain, *prev, *ldm;
     struct berval	*bv;
@@ -422,7 +425,7 @@ cldap_parsemsg( LDAP *ld, int msgid, BerElement *ber,
 	    tag = ber_next_element( ber, &len, cookie )) {
 	if (( ldm = (LDAPMessage *)LDAP_CALLOC( 1, sizeof(LDAPMessage)))
 		== NULL || ( ldm->lm_ber = ldap_alloc_ber_with_options( ld ))
-		== NULLBER ) {
+		== NULL ) {
 	    rc = LDAP_NO_MEMORY;
 	    break;	/* return w/error*/
 	}
@@ -437,8 +440,7 @@ cldap_parsemsg( LDAP *ld, int msgid, BerElement *ber,
 		break;	/* return w/error */
 	    }
 
-	    if ( ber_printf( ldm->lm_ber, "to", tag, bv->bv_val,
-		    bv->bv_len ) == -1 ) {
+	    if ( ber_printf( ldm->lm_ber, "tO", tag, bv ) == -1 ) {
 		break;	/* return w/error */
 	    }
 	    ber_bvfree( bv );
@@ -446,7 +448,7 @@ cldap_parsemsg( LDAP *ld, int msgid, BerElement *ber,
 	    rc = LDAP_SUCCESS;
 
 	} else if ( tag == LDAP_RES_SEARCH_ENTRY ) {
-	    if ( ber_scanf( ber, "{aO", &dn, &bv ) == LBER_ERROR ) {
+	    if ( ber_scanf( ber, "{aO" /*}*/, &dn, &bv ) == LBER_ERROR ) {
 		break;	/* return w/error */
 	    }
 	    Debug( LDAP_DEBUG_TRACE, "cldap_parsemsg entry %s\n", dn, 0, 0 );
@@ -513,7 +515,7 @@ cldap_parsemsg( LDAP *ld, int msgid, BerElement *ber,
 
     /* dispose of any leftovers */
     if ( ldm != NULL ) {
-	if ( ldm->lm_ber != NULLBER ) {
+	if ( ldm->lm_ber != NULL ) {
 	    ber_free( ldm->lm_ber, 1 );
 	}
 	LDAP_FREE( ldm );