X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fcldap.c;h=58a6abc9041d6d08b13c672f254e979bc6df80f9;hb=1fd3c797a822ac121a481f5ba686779d6e620ed8;hp=55f1be4fb9faac15ff96755cd9e1ea60ea09f8eb;hpb=8153a4039b9049da4fc324cd0807d3dc964596ab;p=openldap diff --git a/libraries/libldap/cldap.c b/libraries/libldap/cldap.c index 55f1be4fb9..58a6abc904 100644 --- a/libraries/libldap/cldap.c +++ b/libraries/libldap/cldap.c @@ -14,7 +14,8 @@ #ifdef LDAP_CONNECTIONLESS #include -#include + +#include #include #include @@ -69,7 +70,7 @@ cldap_open( char *host, int port ) int local_h_errno; char *ha_buf=NULL; -#define DO_RETURN(x) if (ha_buf) free(ha_buf); return (x); +#define DO_RETURN(x) if (ha_buf) LDAP_FREE(ha_buf); return (x); Debug( LDAP_DEBUG_TRACE, "ldap_open\n", 0, 0, 0 ); @@ -81,23 +82,23 @@ cldap_open( char *host, int port ) sock.sin_family = AF_INET; sock.sin_port = 0; if ( bind(s, (struct sockaddr *) &sock, sizeof(sock)) < 0) { - close( s ); + tcp_close( s ); return( NULL ); } if (( ld = ldap_init( host, port )) == NULL ) { - close( s ); + tcp_close( s ); return( NULL ); } ld->ld_cldapnaddr = 0; ld->ld_cldapaddrs = NULL; - if (lber_pvt_sb_set_io( &(ld->ld_sb), &lber_pvt_sb_io_udp, NULL )<0) { + if (ber_pvt_sb_set_io( &(ld->ld_sb), &ber_pvt_sb_io_udp, NULL )<0) { ldap_ld_free(ld, 1 ); return NULL; } - ld->ld_version = LDAP_VERSION; + ld->ld_version = LDAP_VERSION2; sock.sin_family = AF_INET; sock.sin_port = htons( port ); @@ -143,7 +144,7 @@ cldap_open( char *host, int port ) } if ( ld->ld_host == NULL ) { - ld->ld_host = strdup( host ); + ld->ld_host = LDAP_STRDUP( host ); } } } else { @@ -156,15 +157,13 @@ cldap_open( char *host, int port ) } if ( ld->ld_cldapaddrs == NULL -#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS || ( ld->ld_defconn = ldap_new_connection( ld, NULL, 1,0,0 )) == NULL -#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */ ) { ldap_ld_free( ld, 0 ); DO_RETURN( NULL ); } - lber_pvt_sb_udp_set_dst( &ld->ld_sb, ld->ld_cldapaddrs[0] ); + ber_pvt_sb_udp_set_dst( &ld->ld_sb, ld->ld_cldapaddrs[0] ); cldap_setretryinfo( ld, 0, 0 ); @@ -219,7 +218,7 @@ cldap_search_s( LDAP *ld, char *base, int scope, char *filter, char **attrs, --ld->ld_msgid; /* use same id as before */ } - lber_pvt_sb_udp_set_dst( &(ld->ld_sb), + ber_pvt_sb_udp_set_dst( &(ld->ld_sb), ld->ld_cldapaddrs[ cri.cri_useaddr ] ); Debug( LDAP_DEBUG_TRACE, "cldap_search_s try %d (to %s)\n", @@ -251,21 +250,17 @@ add_addr( LDAP *ld, struct sockaddr *sap ) { struct sockaddr *newsap, **addrs; - if (( newsap = (struct sockaddr *)malloc( sizeof( struct sockaddr ))) + if (( newsap = (struct sockaddr *)LDAP_MALLOC( sizeof( struct sockaddr ))) == NULL ) { ld->ld_errno = LDAP_NO_MEMORY; return( -1 ); } - if ( ld->ld_cldapnaddr == 0 ) { - addrs = (struct sockaddr **)malloc( sizeof(struct sockaddr *)); - } else { - addrs = (struct sockaddr **)realloc( ld->ld_cldapaddrs, + addrs = (struct sockaddr **)LDAP_REALLOC( ld->ld_cldapaddrs, ( ld->ld_cldapnaddr + 1 ) * sizeof(struct sockaddr *)); - } if ( addrs == NULL ) { - free( newsap ); + LDAP_FREE( newsap ); ld->ld_errno = LDAP_NO_MEMORY; return( -1 ); } @@ -284,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; @@ -341,13 +337,13 @@ cldap_result( LDAP *ld, int msgid, LDAPMessage **res, logdn = NULL; if ( ber_scanf( &ber, "ia", &id, &logdn ) == LBER_ERROR ) { - free( ber.ber_buf ); /* gack! */ + LDAP_FREE( ber.ber_buf ); /* gack! */ ret = LDAP_DECODING_ERROR; Debug( LDAP_DEBUG_TRACE, "cldap_result: ber_scanf returned LBER_ERROR (%d)\n", ret, 0, 0 ); } else if ( id != msgid ) { - free( ber.ber_buf ); /* gack! */ + LDAP_FREE( ber.ber_buf ); /* gack! */ Debug( LDAP_DEBUG_TRACE, "cldap_result: looking for msgid %d; got %d\n", msgid, id, 0 ); @@ -358,7 +354,7 @@ cldap_result( LDAP *ld, int msgid, LDAPMessage **res, * got a result: determine which server it came from * decode into ldap message chain */ - src = (struct sockaddr_in *) lber_pvt_sb_udp_get_src( sb ); + src = (struct sockaddr_in *) ber_pvt_sb_udp_get_src( sb ); for ( fromaddr = 0; fromaddr < ld->ld_cldapnaddr; ++fromaddr ) { if ( memcmp( &((struct sockaddr_in *) @@ -369,13 +365,13 @@ cldap_result( LDAP *ld, int msgid, LDAPMessage **res, } } ret = cldap_parsemsg( ld, msgid, &ber, res, base ); - free( ber.ber_buf ); /* gack! */ + LDAP_FREE( ber.ber_buf ); /* gack! */ Debug( LDAP_DEBUG_TRACE, "cldap_result got result (%d)\n", ret, 0, 0 ); } if ( logdn != NULL ) { - free( logdn ); + LDAP_FREE( logdn ); } } @@ -394,7 +390,7 @@ cldap_result( LDAP *ld, int msgid, LDAPMessage **res, if ( i == fromaddr ) { continue; } - lber_pvt_sb_udp_set_dst( sb, ld->ld_cldapaddrs[i] ); + ber_pvt_sb_udp_set_dst( sb, ld->ld_cldapaddrs[i] ); Debug( LDAP_DEBUG_TRACE, "cldap_result abandoning id %d (to %s)\n", msgid, inet_ntoa( ((struct sockaddr_in *) @@ -411,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; @@ -425,9 +423,9 @@ cldap_parsemsg( LDAP *ld, int msgid, BerElement *ber, for ( tag = ber_first_element( ber, &len, &cookie ); tag != LBER_DEFAULT && rc != LDAP_SUCCESS; tag = ber_next_element( ber, &len, cookie )) { - if (( ldm = (LDAPMessage *)calloc( 1, sizeof(LDAPMessage))) + 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*/ } @@ -442,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 ); @@ -451,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 ); @@ -460,14 +457,14 @@ cldap_parsemsg( LDAP *ld, int msgid, BerElement *ber, /* * substitute original searchbase for trailing '*' */ - if (( p = (char *)malloc( slen + baselen )) == NULL ) { + if (( p = (char *)LDAP_MALLOC( slen + baselen )) == NULL ) { rc = LDAP_NO_MEMORY; - free( dn ); + LDAP_FREE( dn ); break; /* return w/error */ } strcpy( p, dn ); strcpy( p + slen - 1, base ); - free( dn ); + LDAP_FREE( dn ); dn = p; } @@ -475,7 +472,7 @@ cldap_parsemsg( LDAP *ld, int msgid, BerElement *ber, bv->bv_len ) == -1 ) { break; /* return w/error */ } - free( dn ); + LDAP_FREE( dn ); ber_bvfree( bv ); bv = NULL; @@ -497,7 +494,7 @@ cldap_parsemsg( LDAP *ld, int msgid, BerElement *ber, if ( ldap_debug & LDAP_DEBUG_PACKETS ) { fprintf( stderr, "cldap_parsemsg add message id %d type %d:\n", ldm->lm_msgid, ldm->lm_msgtype ); - lber_log_dump( LDAP_DEBUG_BER, ldap_debug, ldm->lm_ber, 1 ); + ber_log_dump( LDAP_DEBUG_BER, ldap_debug, ldm->lm_ber, 1 ); } #endif /* LDAP_DEBUG */ @@ -518,10 +515,10 @@ 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 ); } - free( ldm ); + LDAP_FREE( ldm ); } if ( bv != NULL ) { ber_bvfree( bv );