ITS#3534, 3546, 3571 revert abandon behavior

[openldap] / servers / slapd / cr.c

diff --git a/servers/slapd/cr.c b/servers/slapd/cr.c
index 1db37ee4fbe229d28cca094dcfd4808fab89cec5..d3e00a261d4c1ad4978575e3a7a5e6640f071e46 100644 (file)
--- a/servers/slapd/cr.c
+++ b/servers/slapd/cr.c
@@ -1,8 +1,17 @@
 /* cr.c - content rule routines */
 /* $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>.
  */
 
 #include "portable.h"
@@ -16,8 +25,6 @@
 #include "slap.h"
 #include "ldap_pvt.h"
 
-#ifdef SLAP_EXTENDED_SCHEMA
-
 struct cindexrec {
        struct berval   cir_name;
        ContentRule     *cir_cr;
@@ -35,8 +42,7 @@ cr_index_cmp(
        const struct cindexrec  *cir1 = v_cir1;
        const struct cindexrec  *cir2 = v_cir2;
        int i = cir1->cir_name.bv_len - cir2->cir_name.bv_len;
-       if (i)
-               return i;
+       if (i) return i;
        return strcasecmp( cir1->cir_name.bv_val, cir2->cir_name.bv_val );
 }
 
@@ -48,8 +54,7 @@ cr_index_name_cmp(
        const struct berval    *name = v_name;
        const struct cindexrec *cir  = v_cir;
        int i = name->bv_len - cir->cir_name.bv_len;
-       if (i)
-               return i;
+       if (i) return i;
        return strncasecmp( name->bv_val, cir->cir_name.bv_val, name->bv_len );
 }
 
@@ -116,6 +121,7 @@ cr_insert(
        struct cindexrec        *cir;
        char                    **names;
 
+       LDAP_SLIST_NEXT( scr, scr_next ) = NULL;
        LDAP_SLIST_INSERT_HEAD(&cr_list, scr, scr_next);
 
        if ( scr->scr_oid ) {
@@ -193,7 +199,11 @@ cr_add_auxiliaries(
                        return SLAP_SCHERR_CLASS_NOT_FOUND;
                }
 
-               if( soc->soc_flags & SLAP_OC_OPERATIONAL ) (*op)++;
+               if( soc->soc_flags & SLAP_OC_OPERATIONAL &&
+                       soc != slap_schema.si_oc_extensibleObject )
+               {
+                       (*op)++;
+               }
 
                if( soc->soc_kind != LDAP_SCHEMA_AUXILIARY ) {
                        *err = scr->scr_oc_oids_aux[naux];
@@ -202,7 +212,6 @@ cr_add_auxiliaries(
        }
 
        scr->scr_auxiliaries[naux] = NULL;
-
        return 0;
 }
 
@@ -386,42 +395,45 @@ cr_add(
        code = cr_create_precluded( scr, &op, err );
        if ( code != 0 ) return code;
 
-       if( user && op ) return SLAP_SCHERR_CR_BAD_AUX;
+       if( user && op ) {
+               return SLAP_SCHERR_CR_BAD_AUX;
+       }
 
        code = cr_insert(scr,err);
        return code;
 }
 
-#endif
-
 int
 cr_schema_info( Entry *e )
 {
-#ifdef SLAP_EXTENDED_SCHEMA
-       struct berval   vals[2];
+       AttributeDescription *ad_ditContentRules
+               = slap_schema.si_ad_ditContentRules;
        ContentRule     *cr;
 
-       AttributeDescription *ad_ditContentRules = slap_schema.si_ad_ditContentRules;
-
-       vals[1].bv_val = NULL;
+       struct berval   val;
+       struct berval   nval;
 
        LDAP_SLIST_FOREACH(cr, &cr_list, scr_next) {
-               if ( ldap_contentrule2bv( &cr->scr_crule, vals ) == NULL ) {
+               if ( ldap_contentrule2bv( &cr->scr_crule, &val ) == NULL ) {
                        return -1;
                }
 
 #if 0
                if( cr->scr_flags & SLAP_CR_HIDE ) continue;
 #endif
-
 #if 0
                Debug( LDAP_DEBUG_TRACE, "Merging cr [%ld] %s\n",
-              (long) vals[0].bv_len, vals[0].bv_val, 0 );
+              (long) val.bv_len, val.bv_val, 0 );
 #endif
-               if( attr_merge( e, ad_ditContentRules, vals ) )
+
+               nval.bv_val = cr->scr_oid;
+               nval.bv_len = strlen(cr->scr_oid);
+
+               if( attr_merge_one( e, ad_ditContentRules, &val, &nval ) )
+               {
                        return -1;
-               ldap_memfree( vals[0].bv_val );
+               }
+               ldap_memfree( val.bv_val );
        }
-#endif
        return 0;
 }