/* referral.c - muck with referrals */
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2004 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
*/
#include "portable.h"
{
int rc;
struct berval bvin;
- struct berval nrefDN = { 0, NULL };
- struct berval nbaseDN = { 0, NULL };
- struct berval ntargetDN = { 0, NULL };
+ struct berval nrefDN = BER_BVNULL;
+ struct berval nbaseDN = BER_BVNULL;
+ struct berval ntargetDN = BER_BVNULL;
if( !baseDN ) {
/* no base, return target */
bvin.bv_val = (char *)refDN;
bvin.bv_len = strlen( refDN );
- rc = dnPretty2( NULL, &bvin, &nrefDN );
+ rc = dnPretty( NULL, &bvin, &nrefDN, NULL );
if( rc != LDAP_SUCCESS ) {
/* Invalid refDN */
return NULL;
return nrefDN.bv_len ? nrefDN.bv_val : ch_strdup( baseDN->bv_val );
}
- rc = dnPretty2( NULL, targetDN, &ntargetDN );
+ rc = dnPretty( NULL, targetDN, &ntargetDN, NULL );
if( rc != LDAP_SUCCESS ) {
/* Invalid targetDN */
ch_free( nrefDN.bv_val );
}
if( nrefDN.bv_len ) {
- rc = dnPretty2( NULL, baseDN, &nbaseDN );
+ rc = dnPretty( NULL, baseDN, &nbaseDN, NULL );
if( rc != LDAP_SUCCESS ) {
/* Invalid baseDN */
ch_free( nrefDN.bv_val );
}
muck.bv_len = ntargetDN.bv_len + nrefDN.bv_len - nbaseDN.bv_len;
- muck.bv_val = ch_malloc( muck.bv_len + 1 );
+ muck.bv_val = SLAP_MALLOC( muck.bv_len + 1 );
+ if( muck.bv_val == NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG( OPERATION, CRIT,
+ "referral_dn_muck: SLAP_MALLOC failed\n", 0, 0, 0 );
+#else
+ Debug( LDAP_DEBUG_ANY,
+ "referral_dn_muck: SLAP_MALLOC failed\n", 0, 0, 0 );
+#endif
+ return NULL;
+ }
strncpy( muck.bv_val, ntargetDN.bv_val,
ntargetDN.bv_len-nbaseDN.bv_len );
if( i < 1 ) return NULL;
- refs = ch_malloc( (i+1) * sizeof( struct berval ) );
+ refs = SLAP_MALLOC( (i+1) * sizeof( struct berval ) );
+ if( refs == NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG( OPERATION, CRIT,
+ "referral_rewrite: SLAP_MALLOC failed\n", 0, 0, 0 );
+#else
+ Debug( LDAP_DEBUG_ANY,
+ "referral_rewrite: SLAP_MALLOC failed\n", 0, 0, 0 );
+#endif
+ return NULL;
+ }
for( iv=in,jv=refs; iv->bv_val != NULL ; iv++ ) {
LDAPURLDesc *url;
BerVarray get_entry_referrals(
- Backend *be,
- Connection *conn,
Operation *op,
Entry *e )
{
if( i < 1 ) return NULL;
- refs = ch_malloc( (i + 1) * sizeof(struct berval));
+ refs = SLAP_MALLOC( (i + 1) * sizeof(struct berval));
+ if( refs == NULL ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG( OPERATION, CRIT,
+ "get_entry_referrals: SLAP_MALLOC failed\n", 0, 0, 0 );
+#else
+ Debug( LDAP_DEBUG_ANY,
+ "get_entry_referrals: SLAP_MALLOC failed\n", 0, 0, 0 );
+#endif
+ return NULL;
+ }
for( iv=attr->a_vals, jv=refs; iv->bv_val != NULL; iv++ ) {
unsigned k;
return refs;
}
+
+int get_alias_dn(
+ Entry *e,
+ struct berval *ndn,
+ int *err,
+ const char **text )
+{
+ Attribute *a;
+ AttributeDescription *aliasedObjectName
+ = slap_schema.si_ad_aliasedObjectName;
+
+ a = attr_find( e->e_attrs, aliasedObjectName );
+
+ if( a == NULL ) {
+ /*
+ * there was an aliasedobjectname defined but no data.
+ */
+ *err = LDAP_ALIAS_PROBLEM;
+ *text = "alias missing aliasedObjectName attribute";
+ return -1;
+ }
+
+ /*
+ * aliasedObjectName should be SINGLE-VALUED with a single value.
+ */
+ if ( a->a_vals[0].bv_val == NULL ) {
+ /*
+ * there was an aliasedobjectname defined but no data.
+ */
+ *err = LDAP_ALIAS_PROBLEM;
+ *text = "alias missing aliasedObjectName value";
+ return -1;
+ }
+
+ if( a->a_nvals[1].bv_val != NULL ) {
+ *err = LDAP_ALIAS_PROBLEM;
+ *text = "alias has multivalued aliasedObjectName";
+ return -1;
+ }
+
+ *ndn = a->a_nvals[0];
+
+ return 0;
+}
+