need this outside for back monitor ...

[openldap] / servers / slapd / ad.c

diff --git a/servers/slapd/ad.c b/servers/slapd/ad.c
index ba5e3ddb268cd39406a5c96f014a33b25f15d985..75193d93810576e95d09b92efd55522e1bdc9008 100644 (file)
--- a/servers/slapd/ad.c
+++ b/servers/slapd/ad.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /* ad.c - routines for dealing with attribute descriptions */
@@ -35,13 +35,13 @@ static int ad_keystring(
        return 0;
 }
 
-void ad_destroy( void *in )
+void ad_destroy( AttributeDescription *ad )
 {
-       AttributeDescription *ad = in, *n;
+       AttributeDescription *n;
 
-       for (;ad;ad = n) {
+       for (; ad != NULL; ad = n) {
                n = ad->ad_next;
-               ldap_memfree(ad);
+               ldap_memfree( ad );
        }
 }
 
@@ -301,7 +301,11 @@ int ad_inlist(
                 * EXTENSION: see if requested description is an object class
                 * if so, return attributes which the class requires/allows
                 */
-               oc = oc_bvfind( &attrs->an_name );
+               oc = attrs->an_oc;
+               if( oc == NULL ) {
+                       oc = oc_bvfind( &attrs->an_name );
+                       attrs->an_oc = oc;
+               }
                if( oc != NULL ) {
                        if ( oc == slap_schema.si_oc_extensibleObject ) {
                                /* extensibleObject allows the return of anything */
@@ -431,7 +435,7 @@ an_find(
  * to an existing list if it was given.
  */
 AttributeName *
-str2anlist( AttributeName *an, const char *in, const char *brkstr )
+str2anlist( AttributeName *an, char *in, const char *brkstr )
 {
        char    *str;
        char    *s;
@@ -461,8 +465,18 @@ str2anlist( AttributeName *an, const char *in, const char *brkstr )
                s = ldap_pvt_strtok( NULL, brkstr, &lasts ) )
        {
                anew->an_desc = NULL;
+               anew->an_oc = NULL;
                ber_str2bv(s, 0, 1, &anew->an_name);
                slap_bv2ad(&anew->an_name, &anew->an_desc, &text);
+               if ( !anew->an_desc ) {
+                       anew->an_oc = oc_bvfind( &anew->an_name );
+                       if ( !anew->an_oc ) {
+                               free( an );
+                               /* overwrites input string on error! */
+                               strcpy( in, s );
+                               return NULL;
+                       }
+               }
                anew++;
        }
        anew->an_name.bv_val = NULL;