-/*
- * Copyright 1998-2001 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
- *
- * Copyright 2001, Pierangelo Masarati, All rights reserved. <ando@sys-net.it>
- *
- * This work has been developed to fulfill the requirements
- * of SysNet s.n.c. <http:www.sys-net.it> and it has been donated
- * to the OpenLDAP Foundation in the hope that it may be useful
- * to the Open Source community, but WITHOUT ANY WARRANTY.
- *
- * Permission is granted to anyone to use this software for any purpose
- * on any computer system, and to alter it and redistribute it, subject
- * to the following restrictions:
- *
- * 1. The author and SysNet s.n.c. are not responsible for the consequences
- * of use of this software, no matter how awful, even if they arise from
- * flaws in it.
- *
- * 2. The origin of this software must not be misrepresented, either by
- * explicit claim or by omission. Since few users ever read sources,
- * credits should appear in the documentation.
- *
- * 3. Altered versions must be plainly marked as such, and must not be
- * misrepresented as being the original software. Since few users
- * ever read sources, credits should appear in the documentation.
- * SysNet s.n.c. cannot be responsible for the consequences of the
- * alterations.
- *
- * 4. This notice may not be removed or altered.
- *
- *
- * This software is based on the backend back-ldap, implemented
- * by Howard Chu <hyc@highlandsun.com>, and modified by Mark Valence
- * <kurash@sassafras.com>, Pierangelo Masarati <ando@sys-net.it> and other
- * contributors. The contribution of the original software to the present
- * implementation is acknowledged in this copyright statement.
- *
- * A special acknowledgement goes to Howard for the overall architecture
- * (and for borrowing large pieces of code), and to Mark, who implemented
- * from scratch the attribute/objectclass mapping.
- *
- * The original copyright statement follows.
- *
- * Copyright 1999, Howard Chu, All rights reserved. <hyc@highlandsun.com>
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Permission is granted to anyone to use this software for any purpose
- * on any computer system, and to alter it and redistribute it, subject
- * to the following restrictions:
+ * Copyright 1999-2003 The OpenLDAP Foundation.
+ * Portions Copyright 2001-2003 Pierangelo Masarati.
+ * Portions Copyright 1999-2003 Howard Chu.
+ * All rights reserved.
*
- * 1. The author is not responsible for the consequences of use of this
- * software, no matter how awful, even if they arise from flaws in it.
- *
- * 2. The origin of this software must not be misrepresented, either by
- * explicit claim or by omission. Since few users ever read sources,
- * credits should appear in the documentation.
- *
- * 3. Altered versions must be plainly marked as such, and must not be
- * misrepresented as being the original software. Since few users
- * ever read sources, credits should appear in the
- * documentation.
- *
- * 4. This notice may not be removed or altered.
+ * 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>.
+ */
+/* ACKNOWLEDGEMENTS:
+ * This work was initially developed by the Howard Chu for inclusion
+ * in OpenLDAP Software and subsequently enhanced by Pierangelo
+ * Masarati.
*/
#include "portable.h"
Connection *conn,
Operation *op,
Entry *target,
- const char *e_ndn,
+ struct berval *ndn,
AttributeDescription *entry_at,
- struct berval ***vals
+ BerVarray *vals
)
{
struct metainfo *li = ( struct metainfo * )be->be_private;
int rc = 1, i, j, count, is_oc, candidate;
Attribute *attr;
- struct berval **abv, **v;
- char **vs, *mapped;
+ BerVarray abv, v;
+ char **vs;
+ struct berval mapped;
LDAPMessage *result, *e;
char *gattr[ 2 ];
LDAP *ld;
- char *me_ndn;
*vals = NULL;
- if ( target != NULL && strcmp( target->e_ndn, e_ndn ) == 0 ) {
+ if ( target != NULL && dn_match( &target->e_nname, ndn ) ) {
/* we already have a copy of the entry */
/* attribute and objectclass mapping has already been done */
attr = attr_find( target->e_attrs, entry_at );
return 1;
}
- for ( count = 0; attr->a_vals[ count ] != NULL; count++ )
+ for ( count = 0; attr->a_vals[ count ].bv_val != NULL; count++ )
;
- v = ch_calloc( ( count + 1 ), sizeof( struct berval * ) );
- if ( v != NULL ) {
- for ( j = 0, abv = attr->a_vals; --count >= 0; abv++ ) {
- if ( ( *abv )->bv_len > 0 ) {
- v[ j ] = ber_bvdup( *abv );
- if ( v[ j ] == NULL ) {
- break;
- }
+ v = ( BerVarray )ch_calloc( ( count + 1 ), sizeof( struct berval ) );
+ if ( v == NULL ) {
+ return 1;
+ }
+
+ for ( j = 0, abv = attr->a_vals; --count >= 0; abv++ ) {
+ if ( abv->bv_len > 0 ) {
+ ber_dupbv( &v[ j ], abv );
+ if ( v[ j ].bv_val == NULL ) {
+ break;
}
}
- v[ j ] = NULL;
- *vals = v;
- rc = 0;
}
+ v[ j ].bv_val = NULL;
+ *vals = v;
- return rc;
+ return 0;
} /* else */
- candidate = meta_back_select_unique_candidate( li, e_ndn );
+ candidate = meta_back_select_unique_candidate( li, ndn );
if ( candidate == -1 ) {
return 1;
}
- mapped = ldap_back_map( &li->targets[ candidate ]->at_map,
- entry_at->ad_cname->bv_val, 0 );
- if ( mapped == NULL )
+ ldap_back_map( &li->targets[ candidate ]->at_map,
+ &entry_at->ad_cname, &mapped, BACKLDAP_MAP );
+ if ( mapped.bv_val == NULL || mapped.bv_val[0] == '\0' )
return 1;
rc = ldap_initialize( &ld, li->targets[ candidate ]->uri );
return 1;
}
- rc = ldap_bind_s( ld, li->targets[ candidate ]->binddn,
- li->targets[ candidate ]->bindpw, LDAP_AUTH_SIMPLE );
+ rc = ldap_bind_s( ld, li->targets[ candidate ]->binddn.bv_val,
+ li->targets[ candidate ]->bindpw.bv_val, LDAP_AUTH_SIMPLE );
if ( rc != LDAP_SUCCESS) {
return 1;
}
- gattr[ 0 ] = mapped;
+ gattr[ 0 ] = mapped.bv_val;
gattr[ 1 ] = NULL;
- if ( ldap_search_ext_s( ld, e_ndn, LDAP_SCOPE_BASE, "(objectclass=*)",
+ if ( ldap_search_ext_s( ld, ndn->bv_val, LDAP_SCOPE_BASE,
+ "(objectClass=*)",
gattr, 0, NULL, NULL, LDAP_NO_LIMIT,
LDAP_NO_LIMIT, &result) == LDAP_SUCCESS) {
if ( ( e = ldap_first_entry( ld, result ) ) != NULL ) {
- vs = ldap_get_values( ld, e, mapped );
+ vs = ldap_get_values( ld, e, mapped.bv_val );
if ( vs != NULL ) {
for ( count = 0; vs[ count ] != NULL;
count++ ) { }
- v = ch_calloc( ( count + 1 ),
- sizeof( struct berval * ) );
+ v = ( BerVarray )ch_calloc( ( count + 1 ),
+ sizeof( struct berval ) );
if ( v == NULL ) {
ldap_value_free( vs );
} else {
- is_oc = ( strcasecmp( "objectclass", mapped ) == 0 );
+ is_oc = ( strcasecmp( "objectclass", mapped.bv_val ) == 0 );
for ( i = 0, j = 0; i < count; i++ ) {
+ ber_str2bv( vs[ i ], 0, 0, &v[ j ] );
if ( !is_oc ) {
- v[ j ] = ber_bvstr( vs[ i ] );
- if ( v[ j ] == NULL ) {
+ if ( v[ j ].bv_val == NULL ) {
ch_free( vs[ i ] );
} else {
j++;
}
} else {
- mapped = ldap_back_map( &li->targets[ candidate ]->oc_map, vs[ i ], 1 );
- if ( mapped ) {
- mapped = ch_strdup( mapped );
- if ( mapped ) {
- v[ j ] = ber_bvstr( mapped );
- if ( v[ j ] ) {
- j++;
- }
+ ldap_back_map( &li->targets[ candidate ]->oc_map, &v[ j ], &mapped, BACKLDAP_REMAP );
+ if ( mapped.bv_val && mapped.bv_val[0] != '\0' ) {
+ ber_dupbv( &v[ j ], &mapped );
+ if ( v[ j ].bv_val ) {
+ j++;
}
}
ch_free( vs[ i ] );
}
}
- v[ j ] = NULL;
+ v[ j ].bv_val = NULL;
*vals = v;
rc = 0;
ch_free( vs );
}
ldap_msgfree( result );
}
- ldap_unbind(ld);
+ ldap_unbind( ld );
return(rc);
}
projects / openldap / blobdiff