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

diff --git a/servers/slapd/schema.c b/servers/slapd/schema.c
index 874ace374c..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,6 +25,10 @@ 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[5];
@@ -81,11 +84,39 @@ schema_info( Entry **entry, const char **text )
 		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 );
@@ -96,4 +127,3 @@ schema_info( Entry **entry, const char **text )
 	*entry = e;
 	return LDAP_SUCCESS;
 }
-#endif