X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fschema.c;h=c9d4436e8bc12f7da86f7cb4b8b8801cc9d2523e;hb=69343add5ac17c2300e256c85acf3279298a0fbe;hp=4be9256d060c095c762d678141cba82b4c777aef;hpb=b56f7c72223f2dae95946e6b4bbcb2daa6396efb;p=openldap

diff --git a/servers/slapd/schema.c b/servers/slapd/schema.c
index 4be9256d06..c9d4436e8b 100644
--- a/servers/slapd/schema.c
+++ b/servers/slapd/schema.c
@@ -15,10 +15,9 @@
 
 #include "slap.h"
 #include "ldap_pvt.h"
+#include "lutil.h"
 
 
-#if defined( SLAPD_SCHEMA_DN )
-
 int
 schema_info( Entry **entry, const char **text )
 {
@@ -26,44 +25,43 @@ schema_info( Entry **entry, const char **text )
 		= slap_schema.si_ad_structuralObjectClass;
 	AttributeDescription *ad_objectClass
 		= slap_schema.si_ad_objectClass;
+	AttributeDescription *ad_createTimestamp
+		= slap_schema.si_ad_createTimestamp;
+	AttributeDescription *ad_modifyTimestamp
+		= slap_schema.si_ad_modifyTimestamp;
 
 	Entry		*e;
-	struct berval	vals[2];
-
-	vals[1].bv_val = NULL;
+	struct berval	vals[5];
 
 	e = (Entry *) ch_calloc( 1, sizeof(Entry) );
 
 	e->e_attrs = NULL;
-	ber_str2bv( SLAPD_SCHEMA_DN, sizeof(SLAPD_SCHEMA_DN)-1, 1, &e->e_name);
-	(void) dnNormalize2( NULL, &e->e_name, &e->e_nname );
+	/* backend-specific schema info should be created by the
+	 * backend itself
+	 */
+	ber_dupbv( &e->e_name, &global_schemadn );
+	ber_dupbv( &e->e_nname, &global_schemandn );
 	e->e_private = NULL;
 
 	vals[0].bv_val = "subentry";
 	vals[0].bv_len = sizeof("subentry")-1;
-	attr_merge( e, ad_structuralObjectClass, vals );
+	attr_merge_one( e, ad_structuralObjectClass, vals );
 
 	vals[0].bv_val = "top";
 	vals[0].bv_len = sizeof("top")-1;
-	attr_merge( e, ad_objectClass, vals );
-
-	vals[0].bv_val = "subentry";
-	vals[0].bv_len = sizeof("subentry")-1;
-	attr_merge( e, ad_objectClass, vals );
-
-	vals[0].bv_val = "subschema";
-	vals[0].bv_len = sizeof("subschema")-1;
-	attr_merge( e, ad_objectClass, vals );
-
-	vals[0].bv_val = "extensibleObject";
-	vals[0].bv_len = sizeof("extensibleObject")-1;
+	vals[1].bv_val = "subentry";
+	vals[1].bv_len = sizeof("subentry")-1;
+	vals[2].bv_val = "subschema";
+	vals[2].bv_len = sizeof("subschema")-1;
+	vals[3].bv_val = "extensibleObject";
+	vals[3].bv_len = sizeof("extensibleObject")-1;
+	vals[4].bv_val = NULL;
 	attr_merge( e, ad_objectClass, vals );
 
 	{
 		int rc;
 		AttributeDescription *desc = NULL;
-		struct berval rdn = { sizeof(SLAPD_SCHEMA_DN)-1,
-			SLAPD_SCHEMA_DN };
+		struct berval rdn = global_schemadn;
 		vals[0].bv_val = strchr( rdn.bv_val, '=' );
 
 		if( vals[0].bv_val == NULL ) {
@@ -83,14 +81,42 @@ schema_info( Entry **entry, const char **text )
 			return LDAP_OTHER;
 		}
 
-		attr_merge( e, desc, vals );
+		attr_merge_one( e, desc, vals );
+	}
+
+	{
+		struct		tm *ltm;
+		char		timebuf[ LDAP_LUTIL_GENTIME_BUFSIZE ];
+
+		/*
+		 * According to RFC 2251:
+
+   Servers SHOULD provide the attributes createTimestamp and
+   modifyTimestamp in subschema entries, in order to allow clients to
+   maintain their caches of schema information.
+
+		 * to be conservative, we declare schema created 
+		 * AND modified at server startup time ...
+		 */
+
+		ldap_pvt_thread_mutex_lock( &gmtime_mutex );
+		ltm = gmtime( &starttime );
+		lutil_gentime( timebuf, sizeof(timebuf), ltm );
+		ldap_pvt_thread_mutex_unlock( &gmtime_mutex );
+
+		vals[0].bv_val = timebuf;
+		vals[0].bv_len = strlen( timebuf );
+
+		attr_merge_one( e, ad_createTimestamp, vals );
+		attr_merge_one( e, ad_modifyTimestamp, vals );
 	}
 
 	if ( syn_schema_info( e ) 
 		|| mr_schema_info( e )
 		|| mru_schema_info( e )
 		|| at_schema_info( e )
-		|| oc_schema_info( e ) )
+		|| oc_schema_info( e )
+		|| cr_schema_info( e ) )
 	{
 		/* Out of memory, do something about it */
 		entry_free( e );
@@ -101,4 +127,3 @@ schema_info( Entry **entry, const char **text )
 	*entry = e;
 	return LDAP_SUCCESS;
 }
-#endif