/* search.c - DNS SRV backend search function */
/* $OpenLDAP$ */
/*
- * Copyright 2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 2000-2002 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
Backend *be,
Connection *conn,
Operation *op,
- const char *dn,
- const char *ndn,
+ struct berval *dn,
+ struct berval *ndn,
int scope,
int deref,
int size,
int time,
Filter *filter,
- const char *filterstr,
- char **attrs,
+ struct berval *filterstr,
+ AttributeName *attrs,
int attrsonly )
{
int i;
char *domain = NULL;
char *hostlist = NULL;
char **hosts = NULL;
- char *refdn, *nrefdn;
- struct berval **urls = NULL;
+ char *refdn;
+ struct berval nrefdn = { 0, NULL };
+ BerVarray urls = NULL;
assert( get_manageDSAit( op ) );
- if( ldap_dn2domain( dn, &domain ) ) {
+ if( ldap_dn2domain( dn->bv_val, &domain ) ) {
send_ldap_result( conn, op, LDAP_REFERRAL,
NULL, NULL, default_referral, NULL );
goto done;
}
Debug( LDAP_DEBUG_TRACE, "DNSSRV: dn=\"%s\" -> domain=\"%s\"\n",
- dn == NULL ? "" : dn,
+ dn->bv_len ? dn->bv_val : "",
domain == NULL ? "" : domain,
0 );
}
for( i=0; hosts[i] != NULL; i++) {
- struct berval *url = ch_malloc( sizeof( struct berval ) );
+ struct berval url;
- url->bv_len = sizeof("ldap://")-1 + strlen(hosts[i]);
- url->bv_val = ch_malloc( url->bv_len + 1 );
+ url.bv_len = sizeof("ldap://")-1 + strlen(hosts[i]);
+ url.bv_val = ch_malloc( url.bv_len + 1 );
- strcpy( url->bv_val, "ldap://" );
- strcpy( &url->bv_val[sizeof("ldap://")-1], hosts[i] );
+ strcpy( url.bv_val, "ldap://" );
+ strcpy( &url.bv_val[sizeof("ldap://")-1], hosts[i] );
- if( ber_bvecadd( &urls, url ) < 0 ) {
- ber_bvfree( url );
+ if( ber_bvarray_add( &urls, &url ) < 0 ) {
+ free( url.bv_val );
send_ldap_result( conn, op, LDAP_OTHER,
- NULL, "problem processing DNS SRV records for DN",
- NULL, NULL );
+ NULL, "problem processing DNS SRV records for DN",
+ NULL, NULL );
goto done;
}
}
Statslog( LDAP_DEBUG_STATS,
"conn=%ld op=%d DNSSRV p=%d dn=\"%s\" url=\"%s\"\n",
- op->o_connid, op->o_opid, op->o_protocol, dn, urls[0]->bv_val );
+ op->o_connid, op->o_opid, op->o_protocol,
+ dn->bv_len ? dn->bv_val : "", urls[0].bv_val );
Debug( LDAP_DEBUG_TRACE,
"DNSSRV: ManageDSAit scope=%d dn=\"%s\" -> url=\"%s\"\n",
scope,
- dn == NULL ? "" : dn,
- urls[0]->bv_val );
+ dn->bv_len ? dn->bv_val : "",
+ urls[0].bv_val );
rc = ldap_domain2dn(domain, &refdn);
NULL, "DNS SRV problem processing manageDSAit control",
NULL, NULL );
goto done;
- }
- nrefdn = ch_strdup( refdn );
- dn_normalize(nrefdn);
+ } else {
+ struct berval bv;
+ bv.bv_val = refdn;
+ bv.bv_len = strlen( refdn );
+
+ rc = dnNormalize2( NULL, &bv, &nrefdn );
+ if( rc != LDAP_SUCCESS ) {
+ send_ldap_result( conn, op, LDAP_OTHER,
+ NULL, "DNS SRV problem processing manageDSAit control",
+ NULL, NULL );
+ goto done;
+ }
+ }
- if( strcmp( nrefdn, ndn ) != 0 ) {
+ if( !dn_match( &nrefdn, ndn ) ) {
/* requested dn is subordinate */
Debug( LDAP_DEBUG_TRACE,
- "DNSSRV: dn=\"%s\" subordindate to refdn=\"%s\"\n",
- dn == NULL ? "" : dn,
- refdn == NULL ? "" : refdn,
- NULL );
+ "DNSSRV: dn=\"%s\" subordindate to refdn=\"%s\"\n",
+ dn->bv_len ? dn->bv_val : "",
+ refdn == NULL ? "" : refdn,
+ NULL );
send_ldap_result( conn, op, LDAP_NO_SUCH_OBJECT,
refdn, NULL,
NULL, NULL, NULL, NULL );
} else {
- struct berval val;
- struct berval *vals[2];
+ struct berval vals[2];
Entry *e = ch_calloc( 1, sizeof(Entry) );
AttributeDescription *ad_objectClass
= slap_schema.si_ad_objectClass;
AttributeDescription *ad_ref = slap_schema.si_ad_ref;
- e->e_dn = strdup( dn );
- e->e_ndn = strdup( ndn );
+ e->e_dn = strdup( dn->bv_val );
+ e->e_name.bv_len = dn->bv_len;
+ e->e_ndn = strdup( ndn->bv_val );
+ e->e_nname.bv_len = ndn->bv_len;
e->e_attrs = NULL;
e->e_private = NULL;
- vals[0] = &val;
- vals[1] = NULL;
+ vals[1].bv_val = NULL;
- val.bv_val = "top";
- val.bv_len = sizeof("top")-1;
+ vals[0].bv_val = "top";
+ vals[0].bv_len = sizeof("top")-1;
attr_merge( e, ad_objectClass, vals );
- val.bv_val = "referral";
- val.bv_len = sizeof("referral")-1;
+ vals[0].bv_val = "referral";
+ vals[0].bv_len = sizeof("referral")-1;
attr_merge( e, ad_objectClass, vals );
- val.bv_val = "extensibleObject";
- val.bv_len = sizeof("extensibleObject")-1;
+ vals[0].bv_val = "extensibleObject";
+ vals[0].bv_len = sizeof("extensibleObject")-1;
attr_merge( e, ad_objectClass, vals );
{
if( rc == LDAP_SUCCESS ) {
char *p;
- val.bv_val = ch_strdup( domain );
+ vals[0].bv_val = ch_strdup( domain );
- p = strchr( val.bv_val, '.' );
+ p = strchr( vals[0].bv_val, '.' );
- if( p == val.bv_val ) {
- val.bv_val[1] = '\0';
+ if( p == vals[0].bv_val ) {
+ vals[0].bv_val[1] = '\0';
} else if ( p != NULL ) {
*p = '\0';
}
- val.bv_len = strlen(val.bv_val);
+ vals[0].bv_len = strlen(vals[0].bv_val);
attr_merge( e, ad, vals );
}
}
rc = slap_str2ad( "associatedDomain", &ad, &text );
if( rc == LDAP_SUCCESS ) {
- val.bv_val = domain;
- val.bv_len = strlen(domain);
+ vals[0].bv_val = domain;
+ vals[0].bv_len = strlen(domain);
attr_merge( e, ad, vals );
}
}
NULL, NULL, NULL, NULL );
}
- free( refdn );
- free( nrefdn );
+ if ( refdn ) free( refdn );
+ if ( nrefdn.bv_val ) free( nrefdn.bv_val );
done:
if( domain != NULL ) ch_free( domain );
if( hostlist != NULL ) ch_free( hostlist );
if( hosts != NULL ) charray_free( hosts );
- if( urls != NULL ) ber_bvecfree( urls );
+ if( urls != NULL ) ber_bvarray_free( urls );
return 0;
}
projects / openldap / blobdiff