1999-09-09 03:06:24 +08:00
|
|
|
/* $OpenLDAP$ */
|
1999-08-07 07:07:46 +08:00
|
|
|
/*
|
2000-05-13 10:47:56 +08:00
|
|
|
* Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
|
1999-08-07 07:07:46 +08:00
|
|
|
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
|
|
|
|
*/
|
1998-08-09 08:43:13 +08:00
|
|
|
/*
|
|
|
|
* Copyright (c) 1995 Regents of the University of Michigan.
|
|
|
|
* All rights reserved.
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms are permitted
|
|
|
|
* provided that this notice is preserved and that due credit is given
|
|
|
|
* to the University of Michigan at Ann Arbor. The name of the University
|
|
|
|
* may not be used to endorse or promote products derived from this
|
|
|
|
* software without specific prior written permission. This software
|
|
|
|
* is provided ``as is'' without express or implied warranty.
|
|
|
|
*/
|
|
|
|
|
1998-10-25 09:41:42 +08:00
|
|
|
#include "portable.h"
|
|
|
|
|
1998-08-09 08:43:13 +08:00
|
|
|
#include <stdio.h>
|
1998-10-25 09:41:42 +08:00
|
|
|
#include <ac/string.h>
|
|
|
|
#include <ac/time.h>
|
|
|
|
#include <ac/socket.h>
|
|
|
|
|
1999-10-28 15:13:33 +08:00
|
|
|
#include "ldap_pvt.h"
|
1998-08-09 08:43:13 +08:00
|
|
|
#include "slap.h"
|
|
|
|
|
2000-02-26 03:36:07 +08:00
|
|
|
static int slap_mods2entry(
|
|
|
|
Modifications *mods,
|
|
|
|
Entry **e,
|
2000-05-22 11:46:57 +08:00
|
|
|
const char **text );
|
1998-08-09 08:43:13 +08:00
|
|
|
|
1999-07-02 05:20:45 +08:00
|
|
|
int
|
Protoized, moved extern definitions to .h files, fixed related bugs.
Most function and variable definitions are now preceded by its extern
definition, for error checking. Retyped a number of functions, usually
to return void. Fixed a number of printf format errors.
API changes (in ldap/include):
Added avl_dup_ok, avl_prefixapply, removed ber_fatten (probably typo
for ber_flatten), retyped ldap_sort_strcasecmp, grew lutil.h.
A number of `extern' declarations are left (some added by protoize), to
be cleaned away later. Mostly strdup(), strcasecmp(), mktemp(), optind,
optarg, errno.
1998-11-16 06:40:11 +08:00
|
|
|
do_add( Connection *conn, Operation *op )
|
1998-08-09 08:43:13 +08:00
|
|
|
{
|
|
|
|
BerElement *ber = op->o_ber;
|
1999-07-23 01:14:42 +08:00
|
|
|
char *dn, *ndn, *last;
|
1999-06-19 07:53:05 +08:00
|
|
|
ber_len_t len;
|
|
|
|
ber_tag_t tag;
|
1998-08-09 08:43:13 +08:00
|
|
|
Entry *e;
|
|
|
|
Backend *be;
|
2000-02-26 03:36:07 +08:00
|
|
|
LDAPModList *modlist = NULL;
|
|
|
|
LDAPModList **modtail = &modlist;
|
|
|
|
Modifications *mods = NULL;
|
2000-05-22 11:46:57 +08:00
|
|
|
const char *text;
|
1999-07-02 05:20:45 +08:00
|
|
|
int rc = LDAP_SUCCESS;
|
2000-10-21 11:29:02 +08:00
|
|
|
int manageDSAit;
|
1998-08-09 08:43:13 +08:00
|
|
|
|
2001-01-12 01:11:23 +08:00
|
|
|
#ifdef NEW_LOGGING
|
|
|
|
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
|
|
|
|
"do_add: conn %d enter\n", conn->c_connid ));
|
|
|
|
#else
|
1998-08-09 08:43:13 +08:00
|
|
|
Debug( LDAP_DEBUG_TRACE, "do_add\n", 0, 0, 0 );
|
2001-01-12 01:11:23 +08:00
|
|
|
#endif
|
1998-08-09 08:43:13 +08:00
|
|
|
/*
|
|
|
|
* Parse the add request. It looks like this:
|
|
|
|
*
|
|
|
|
* AddRequest := [APPLICATION 14] SEQUENCE {
|
|
|
|
* name DistinguishedName,
|
|
|
|
* attrs SEQUENCE OF SEQUENCE {
|
|
|
|
* type AttributeType,
|
|
|
|
* values SET OF AttributeValue
|
|
|
|
* }
|
|
|
|
* }
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* get the name */
|
1999-06-19 07:53:05 +08:00
|
|
|
if ( ber_scanf( ber, "{a", /*}*/ &dn ) == LBER_ERROR ) {
|
2001-01-12 01:11:23 +08:00
|
|
|
#ifdef NEW_LOGGING
|
|
|
|
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
|
|
|
|
"do_add: conn %d ber_scanf failed\n", conn->c_connid ));
|
|
|
|
#else
|
1999-07-01 06:43:27 +08:00
|
|
|
Debug( LDAP_DEBUG_ANY, "do_add: ber_scanf failed\n", 0, 0, 0 );
|
2001-01-12 01:11:23 +08:00
|
|
|
#endif
|
1999-07-08 02:51:39 +08:00
|
|
|
send_ldap_disconnect( conn, op,
|
|
|
|
LDAP_PROTOCOL_ERROR, "decoding error" );
|
|
|
|
return -1;
|
1998-08-09 08:43:13 +08:00
|
|
|
}
|
1998-12-04 10:20:39 +08:00
|
|
|
|
1999-09-19 09:04:38 +08:00
|
|
|
ndn = ch_strdup( dn );
|
|
|
|
|
1999-09-24 09:46:37 +08:00
|
|
|
if ( dn_normalize( ndn ) == NULL ) {
|
2001-01-12 01:11:23 +08:00
|
|
|
#ifdef NEW_LOGGING
|
|
|
|
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
|
|
|
|
"do_add: conn %d invalid dn (%s)\n", conn->c_connid, dn ));
|
|
|
|
#else
|
1999-07-23 01:14:42 +08:00
|
|
|
Debug( LDAP_DEBUG_ANY, "do_add: invalid dn (%s)\n", dn, 0, 0 );
|
2001-01-12 01:11:23 +08:00
|
|
|
#endif
|
1999-07-23 01:14:42 +08:00
|
|
|
send_ldap_result( conn, op, LDAP_INVALID_DN_SYNTAX, NULL,
|
|
|
|
"invalid DN", NULL, NULL );
|
|
|
|
free( dn );
|
1999-09-19 09:04:38 +08:00
|
|
|
free( ndn );
|
1999-07-23 01:14:42 +08:00
|
|
|
return LDAP_INVALID_DN_SYNTAX;
|
|
|
|
}
|
|
|
|
|
1998-12-04 10:20:39 +08:00
|
|
|
e = (Entry *) ch_calloc( 1, sizeof(Entry) );
|
|
|
|
|
1998-08-09 08:43:13 +08:00
|
|
|
e->e_dn = dn;
|
1999-07-23 01:14:42 +08:00
|
|
|
e->e_ndn = ndn;
|
2000-02-23 03:43:02 +08:00
|
|
|
e->e_attrs = NULL;
|
1999-02-11 02:28:25 +08:00
|
|
|
e->e_private = NULL;
|
|
|
|
|
2001-01-12 01:11:23 +08:00
|
|
|
#ifdef NEW_LOGGING
|
|
|
|
LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
|
|
|
|
"do_add: conn %d ndn (%s)\n", conn->c_connid, e->e_ndn ));
|
|
|
|
#else
|
2000-06-15 05:11:56 +08:00
|
|
|
Debug( LDAP_DEBUG_ARGS, "do_add: ndn (%s)\n", e->e_ndn, 0, 0 );
|
2001-01-12 01:11:23 +08:00
|
|
|
#endif
|
1998-08-09 08:43:13 +08:00
|
|
|
|
|
|
|
/* get the attrs */
|
|
|
|
for ( tag = ber_first_element( ber, &len, &last ); tag != LBER_DEFAULT;
|
2000-05-23 09:21:47 +08:00
|
|
|
tag = ber_next_element( ber, &len, last ) )
|
|
|
|
{
|
2000-02-26 03:36:07 +08:00
|
|
|
LDAPModList *mod = (LDAPModList *) ch_malloc( sizeof(LDAPModList) );
|
|
|
|
mod->ml_op = LDAP_MOD_ADD;
|
|
|
|
mod->ml_next = NULL;
|
|
|
|
|
|
|
|
rc = ber_scanf( ber, "{a{V}}", &mod->ml_type, &mod->ml_bvalues );
|
1998-08-09 08:43:13 +08:00
|
|
|
|
2000-02-26 03:36:07 +08:00
|
|
|
if ( rc == LBER_ERROR ) {
|
2001-01-12 01:11:23 +08:00
|
|
|
#ifdef NEW_LOGGING
|
|
|
|
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
|
|
|
|
"do_add: conn %d decoding error \n", conn->c_connid ));
|
|
|
|
#else
|
2000-05-24 01:00:46 +08:00
|
|
|
Debug( LDAP_DEBUG_ANY, "do_add: decoding error\n", 0, 0, 0 );
|
2001-01-12 01:11:23 +08:00
|
|
|
#endif
|
1999-07-08 02:51:39 +08:00
|
|
|
send_ldap_disconnect( conn, op,
|
|
|
|
LDAP_PROTOCOL_ERROR, "decoding error" );
|
2000-02-23 03:43:02 +08:00
|
|
|
rc = -1;
|
2000-02-26 03:36:07 +08:00
|
|
|
free( mod );
|
2000-02-23 03:43:02 +08:00
|
|
|
goto done;
|
1998-08-09 08:43:13 +08:00
|
|
|
}
|
|
|
|
|
2000-02-26 03:36:07 +08:00
|
|
|
if ( mod->ml_bvalues == NULL ) {
|
2001-01-12 01:11:23 +08:00
|
|
|
#ifdef NEW_LOGGING
|
|
|
|
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
|
|
|
|
"do_add: conn %d no values for type %s\n",
|
|
|
|
conn->c_connid, mod->ml_type ));
|
|
|
|
#else
|
2000-02-26 03:36:07 +08:00
|
|
|
Debug( LDAP_DEBUG_ANY, "no values for type %s\n",
|
|
|
|
mod->ml_type, 0, 0 );
|
2001-01-12 01:11:23 +08:00
|
|
|
#endif
|
2000-02-23 03:43:02 +08:00
|
|
|
send_ldap_result( conn, op, rc = LDAP_PROTOCOL_ERROR,
|
2000-04-25 21:18:59 +08:00
|
|
|
NULL, "no values for attribute type", NULL, NULL );
|
2000-02-26 03:36:07 +08:00
|
|
|
free( mod->ml_type );
|
|
|
|
free( mod );
|
2000-02-23 03:43:02 +08:00
|
|
|
goto done;
|
1998-08-09 08:43:13 +08:00
|
|
|
}
|
|
|
|
|
2000-05-23 09:21:47 +08:00
|
|
|
*modtail = mod;
|
2000-02-26 03:36:07 +08:00
|
|
|
modtail = &mod->ml_next;
|
1998-08-09 08:43:13 +08:00
|
|
|
}
|
|
|
|
|
1999-07-01 06:43:27 +08:00
|
|
|
if ( ber_scanf( ber, /*{*/ "}") == LBER_ERROR ) {
|
2001-01-12 01:11:23 +08:00
|
|
|
#ifdef NEW_LOGGING
|
|
|
|
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
|
|
|
|
"do_add: conn %d ber_scanf failed\n", conn->c_connid ));
|
|
|
|
#else
|
1999-07-01 06:43:27 +08:00
|
|
|
Debug( LDAP_DEBUG_ANY, "do_add: ber_scanf failed\n", 0, 0, 0 );
|
2001-01-12 01:11:23 +08:00
|
|
|
#endif
|
1999-07-08 02:51:39 +08:00
|
|
|
send_ldap_disconnect( conn, op,
|
|
|
|
LDAP_PROTOCOL_ERROR, "decoding error" );
|
2000-02-23 03:43:02 +08:00
|
|
|
rc = -1;
|
|
|
|
goto done;
|
1999-07-01 06:43:27 +08:00
|
|
|
}
|
|
|
|
|
1999-07-02 05:20:45 +08:00
|
|
|
if( (rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) {
|
2001-01-12 01:11:23 +08:00
|
|
|
#ifdef NEW_LOGGING
|
|
|
|
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
|
|
|
|
"do_add: conn %d get_ctrls failed\n", conn->c_connid ));
|
|
|
|
#else
|
1999-07-01 06:43:27 +08:00
|
|
|
Debug( LDAP_DEBUG_ANY, "do_add: get_ctrls failed\n", 0, 0, 0 );
|
2001-01-12 01:11:23 +08:00
|
|
|
#endif
|
2000-02-23 03:43:02 +08:00
|
|
|
goto done;
|
1999-07-01 06:43:27 +08:00
|
|
|
}
|
|
|
|
|
2000-06-16 09:19:30 +08:00
|
|
|
if ( modlist == NULL ) {
|
2000-02-26 03:36:07 +08:00
|
|
|
send_ldap_result( conn, op, rc = LDAP_PROTOCOL_ERROR,
|
2000-04-25 21:18:59 +08:00
|
|
|
NULL, "no attributes provided", NULL, NULL );
|
2000-02-26 03:36:07 +08:00
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
1999-08-07 13:36:48 +08:00
|
|
|
Statslog( LDAP_DEBUG_STATS, "conn=%ld op=%d ADD dn=\"%s\"\n",
|
1999-07-17 06:24:32 +08:00
|
|
|
op->o_connid, op->o_opid, e->e_ndn, 0, 0 );
|
1998-08-09 08:43:13 +08:00
|
|
|
|
2000-09-08 13:20:46 +08:00
|
|
|
if( e->e_ndn == NULL || *e->e_ndn == '\0' ) {
|
|
|
|
/* protocolError may be a more appropriate error */
|
|
|
|
send_ldap_result( conn, op, rc = LDAP_ALREADY_EXISTS,
|
|
|
|
NULL, "root DSE exists", NULL, NULL );
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
2000-10-21 11:29:02 +08:00
|
|
|
manageDSAit = get_manageDSAit( op ) &&
|
|
|
|
is_entry_referral( e );
|
|
|
|
|
1998-08-09 08:43:13 +08:00
|
|
|
/*
|
|
|
|
* We could be serving multiple database backends. Select the
|
|
|
|
* appropriate one, or send a referral to our "referral server"
|
|
|
|
* if we don't hold it.
|
|
|
|
*/
|
2000-10-21 11:29:02 +08:00
|
|
|
be = select_backend( e->e_ndn, manageDSAit );
|
1998-12-27 11:55:57 +08:00
|
|
|
if ( be == NULL ) {
|
2000-02-26 03:36:07 +08:00
|
|
|
send_ldap_result( conn, op, rc = LDAP_REFERRAL,
|
|
|
|
NULL, NULL, default_referral, NULL );
|
2000-02-23 03:43:02 +08:00
|
|
|
goto done;
|
1998-08-09 08:43:13 +08:00
|
|
|
}
|
|
|
|
|
2000-08-29 02:38:48 +08:00
|
|
|
/* check restrictions */
|
|
|
|
rc = backend_check_restrictions( be, conn, op, NULL, &text ) ;
|
1999-12-08 12:37:59 +08:00
|
|
|
if( rc != LDAP_SUCCESS ) {
|
|
|
|
send_ldap_result( conn, op, rc,
|
2000-03-04 06:37:06 +08:00
|
|
|
NULL, text, NULL, NULL );
|
2000-02-23 03:43:02 +08:00
|
|
|
goto done;
|
1999-12-08 12:37:59 +08:00
|
|
|
}
|
|
|
|
|
2000-06-16 09:19:30 +08:00
|
|
|
/* check for referrals */
|
2000-06-16 12:07:57 +08:00
|
|
|
rc = backend_check_referrals( be, conn, op, e->e_dn, e->e_ndn );
|
2000-06-16 09:19:30 +08:00
|
|
|
if ( rc != LDAP_SUCCESS ) {
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
1998-08-09 08:43:13 +08:00
|
|
|
/*
|
|
|
|
* do the add if 1 && (2 || 3)
|
|
|
|
* 1) there is an add function implemented in this backend;
|
|
|
|
* 2) this backend is master for what it holds;
|
|
|
|
* 3) it's a replica and the dn supplied is the updatedn.
|
|
|
|
*/
|
1999-03-04 02:49:59 +08:00
|
|
|
if ( be->be_add ) {
|
1998-08-09 08:43:13 +08:00
|
|
|
/* do the update here */
|
1999-08-04 06:15:19 +08:00
|
|
|
#ifdef SLAPD_MULTIMASTER
|
|
|
|
if ( (be->be_lastmod == ON || (be->be_lastmod == UNDEFINED &&
|
|
|
|
global_lastmod == ON)) && (be->be_update_ndn == NULL ||
|
|
|
|
strcmp( be->be_update_ndn, op->o_ndn )) )
|
|
|
|
#else
|
1999-01-19 13:10:50 +08:00
|
|
|
if ( be->be_update_ndn == NULL ||
|
|
|
|
strcmp( be->be_update_ndn, op->o_ndn ) == 0 )
|
1999-08-04 06:15:19 +08:00
|
|
|
#endif
|
1999-01-19 13:10:50 +08:00
|
|
|
{
|
2000-02-26 03:36:07 +08:00
|
|
|
int update = be->be_update_ndn != NULL;
|
|
|
|
|
|
|
|
rc = slap_modlist2mods( modlist, update, &mods, &text );
|
|
|
|
if( rc != LDAP_SUCCESS ) {
|
|
|
|
send_ldap_result( conn, op, rc,
|
|
|
|
NULL, text, NULL, NULL );
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
1999-08-04 06:15:19 +08:00
|
|
|
#ifndef SLAPD_MULTIMASTER
|
1998-08-19 09:30:57 +08:00
|
|
|
if ( (be->be_lastmod == ON || (be->be_lastmod == UNDEFINED &&
|
2000-02-26 03:36:07 +08:00
|
|
|
global_lastmod == ON)) && !update )
|
1999-08-04 06:15:19 +08:00
|
|
|
#endif
|
1999-07-28 04:00:31 +08:00
|
|
|
{
|
2000-05-24 02:08:19 +08:00
|
|
|
Modifications **modstail;
|
|
|
|
for( modstail = &mods;
|
|
|
|
*modstail != NULL;
|
|
|
|
modstail = &(*modstail)->sml_next )
|
|
|
|
{
|
|
|
|
assert( (*modstail)->sml_op == LDAP_MOD_ADD );
|
|
|
|
assert( (*modstail)->sml_desc != NULL );
|
|
|
|
}
|
|
|
|
rc = slap_mods_opattrs( op, modstail, &text );
|
1999-07-28 04:00:31 +08:00
|
|
|
if( rc != LDAP_SUCCESS ) {
|
|
|
|
send_ldap_result( conn, op, rc,
|
2000-03-04 06:37:06 +08:00
|
|
|
NULL, text, NULL, NULL );
|
2000-02-23 03:43:02 +08:00
|
|
|
goto done;
|
1999-07-28 04:00:31 +08:00
|
|
|
}
|
1998-08-09 08:43:13 +08:00
|
|
|
}
|
1999-07-28 04:00:31 +08:00
|
|
|
|
2000-02-26 03:36:07 +08:00
|
|
|
rc = slap_mods2entry( mods, &e, &text );
|
|
|
|
if( rc != LDAP_SUCCESS ) {
|
|
|
|
send_ldap_result( conn, op, rc,
|
|
|
|
NULL, text, NULL, NULL );
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
1998-08-09 08:43:13 +08:00
|
|
|
if ( (*be->be_add)( be, conn, op, e ) == 0 ) {
|
1999-08-04 06:15:19 +08:00
|
|
|
#ifdef SLAPD_MULTIMASTER
|
|
|
|
if (be->be_update_ndn == NULL ||
|
|
|
|
strcmp( be->be_update_ndn, op->o_ndn ))
|
|
|
|
#endif
|
|
|
|
{
|
|
|
|
replog( be, op, e->e_dn, e );
|
|
|
|
}
|
2000-09-29 13:25:44 +08:00
|
|
|
be_entry_release_w( be, conn, op, e );
|
2000-05-11 00:36:46 +08:00
|
|
|
e = NULL;
|
1998-08-09 08:43:13 +08:00
|
|
|
}
|
1998-08-19 09:30:57 +08:00
|
|
|
|
1999-08-04 06:15:19 +08:00
|
|
|
#ifndef SLAPD_MULTIMASTER
|
1998-08-09 08:43:13 +08:00
|
|
|
} else {
|
1999-07-16 10:45:46 +08:00
|
|
|
send_ldap_result( conn, op, rc = LDAP_REFERRAL, NULL, NULL,
|
|
|
|
be->be_update_refs ? be->be_update_refs : default_referral, NULL );
|
1999-08-04 06:15:19 +08:00
|
|
|
#endif
|
1998-08-09 08:43:13 +08:00
|
|
|
}
|
|
|
|
} else {
|
2001-01-12 01:11:23 +08:00
|
|
|
#ifdef NEW_LOGGING
|
|
|
|
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
|
|
|
|
"do_add: conn %d no backend support\n", conn->c_connid ));
|
|
|
|
#else
|
2000-05-24 01:00:46 +08:00
|
|
|
Debug( LDAP_DEBUG_ARGS, " do_add: no backend support\n", 0, 0, 0 );
|
2001-01-12 01:11:23 +08:00
|
|
|
#endif
|
|
|
|
send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
|
|
|
|
NULL, "operation not supported within namingContext", NULL, NULL );
|
1998-08-09 08:43:13 +08:00
|
|
|
}
|
1999-07-02 05:20:45 +08:00
|
|
|
|
2000-02-23 03:43:02 +08:00
|
|
|
done:
|
2000-02-26 03:36:07 +08:00
|
|
|
if( modlist != NULL ) {
|
|
|
|
slap_modlist_free( modlist );
|
|
|
|
}
|
|
|
|
if( mods != NULL ) {
|
|
|
|
slap_mods_free( mods );
|
|
|
|
}
|
|
|
|
if( e != NULL ) {
|
2000-02-23 03:43:02 +08:00
|
|
|
entry_free( e );
|
|
|
|
}
|
|
|
|
|
1999-07-02 05:20:45 +08:00
|
|
|
return rc;
|
1998-08-09 08:43:13 +08:00
|
|
|
}
|
|
|
|
|
2000-02-26 03:36:07 +08:00
|
|
|
static int slap_mods2entry(
|
|
|
|
Modifications *mods,
|
|
|
|
Entry **e,
|
2000-05-22 11:46:57 +08:00
|
|
|
const char **text )
|
2000-02-26 03:36:07 +08:00
|
|
|
{
|
2000-02-29 05:16:05 +08:00
|
|
|
Attribute **tail = &(*e)->e_attrs;
|
|
|
|
assert( *tail == NULL );
|
|
|
|
|
|
|
|
for( ; mods != NULL; mods = mods->sml_next ) {
|
|
|
|
Attribute *attr;
|
|
|
|
|
|
|
|
assert( mods->sml_op == LDAP_MOD_ADD );
|
2000-05-24 02:08:19 +08:00
|
|
|
assert( mods->sml_desc != NULL );
|
2000-02-29 05:16:05 +08:00
|
|
|
|
|
|
|
attr = attr_find( (*e)->e_attrs, mods->sml_desc );
|
|
|
|
|
|
|
|
if( attr != NULL ) {
|
2000-06-26 04:07:40 +08:00
|
|
|
#define SLURPD_FRIENDLY
|
|
|
|
#ifdef SLURPD_FRIENDLY
|
|
|
|
ber_len_t i,j;
|
|
|
|
|
|
|
|
for( i=0; attr->a_vals[i]; i++ ) {
|
|
|
|
/* count them */
|
|
|
|
}
|
|
|
|
for( j=0; mods->sml_bvalues[j]; j++ ) {
|
|
|
|
/* count them */
|
|
|
|
}
|
|
|
|
j++; /* NULL */
|
|
|
|
|
|
|
|
attr->a_vals = ch_realloc( attr->a_vals,
|
|
|
|
sizeof( struct berval * ) * (i+j) );
|
|
|
|
|
|
|
|
/* should check for duplicates */
|
2000-07-28 09:07:07 +08:00
|
|
|
AC_MEMCPY( &attr->a_vals[i], mods->sml_bvalues,
|
2000-06-26 04:07:40 +08:00
|
|
|
sizeof( struct berval * ) * j );
|
|
|
|
|
|
|
|
/* trim the mods array */
|
|
|
|
ch_free( mods->sml_bvalues );
|
|
|
|
mods->sml_bvalues = NULL;
|
|
|
|
|
|
|
|
continue;
|
|
|
|
#else
|
2000-05-24 01:00:46 +08:00
|
|
|
*text = "attribute provided more than once";
|
2000-06-26 04:07:40 +08:00
|
|
|
return LDAP_TYPE_OR_VALUE_EXISTS;
|
|
|
|
#endif
|
2000-02-29 05:16:05 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
attr = ch_calloc( 1, sizeof(Attribute) );
|
|
|
|
|
2000-05-24 02:08:19 +08:00
|
|
|
/* move ad to attr structure */
|
|
|
|
attr->a_desc = mods->sml_desc;
|
|
|
|
mods->sml_desc = NULL;
|
|
|
|
|
|
|
|
/* move values to attr structure */
|
|
|
|
/* should check for duplicates */
|
2000-02-29 05:16:05 +08:00
|
|
|
attr->a_vals = mods->sml_bvalues;
|
|
|
|
mods->sml_bvalues = NULL;
|
|
|
|
|
|
|
|
*tail = attr;
|
|
|
|
tail = &attr->a_next;
|
|
|
|
}
|
|
|
|
|
|
|
|
return LDAP_SUCCESS;
|
2000-02-26 03:36:07 +08:00
|
|
|
}
|
|
|
|
|