X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fschema.c;h=c7bafd9b8a51b2e5f068915c6b5c2d4901ca7f54;hb=18393e882cd89e461fc804b8ef58817027e465a1;hp=e71913e0e66b868fac3235491b20ca69c5372b20;hpb=e9c2895472d41da41fee1ffb049195b190f6adbc;p=openldap

diff --git a/servers/slapd/schema.c b/servers/slapd/schema.c
index e71913e0e6..c7bafd9b8a 100644
--- a/servers/slapd/schema.c
+++ b/servers/slapd/schema.c
@@ -14,6 +14,7 @@
 static char *	oc_check_required(Entry *e, char *ocname);
 static int		oc_check_allowed(char *type, struct berval **ocl);
 
+
 /*
  * oc_check - check that entry e conforms to the schema required by
  * its object class(es). returns 0 if so, non-zero otherwise.
@@ -133,8 +134,8 @@ static char *oc_usermod_attrs[] = {
 
 static char *oc_operational_attrs[] = {
 	/*
-	 * these are operational attributes that *could* be
-	 * modified by users if we supported such.
+	 * these are operational attributes 
+	 * most could be user modifiable
 	 */
 	"objectClasses",
 	"attributeTypes",
@@ -144,6 +145,12 @@ static char *oc_operational_attrs[] = {
 	"dITContentRules",
 	"nameForms",
 	"ldapSyntaxes",
+	"namingContexts",
+	"supportedExtension",
+	"supportedControl",
+	"supportedSASLMechanisms",
+	"supportedLDAPversion",
+	"subschemaSubentry",		/* NO USER MOD */
 	NULL
 
 };
@@ -152,6 +159,7 @@ static char *oc_operational_attrs[] = {
 static char *oc_no_usermod_attrs[] = {
 	/*
 	 * Operational and 'no user modification' attributes
+	 * which are STORED in the directory server.
 	 */
 
 	/* RFC2252, 3.2.1 */
@@ -159,7 +167,6 @@ static char *oc_no_usermod_attrs[] = {
 	"createTimestamp",
 	"modifiersName",
 	"modifyTimestamp",
-	"subschemaSubentry",
 
 	NULL
 };
@@ -1109,18 +1116,23 @@ schema_info( Connection *conn, Operation *op, char **attrs, int attrsonly )
 
 	e->e_attrs = NULL;
 	e->e_dn = ch_strdup( SLAPD_SCHEMA_DN );
-	e->e_ndn = dn_normalize_case( ch_strdup( SLAPD_SCHEMA_DN ));
+	e->e_ndn = ch_strdup( SLAPD_SCHEMA_DN );
+	(void) dn_normalize_case( e->e_ndn );
 	e->e_private = NULL;
 
-	val.bv_val = ch_strdup( "top" );
-	val.bv_len = strlen( val.bv_val );
-	attr_merge( e, "objectClass", vals );
-	ldap_memfree( val.bv_val );
+	{
+		char *rdn = ch_strdup( SLAPD_SCHEMA_DN );
+		val.bv_val = strchr( rdn, '=' );
 
-	val.bv_val = ch_strdup( "subschema" );
-	val.bv_len = strlen( val.bv_val );
-	attr_merge( e, "objectClass", vals );
-	ldap_memfree( val.bv_val );
+		if( val.bv_val != NULL ) {
+			*val.bv_val = '\0';
+			val.bv_len = strlen( ++val.bv_val );
+
+			attr_merge( e, rdn, vals );
+		}
+
+		free( rdn );
+	}
 
 	if ( syn_schema_info( e ) ) {
 		/* Out of memory, do something about it */
@@ -1143,8 +1155,22 @@ schema_info( Connection *conn, Operation *op, char **attrs, int attrsonly )
 		return;
 	}
 	
-	send_search_entry( &backends[0], conn, op, e, attrs, attrsonly, 0 );
-	send_ldap_search_result( conn, op, LDAP_SUCCESS, NULL, NULL, 1 );
+	val.bv_val = "top";
+	val.bv_len = sizeof("top")-1;
+	attr_merge( e, "objectClass", vals );
+
+	val.bv_val = "subschema";
+	val.bv_len = sizeof("subschema")-1;
+	attr_merge( e, "objectClass", vals );
+
+	val.bv_val = "extensibleObject";
+	val.bv_len = sizeof("extensibleObject")-1;
+	attr_merge( e, "objectClass", vals );
+
+	send_search_entry( &backends[0], conn, op,
+		e, attrs, attrsonly, NULL );
+	send_search_result( conn, op, LDAP_SUCCESS,
+		NULL, NULL, NULL, NULL, 1 );
 
 	entry_free( e );
 }
@@ -1179,3 +1205,35 @@ oc_print( ObjectClass *oc )
 }
 
 #endif
+
+
+int is_entry_objectclass(
+	Entry*	e,
+	char*	oc)
+{
+	Attribute *attr;
+	struct berval bv;
+
+	if( e == NULL || oc == NULL || *oc == '\0' )
+		return 0;
+
+	/*
+	 * find objectClass attribute
+	 */
+	attr = attr_find(e->e_attrs, "objectclass");
+
+	if( attr == NULL ) {
+		/* no objectClass attribute */
+		return 0;
+	}
+
+	bv.bv_val = oc;
+	bv.bv_len = strlen( bv.bv_val );
+
+	if( value_find(attr->a_vals, &bv, attr->a_syntax, 1) != 0) {
+		/* entry is not of this objectclass */
+		return 0;
+	}
+
+	return 1;
+}