2000-02-05 13:01:41 +08:00
|
|
|
/* $OpenLDAP$ */
|
|
|
|
/*
|
2002-01-05 05:17:25 +08:00
|
|
|
* Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
|
2000-02-05 13:01:41 +08:00
|
|
|
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
|
|
|
|
*/
|
2000-02-07 05:09:44 +08:00
|
|
|
/* at.c - routines for dealing with attribute types */
|
2000-02-05 13:01:41 +08:00
|
|
|
|
|
|
|
#include "portable.h"
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
|
|
|
#include <ac/ctype.h>
|
|
|
|
#include <ac/errno.h>
|
|
|
|
#include <ac/socket.h>
|
|
|
|
#include <ac/string.h>
|
|
|
|
#include <ac/time.h>
|
|
|
|
|
|
|
|
#include "ldap_pvt.h"
|
|
|
|
#include "slap.h"
|
|
|
|
|
|
|
|
|
2000-05-29 03:15:37 +08:00
|
|
|
int is_at_syntax(
|
|
|
|
AttributeType *at,
|
|
|
|
const char *oid )
|
|
|
|
{
|
|
|
|
for( ; at != NULL; at = at->sat_sup ) {
|
|
|
|
if( at->sat_syntax_oid ) {
|
|
|
|
return ( strcmp( at->sat_syntax_oid, oid ) == 0 );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2000-02-26 03:36:07 +08:00
|
|
|
int is_at_subtype(
|
|
|
|
AttributeType *sub,
|
|
|
|
AttributeType *sup )
|
|
|
|
{
|
|
|
|
for( ; sub != NULL; sub = sub->sat_sup ) {
|
|
|
|
if( sub == sup ) return 1;
|
|
|
|
}
|
2000-02-05 13:01:41 +08:00
|
|
|
|
2000-02-26 03:36:07 +08:00
|
|
|
return 0;
|
|
|
|
}
|
2000-02-05 13:01:41 +08:00
|
|
|
|
|
|
|
struct aindexrec {
|
2001-12-28 19:45:25 +08:00
|
|
|
struct berval air_name;
|
2000-02-05 13:01:41 +08:00
|
|
|
AttributeType *air_at;
|
|
|
|
};
|
|
|
|
|
|
|
|
static Avlnode *attr_index = NULL;
|
|
|
|
static AttributeType *attr_list = NULL;
|
|
|
|
|
|
|
|
static int
|
|
|
|
attr_index_cmp(
|
|
|
|
struct aindexrec *air1,
|
|
|
|
struct aindexrec *air2
|
|
|
|
)
|
|
|
|
{
|
2001-12-28 19:45:25 +08:00
|
|
|
int i = air1->air_name.bv_len - air2->air_name.bv_len;
|
|
|
|
if (i)
|
|
|
|
return i;
|
|
|
|
return (strcasecmp( air1->air_name.bv_val, air2->air_name.bv_val ));
|
2000-02-05 13:01:41 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
attr_index_name_cmp(
|
2001-12-26 12:17:49 +08:00
|
|
|
struct berval *type,
|
|
|
|
struct aindexrec *air
|
|
|
|
)
|
|
|
|
{
|
2001-12-28 19:45:25 +08:00
|
|
|
int i = type->bv_len - air->air_name.bv_len;
|
|
|
|
if (i)
|
|
|
|
return i;
|
|
|
|
return (strncasecmp( type->bv_val, air->air_name.bv_val,
|
|
|
|
type->bv_len ));
|
2001-12-26 12:17:49 +08:00
|
|
|
}
|
|
|
|
|
2000-02-05 13:01:41 +08:00
|
|
|
AttributeType *
|
|
|
|
at_find(
|
|
|
|
const char *name
|
|
|
|
)
|
|
|
|
{
|
2001-12-28 19:45:25 +08:00
|
|
|
struct berval bv;
|
2000-02-05 13:01:41 +08:00
|
|
|
|
2001-12-28 19:45:25 +08:00
|
|
|
bv.bv_val = (char *)name;
|
|
|
|
bv.bv_len = strlen( name );
|
2000-02-05 13:01:41 +08:00
|
|
|
|
2001-12-28 19:45:25 +08:00
|
|
|
return at_bvfind( &bv );
|
2000-02-05 13:01:41 +08:00
|
|
|
}
|
2001-12-26 12:17:49 +08:00
|
|
|
|
|
|
|
AttributeType *
|
|
|
|
at_bvfind(
|
|
|
|
struct berval *name
|
|
|
|
)
|
|
|
|
{
|
|
|
|
struct aindexrec *air;
|
|
|
|
|
|
|
|
air = (struct aindexrec *) avl_find( attr_index, name,
|
2001-12-28 19:45:25 +08:00
|
|
|
(AVL_CMP) attr_index_name_cmp );
|
2001-12-26 12:17:49 +08:00
|
|
|
|
|
|
|
return air != NULL ? air->air_at : NULL;
|
|
|
|
}
|
2000-02-05 13:01:41 +08:00
|
|
|
|
|
|
|
int
|
|
|
|
at_append_to_list(
|
|
|
|
AttributeType *sat,
|
|
|
|
AttributeType ***listp
|
|
|
|
)
|
|
|
|
{
|
|
|
|
AttributeType **list;
|
|
|
|
AttributeType **list1;
|
|
|
|
int size;
|
|
|
|
|
|
|
|
list = *listp;
|
|
|
|
if ( !list ) {
|
|
|
|
size = 2;
|
2001-09-27 07:42:53 +08:00
|
|
|
list = ch_calloc(size, sizeof(AttributeType *));
|
2000-02-05 13:01:41 +08:00
|
|
|
if ( !list ) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
size = 0;
|
|
|
|
list1 = *listp;
|
|
|
|
while ( *list1 ) {
|
|
|
|
size++;
|
|
|
|
list1++;
|
|
|
|
}
|
|
|
|
size += 2;
|
2001-09-27 07:42:53 +08:00
|
|
|
list1 = ch_realloc(list, size*sizeof(AttributeType *));
|
2000-02-05 13:01:41 +08:00
|
|
|
if ( !list1 ) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
list = list1;
|
|
|
|
}
|
|
|
|
list[size-2] = sat;
|
|
|
|
list[size-1] = NULL;
|
|
|
|
*listp = list;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
at_delete_from_list(
|
|
|
|
int pos,
|
|
|
|
AttributeType ***listp
|
|
|
|
)
|
|
|
|
{
|
|
|
|
AttributeType **list;
|
|
|
|
AttributeType **list1;
|
|
|
|
int i;
|
|
|
|
int j;
|
|
|
|
|
|
|
|
if ( pos < 0 ) {
|
|
|
|
return -2;
|
|
|
|
}
|
|
|
|
list = *listp;
|
|
|
|
for ( i=0; list[i]; i++ )
|
|
|
|
;
|
|
|
|
if ( pos >= i ) {
|
|
|
|
return -2;
|
|
|
|
}
|
|
|
|
for ( i=pos, j=pos+1; list[j]; i++, j++ ) {
|
|
|
|
list[i] = list[j];
|
|
|
|
}
|
|
|
|
list[i] = NULL;
|
|
|
|
/* Tell the runtime this can be shrinked */
|
2001-09-27 07:42:53 +08:00
|
|
|
list1 = ch_realloc(list, (i+1)*sizeof(AttributeType **));
|
2000-02-05 13:01:41 +08:00
|
|
|
if ( !list1 ) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
*listp = list1;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
at_find_in_list(
|
|
|
|
AttributeType *sat,
|
|
|
|
AttributeType **list
|
|
|
|
)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if ( !list ) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
for ( i=0; list[i]; i++ ) {
|
|
|
|
if ( sat == list[i] ) {
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2001-11-07 09:03:49 +08:00
|
|
|
void
|
|
|
|
at_destroy( void )
|
|
|
|
{
|
|
|
|
AttributeType *a, *n;
|
|
|
|
avl_free(attr_index, ldap_memfree);
|
|
|
|
|
|
|
|
for (a=attr_list; a; a=n) {
|
|
|
|
n = a->sat_next;
|
2001-12-31 14:44:36 +08:00
|
|
|
if (a->sat_subtypes) ldap_memfree(a->sat_subtypes);
|
2001-11-07 09:03:49 +08:00
|
|
|
ad_destroy(a->sat_ad);
|
2001-11-16 15:39:14 +08:00
|
|
|
ldap_pvt_thread_mutex_destroy(&a->sat_ad_mutex);
|
2001-11-07 09:03:49 +08:00
|
|
|
ldap_attributetype_free((LDAPAttributeType *)a);
|
|
|
|
}
|
2002-01-05 19:41:03 +08:00
|
|
|
if ( slap_schema.si_at_undefined )
|
|
|
|
ad_destroy(slap_schema.si_at_undefined->sat_ad);
|
2001-11-07 09:03:49 +08:00
|
|
|
}
|
|
|
|
|
2000-02-05 13:01:41 +08:00
|
|
|
static int
|
|
|
|
at_insert(
|
|
|
|
AttributeType *sat,
|
|
|
|
const char **err
|
|
|
|
)
|
|
|
|
{
|
|
|
|
AttributeType **atp;
|
|
|
|
struct aindexrec *air;
|
|
|
|
char **names;
|
|
|
|
|
|
|
|
atp = &attr_list;
|
|
|
|
while ( *atp != NULL ) {
|
|
|
|
atp = &(*atp)->sat_next;
|
|
|
|
}
|
|
|
|
*atp = sat;
|
|
|
|
|
|
|
|
if ( sat->sat_oid ) {
|
|
|
|
air = (struct aindexrec *)
|
|
|
|
ch_calloc( 1, sizeof(struct aindexrec) );
|
2001-12-28 19:45:25 +08:00
|
|
|
air->air_name.bv_val = sat->sat_oid;
|
|
|
|
air->air_name.bv_len = strlen(sat->sat_oid);
|
2000-02-05 13:01:41 +08:00
|
|
|
air->air_at = sat;
|
|
|
|
if ( avl_insert( &attr_index, (caddr_t) air,
|
|
|
|
(AVL_CMP) attr_index_cmp,
|
|
|
|
(AVL_DUP) avl_dup_error ) ) {
|
|
|
|
*err = sat->sat_oid;
|
|
|
|
ldap_memfree(air);
|
|
|
|
return SLAP_SCHERR_DUP_ATTR;
|
|
|
|
}
|
|
|
|
/* FIX: temporal consistency check */
|
2001-12-28 19:45:25 +08:00
|
|
|
at_bvfind(&air->air_name);
|
2000-02-05 13:01:41 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
if ( (names = sat->sat_names) ) {
|
|
|
|
while ( *names ) {
|
|
|
|
air = (struct aindexrec *)
|
|
|
|
ch_calloc( 1, sizeof(struct aindexrec) );
|
2001-12-28 19:45:25 +08:00
|
|
|
air->air_name.bv_val = *names;
|
|
|
|
air->air_name.bv_len = strlen(*names);
|
2000-02-05 13:01:41 +08:00
|
|
|
air->air_at = sat;
|
|
|
|
if ( avl_insert( &attr_index, (caddr_t) air,
|
|
|
|
(AVL_CMP) attr_index_cmp,
|
|
|
|
(AVL_DUP) avl_dup_error ) ) {
|
|
|
|
*err = *names;
|
|
|
|
ldap_memfree(air);
|
|
|
|
return SLAP_SCHERR_DUP_ATTR;
|
|
|
|
}
|
|
|
|
/* FIX: temporal consistency check */
|
2001-12-28 19:45:25 +08:00
|
|
|
at_bvfind(&air->air_name);
|
2000-02-05 13:01:41 +08:00
|
|
|
names++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int
|
|
|
|
at_add(
|
2000-07-23 01:30:44 +08:00
|
|
|
LDAPAttributeType *at,
|
2000-02-05 13:01:41 +08:00
|
|
|
const char **err
|
|
|
|
)
|
|
|
|
{
|
|
|
|
AttributeType *sat;
|
|
|
|
MatchingRule *mr;
|
|
|
|
Syntax *syn;
|
|
|
|
int code;
|
2002-01-10 09:46:08 +08:00
|
|
|
char *cname;
|
|
|
|
char *oid;
|
|
|
|
|
|
|
|
if ( !OID_LEADCHAR( at->at_oid[0] )) {
|
|
|
|
/* Expand OID macros */
|
|
|
|
oid = oidm_find( at->at_oid );
|
|
|
|
if ( !oid ) {
|
|
|
|
*err = at->at_oid;
|
|
|
|
return SLAP_SCHERR_OIDM;
|
|
|
|
}
|
|
|
|
if ( oid != at->at_oid ) {
|
|
|
|
ldap_memfree( at->at_oid );
|
|
|
|
at->at_oid = oid;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( at->at_syntax_oid && !OID_LEADCHAR( at->at_syntax_oid[0] )) {
|
|
|
|
/* Expand OID macros */
|
|
|
|
oid = oidm_find( at->at_syntax_oid );
|
|
|
|
if ( !oid ) {
|
|
|
|
*err = at->at_syntax_oid;
|
|
|
|
return SLAP_SCHERR_OIDM;
|
|
|
|
}
|
|
|
|
if ( oid != at->at_syntax_oid ) {
|
|
|
|
ldap_memfree( at->at_syntax_oid );
|
|
|
|
at->at_syntax_oid = oid;
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
2000-02-05 13:01:41 +08:00
|
|
|
|
|
|
|
if ( at->at_names && at->at_names[0] ) {
|
2001-06-08 06:47:02 +08:00
|
|
|
int i;
|
|
|
|
|
|
|
|
for( i=0; at->at_names[i]; i++ ) {
|
|
|
|
if( !slap_valid_descr( at->at_names[i] ) ) {
|
2002-01-09 04:22:41 +08:00
|
|
|
*err = at->at_names[i];
|
2001-06-08 06:47:02 +08:00
|
|
|
return SLAP_SCHERR_BAD_DESCR;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2000-02-05 13:01:41 +08:00
|
|
|
cname = at->at_names[0];
|
2001-06-08 06:47:02 +08:00
|
|
|
|
2000-02-05 13:01:41 +08:00
|
|
|
} else if ( at->at_oid ) {
|
|
|
|
cname = at->at_oid;
|
2002-01-09 04:22:41 +08:00
|
|
|
|
2000-02-05 13:01:41 +08:00
|
|
|
} else {
|
2002-01-09 04:22:41 +08:00
|
|
|
*err = "";
|
2000-02-05 13:01:41 +08:00
|
|
|
return SLAP_SCHERR_ATTR_INCOMPLETE;
|
|
|
|
}
|
2001-05-17 15:31:59 +08:00
|
|
|
|
2002-01-09 04:22:41 +08:00
|
|
|
*err = cname;
|
|
|
|
|
|
|
|
if ( !at->at_usage && at->at_no_user_mod ) {
|
|
|
|
/* user attribute must be modifable */
|
|
|
|
return SLAP_SCHERR_ATTR_BAD_USAGE;
|
|
|
|
}
|
|
|
|
|
2001-05-17 15:31:59 +08:00
|
|
|
if ( at->at_collective ) {
|
2002-01-09 04:22:41 +08:00
|
|
|
if( at->at_usage ) {
|
|
|
|
/* collective attributes cannot be operational */
|
2002-02-22 03:29:32 +08:00
|
|
|
return SLAP_SCHERR_ATTR_BAD_USAGE;
|
2002-01-09 04:22:41 +08:00
|
|
|
}
|
2002-01-12 04:28:05 +08:00
|
|
|
|
2002-01-09 04:22:41 +08:00
|
|
|
if( at->at_single_value ) {
|
|
|
|
/* collective attributes cannot be single-valued */
|
2002-02-22 03:29:32 +08:00
|
|
|
return SLAP_SCHERR_ATTR_BAD_USAGE;
|
2002-01-09 04:22:41 +08:00
|
|
|
}
|
2001-05-17 15:31:59 +08:00
|
|
|
}
|
|
|
|
|
2000-02-05 13:01:41 +08:00
|
|
|
sat = (AttributeType *) ch_calloc( 1, sizeof(AttributeType) );
|
2000-07-28 09:07:07 +08:00
|
|
|
AC_MEMCPY( &sat->sat_atype, at, sizeof(LDAPAttributeType));
|
2000-02-05 13:01:41 +08:00
|
|
|
|
2001-11-16 15:45:37 +08:00
|
|
|
sat->sat_cname.bv_val = cname;
|
|
|
|
sat->sat_cname.bv_len = strlen( cname );
|
2001-11-16 15:39:14 +08:00
|
|
|
ldap_pvt_thread_mutex_init(&sat->sat_ad_mutex);
|
2000-02-05 13:01:41 +08:00
|
|
|
|
|
|
|
if ( at->at_sup_oid ) {
|
|
|
|
AttributeType *supsat = at_find(at->at_sup_oid);
|
|
|
|
|
|
|
|
if ( (supsat == NULL ) ) {
|
|
|
|
*err = at->at_sup_oid;
|
|
|
|
return SLAP_SCHERR_ATTR_NOT_FOUND;
|
|
|
|
}
|
|
|
|
|
|
|
|
sat->sat_sup = supsat;
|
|
|
|
|
|
|
|
if ( at_append_to_list(sat, &supsat->sat_subtypes) ) {
|
|
|
|
return SLAP_SCHERR_OUTOFMEM;
|
|
|
|
}
|
2002-01-09 04:22:41 +08:00
|
|
|
|
|
|
|
if ( sat->sat_usage != supsat->sat_usage ) {
|
|
|
|
/* subtypes must have same usage as their SUP */
|
|
|
|
return SLAP_SCHERR_ATTR_BAD_USAGE;
|
|
|
|
}
|
2000-02-05 13:01:41 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Inherit definitions from superiors. We only check the
|
|
|
|
* direct superior since that one has already inherited from
|
|
|
|
* its own superiorss
|
|
|
|
*/
|
|
|
|
if ( sat->sat_sup ) {
|
|
|
|
sat->sat_syntax = sat->sat_sup->sat_syntax;
|
|
|
|
sat->sat_equality = sat->sat_sup->sat_equality;
|
2000-11-03 05:49:03 +08:00
|
|
|
sat->sat_approx = sat->sat_sup->sat_approx;
|
2000-02-05 13:01:41 +08:00
|
|
|
sat->sat_ordering = sat->sat_sup->sat_ordering;
|
|
|
|
sat->sat_substr = sat->sat_sup->sat_substr;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( at->at_syntax_oid ) {
|
|
|
|
if ( (syn = syn_find(sat->sat_syntax_oid)) ) {
|
|
|
|
sat->sat_syntax = syn;
|
|
|
|
} else {
|
|
|
|
*err = sat->sat_syntax_oid;
|
|
|
|
return SLAP_SCHERR_SYN_NOT_FOUND;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
} else if ( sat->sat_syntax == NULL ) {
|
|
|
|
return SLAP_SCHERR_ATTR_INCOMPLETE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( sat->sat_equality_oid ) {
|
|
|
|
if ( (mr = mr_find(sat->sat_equality_oid)) ) {
|
|
|
|
sat->sat_equality = mr;
|
2000-07-25 05:29:30 +08:00
|
|
|
sat->sat_approx = mr->smr_associated;
|
2000-02-05 13:01:41 +08:00
|
|
|
} else {
|
|
|
|
*err = sat->sat_equality_oid;
|
|
|
|
return SLAP_SCHERR_MR_NOT_FOUND;
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( sat->sat_ordering_oid ) {
|
|
|
|
if ( (mr = mr_find(sat->sat_ordering_oid)) ) {
|
|
|
|
sat->sat_ordering = mr;
|
|
|
|
} else {
|
|
|
|
*err = sat->sat_ordering_oid;
|
|
|
|
return SLAP_SCHERR_MR_NOT_FOUND;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( sat->sat_substr_oid ) {
|
|
|
|
if ( (mr = mr_find(sat->sat_substr_oid)) ) {
|
|
|
|
sat->sat_substr = mr;
|
|
|
|
} else {
|
|
|
|
*err = sat->sat_substr_oid;
|
|
|
|
return SLAP_SCHERR_MR_NOT_FOUND;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
code = at_insert(sat,err);
|
2001-05-24 08:42:08 +08:00
|
|
|
return code;
|
2000-02-05 13:01:41 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef LDAP_DEBUG
|
|
|
|
static int
|
|
|
|
at_index_printnode( struct aindexrec *air )
|
|
|
|
{
|
|
|
|
|
|
|
|
printf("%s = %s\n",
|
2001-12-28 19:45:25 +08:00
|
|
|
air->air_name.bv_val,
|
2000-02-05 13:01:41 +08:00
|
|
|
ldap_attributetype2str(&air->air_at->sat_atype) );
|
|
|
|
return( 0 );
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
at_index_print( void )
|
|
|
|
{
|
|
|
|
printf("Printing attribute type index:\n");
|
|
|
|
(void) avl_apply( attr_index, (AVL_APPLY) at_index_printnode,
|
|
|
|
0, -1, AVL_INORDER );
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if defined( SLAPD_SCHEMA_DN )
|
|
|
|
int
|
|
|
|
at_schema_info( Entry *e )
|
|
|
|
{
|
2002-01-02 19:00:36 +08:00
|
|
|
struct berval vals[2];
|
2000-02-05 13:01:41 +08:00
|
|
|
AttributeType *at;
|
|
|
|
|
2000-05-16 07:36:37 +08:00
|
|
|
AttributeDescription *ad_attributeTypes = slap_schema.si_ad_attributeTypes;
|
|
|
|
|
2002-01-02 19:00:36 +08:00
|
|
|
vals[1].bv_val = NULL;
|
2000-02-05 13:01:41 +08:00
|
|
|
|
|
|
|
for ( at = attr_list; at; at = at->sat_next ) {
|
2002-01-02 19:00:36 +08:00
|
|
|
if ( ldap_attributetype2bv( &at->sat_atype, vals ) == NULL ) {
|
2000-02-05 13:01:41 +08:00
|
|
|
return -1;
|
|
|
|
}
|
2000-05-24 08:59:58 +08:00
|
|
|
#if 0
|
2000-05-16 07:36:37 +08:00
|
|
|
Debug( LDAP_DEBUG_TRACE, "Merging at [%ld] %s\n",
|
2002-01-02 19:00:36 +08:00
|
|
|
(long) vals[0].bv_len, vals[0].bv_val, 0 );
|
2000-05-24 08:59:58 +08:00
|
|
|
#endif
|
2000-05-16 07:36:37 +08:00
|
|
|
attr_merge( e, ad_attributeTypes, vals );
|
2002-01-02 19:00:36 +08:00
|
|
|
ldap_memfree( vals[0].bv_val );
|
2000-02-05 13:01:41 +08:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#endif
|