/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1999-2003 The OpenLDAP Foundation.
+ * Copyright 1999-2004 The OpenLDAP Foundation.
* Portions Copyright 2001-2003 Pierangelo Masarati.
* Portions Copyright 1999-2003 Howard Chu.
* All rights reserved.
LDAPMod *mods = NULL;
Modifications *ml;
int candidate = -1, i;
- struct berval mdn = { 0, NULL };
+ struct berval mdn = BER_BVNULL;
struct berval mapped;
dncookie dc;
dc.rwmap = &li->targets[ candidate ]->rwmap;
dc.conn = op->o_conn;
dc.rs = rs;
- dc.ctx = "modifyDn";
+ dc.ctx = "modifyDN";
if ( ldap_back_dn_massage( &dc, &op->o_req_dn, &mdn ) ) {
rc = -1;
*/
if ( strcmp( ml->sml_desc->ad_type->sat_syntax->ssyn_oid,
SLAPD_DN_SYNTAX ) == 0 ) {
- ( void )ldap_dnattr_rewrite( &dc, ml->sml_bvalues );
+ ( void )ldap_dnattr_rewrite( &dc, ml->sml_values );
}
- if ( ml->sml_bvalues != NULL ){
- for (j = 0; ml->sml_bvalues[ j ].bv_val; j++);
+ if ( ml->sml_values != NULL ){
+ for (j = 0; ml->sml_values[ j ].bv_val; j++);
mods[ i ].mod_bvalues = (struct berval **)ch_malloc((j+1) *
sizeof(struct berval *));
- for (j = 0; ml->sml_bvalues[ j ].bv_val; j++)
- mods[ i ].mod_bvalues[ j ] = &ml->sml_bvalues[j];
+ for (j = 0; ml->sml_values[ j ].bv_val; j++)
+ mods[ i ].mod_bvalues[ j ] = &ml->sml_values[j];
mods[ i ].mod_bvalues[ j ] = NULL;
} else {