X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fat.c;h=7958a1ec3987b154c4916f71742ddcd80ab56656;hb=c2a9642850cef813e15f6d8e29799e2b99e52726;hp=4c9f4c436e2710d71a56ecb804dd8b07e6cbe22a;hpb=c75be97ae946dab41f002a31d8347cc38cda7658;p=openldap
diff --git a/servers/slapd/at.c b/servers/slapd/at.c
index 4c9f4c436e..7958a1ec39 100644
--- a/servers/slapd/at.c
+++ b/servers/slapd/at.c
@@ -1,9 +1,18 @@
+/* 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 .
+ *
+ * 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
+ * .
*/
-/* at.c - routines for dealing with attribute types */
#include "portable.h"
@@ -15,7 +24,6 @@
#include
#include
-#include "ldap_pvt.h"
#include "slap.h"
@@ -49,42 +57,38 @@ struct aindexrec {
};
static Avlnode *attr_index = NULL;
+static Avlnode *attr_cache = NULL;
static LDAP_SLIST_HEAD(ATList, slap_attribute_type) attr_list
= LDAP_SLIST_HEAD_INITIALIZER(&attr_list);
+int at_oc_cache;
+
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;
@@ -95,22 +99,29 @@ at_find(
}
AttributeType *
-at_bvfind(
- struct berval *name
-)
+at_bvfind( struct berval *name )
{
struct aindexrec *air;
+ if ( attr_cache ) {
+ air = avl_find( attr_cache, name, attr_index_name_cmp );
+ if ( air ) return air->air_at;
+ }
+
air = avl_find( attr_index, name, attr_index_name_cmp );
+ if ( air && ( slapMode & SLAP_TOOL_MODE ) && at_oc_cache ) {
+ avl_insert( &attr_cache, (caddr_t) air,
+ attr_index_cmp, avl_dup_error );
+ }
+
return air != NULL ? air->air_at : NULL;
}
int
at_append_to_list(
AttributeType *sat,
- AttributeType ***listp
-)
+ AttributeType ***listp )
{
AttributeType **list;
AttributeType **list1;
@@ -146,8 +157,7 @@ at_append_to_list(
int
at_delete_from_list(
int pos,
- AttributeType ***listp
-)
+ AttributeType ***listp )
{
AttributeType **list;
AttributeType **list1;
@@ -179,8 +189,7 @@ at_delete_from_list(
int
at_find_in_list(
AttributeType *sat,
- AttributeType **list
-)
+ AttributeType **list )
{
int i;
@@ -255,8 +264,7 @@ at_next( AttributeType **at )
static int
at_insert(
AttributeType *sat,
- const char **err
-)
+ const char **err )
{
struct aindexrec *air;
char **names;
@@ -305,8 +313,7 @@ at_insert(
int
at_add(
LDAPAttributeType *at,
- const char **err
-)
+ const char **err )
{
AttributeType *sat;
MatchingRule *mr;
@@ -542,7 +549,7 @@ at_add(
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.