+/* at.c - routines for dealing with attribute types */
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 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-2005 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>.
*/
-/* at.c - routines for dealing with attribute types */
#include "portable.h"
#include <ac/string.h>
#include <ac/time.h>
-#include "ldap_pvt.h"
#include "slap.h"
static int
attr_index_cmp(
const void *v_air1,
- const void *v_air2
-)
+ const void *v_air2 )
{
const struct aindexrec *air1 = v_air1;
const struct aindexrec *air2 = v_air2;
int i = air1->air_name.bv_len - air2->air_name.bv_len;
- if (i)
- return i;
+ if (i) return i;
return (strcasecmp( air1->air_name.bv_val, air2->air_name.bv_val ));
}
static int
attr_index_name_cmp(
const void *v_type,
- const void *v_air
-)
+ const void *v_air )
{
const struct berval *type = v_type;
const struct aindexrec *air = v_air;
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 ));
+ if (i) return i;
+ return (strncasecmp( type->bv_val, air->air_name.bv_val, type->bv_len ));
}
AttributeType *
-at_find(
- const char *name
-)
+at_find( const char *name )
{
struct berval bv;
}
AttributeType *
-at_bvfind(
- struct berval *name
-)
+at_bvfind( struct berval *name )
{
struct aindexrec *air;
int
at_append_to_list(
AttributeType *sat,
- AttributeType ***listp
-)
+ AttributeType ***listp )
{
AttributeType **list;
AttributeType **list1;
int
at_delete_from_list(
int pos,
- AttributeType ***listp
-)
+ AttributeType ***listp )
{
AttributeType **list;
AttributeType **list1;
int
at_find_in_list(
AttributeType *sat,
- AttributeType **list
-)
+ AttributeType **list )
{
int i;
static int
at_insert(
AttributeType *sat,
- const char **err
-)
+ const char **err )
{
struct aindexrec *air;
char **names;
int
at_add(
LDAPAttributeType *at,
- const char **err
-)
+ const char **err )
{
AttributeType *sat;
MatchingRule *mr;
return SLAP_SCHERR_ATTR_BAD_MR;
}
- /* due to funky LDAP builtin substring rules, we
+ /* due to funky LDAP builtin substring rules,
* we check against the equality rule assertion
* syntax and compat syntaxes instead of those
* associated with the substrings rule.
int
at_schema_info( Entry *e )
{
- struct berval vals[2];
- AttributeType *at;
-
AttributeDescription *ad_attributeTypes = slap_schema.si_ad_attributeTypes;
-
- vals[1].bv_val = NULL;
+ AttributeType *at;
+ struct berval val;
+ struct berval nval;
LDAP_SLIST_FOREACH(at,&attr_list,sat_next) {
if( at->sat_flags & SLAP_AT_HIDE ) continue;
- if ( ldap_attributetype2bv( &at->sat_atype, vals ) == NULL ) {
+ if ( ldap_attributetype2bv( &at->sat_atype, &val ) == NULL ) {
return -1;
}
-#ifdef SLAP_NVALUES
- if( attr_merge( e, ad_attributeTypes, vals, NULL /* FIXME */ ) )
-#else
- if( attr_merge( e, ad_attributeTypes, vals ) )
-#endif
+ nval.bv_val = at->sat_oid;
+ nval.bv_len = strlen(at->sat_oid);
+
+ if( attr_merge_one( e, ad_attributeTypes, &val, &nval ) )
{
return -1;
}
- ldap_memfree( vals[0].bv_val );
+ ldap_memfree( val.bv_val );
}
return 0;
}