From: Kurt Zeilenga <kurt@openldap.org>
Date: Sun, 13 Jan 2002 20:06:53 +0000 (+0000)
Subject: Clean up last patch
X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~156
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ff23cd0f7ff541487606bb2bf12f842252fb95d4;p=openldap

Clean up last patch
---

diff --git a/servers/slapd/schema_prep.c b/servers/slapd/schema_prep.c
index e10076f94d..c592922182 100644
--- a/servers/slapd/schema_prep.c
+++ b/servers/slapd/schema_prep.c
@@ -183,7 +183,7 @@ static struct slap_schema_oc_map {
 			"SUP top AUXILIARY )",
 		dynamicObjectClass, 0,
 		offsetof(struct slap_internal_schema, si_oc_dynamicObject) },
-	{ NULL, 0 }
+	{ NULL, NULL, NULL, 0, 0 }
 };
 
 static AttributeTypeSchemaCheckFN rootDseAttribute;
@@ -536,10 +536,9 @@ static AttributeType slap_at_undefined = {
 	NULL, /* subtypes */
 	NULL, NULL, NULL, NULL,	/* matching rules */
 	NULL, /* syntax (this may need to be defined) */
-	(AttributeTypeSchemaCheckFN *) 0, /* schema check function */
-	0, /* schema check flags */
-	NULL, /* attribute description */
+	(AttributeTypeSchemaCheckFN *) 0, 0, /* schema check function/mask */
 	NULL  /* next */
+	NULL, /* attribute description */
 	/* mutex (don't know how to initialize it :) */
 };
 
diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 8079c73298..e4c5abce42 100644
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -432,8 +432,8 @@ typedef struct slap_attribute_type {
 	AttributeTypeSchemaCheckFN	*sat_check;
 	slap_mask_t					sat_flags;
 
-	struct slap_attr_desc		*sat_ad;
-	ldap_pvt_thread_mutex_t		sat_ad_mutex;
+	struct slap_attribute_type	*sat_next;
+
 #define sat_oid			sat_atype.at_oid
 #define sat_names		sat_atype.at_names
 #define sat_desc		sat_atype.at_desc
@@ -449,7 +449,8 @@ typedef struct slap_attribute_type {
 #define sat_usage		sat_atype.at_usage
 #define sat_extensions		sat_atype.at_extensions
 
-	struct slap_attribute_type	*sat_next;
+	struct slap_attr_desc		*sat_ad;
+	ldap_pvt_thread_mutex_t		sat_ad_mutex;
 } AttributeType;
 
 #define is_at_operational(at)	((at)->sat_usage)
@@ -487,7 +488,7 @@ typedef struct slap_object_class {
 	struct slap_object_class	*soc_next;
 } ObjectClass;
 
-#ifdef LDAP_DIT_CONTENT_RULES
+#ifdef LDAP_EXTENDED_SCHEMA
 /*
  * DIT content rule
  */