/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2007 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
}
muck.bv_len = ntargetDN.bv_len + nrefDN.bv_len - nbaseDN.bv_len;
- muck.bv_val = SLAP_MALLOC( muck.bv_len + 1 );
- if( muck.bv_val == NULL ) {
- Debug( LDAP_DEBUG_ANY,
- "referral_dn_muck: SLAP_MALLOC failed\n", 0, 0, 0 );
- return NULL;
- }
+ muck.bv_val = ch_malloc( muck.bv_len + 1 );
strncpy( muck.bv_val, ntargetDN.bv_val,
ntargetDN.bv_len-nbaseDN.bv_len );
int rc;
LDAPURLDesc *lurl;
- rc = ldap_url_parse_ext( url, &lurl );
+ rc = ldap_url_parse_ext( url, &lurl, LDAP_PVT_URL_PARSE_NONE );
switch( rc ) {
case LDAP_URL_SUCCESS:
case LDAP_URL_ERR_BADSCHEME:
/* not LDAP hence valid */
+ Debug( LDAP_DEBUG_CONFIG, "referral \"%s\": not LDAP.\n", url, 0, 0 );
return 0;
default:
return NULL;
}
- refs = SLAP_MALLOC( ( i + 1 ) * sizeof( struct berval ) );
- if ( refs == NULL ) {
- Debug( LDAP_DEBUG_ANY,
- "referral_rewrite: SLAP_MALLOC failed\n", 0, 0, 0 );
- return NULL;
- }
+ refs = ch_malloc( ( i + 1 ) * sizeof( struct berval ) );
for ( iv = in, jv = refs; !BER_BVISNULL( iv ); iv++ ) {
LDAPURLDesc *url;
- char *dn = url->lud_dn;
+ char *dn;
int rc;
- rc = ldap_url_parse_ext( iv->bv_val, &url );
+ rc = ldap_url_parse_ext( iv->bv_val, &url, LDAP_PVT_URL_PARSE_NONE );
if ( rc == LDAP_URL_ERR_BADSCHEME ) {
ber_dupbv( jv++, iv );
continue;
if( i < 1 ) return NULL;
- refs = SLAP_MALLOC( (i + 1) * sizeof(struct berval));
- if( refs == NULL ) {
- Debug( LDAP_DEBUG_ANY,
- "get_entry_referrals: SLAP_MALLOC failed\n", 0, 0, 0 );
- return NULL;
- }
+ refs = ch_malloc( (i + 1) * sizeof(struct berval));
for( iv=attr->a_vals, jv=refs; iv->bv_val != NULL; iv++ ) {
unsigned k;