silence warning

[openldap] / servers / slapd / schema.c

diff --git a/servers/slapd/schema.c b/servers/slapd/schema.c
index 874ace374c5981a7a022cc510fedb25e29626807..d0dfa3021d2f7c4f52bc28278228429e2f132f08 100644 (file)
--- a/servers/slapd/schema.c
+++ b/servers/slapd/schema.c
@@ -1,7 +1,7 @@
 /* schema.c - routines to manage schema definitions */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -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,11 +25,28 @@ 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];
+       struct berval   nvals[5];
 
-       e = (Entry *) ch_calloc( 1, sizeof(Entry) );
+       e = (Entry *) SLAP_CALLOC( 1, sizeof(Entry) );
+       if( e == NULL ) {
+               /* Out of memory, do something about it */
+#ifdef NEW_LOGGING
+               LDAP_LOG( OPERATION, ERR, 
+                       "schema_info: SLAP_CALLOC failed - out of memory.\n", 0, 0,0 );
+#else
+               Debug( LDAP_DEBUG_ANY, 
+                       "schema_info: SLAP_CALLOC failed - out of memory.\n", 0, 0, 0 );
+#endif
+               *text = "out of memory";
+               return LDAP_OTHER;
+       }
 
        e->e_attrs = NULL;
        /* backend-specific schema info should be created by the
@@ -42,7 +58,13 @@ schema_info( Entry **entry, const char **text )
 
        vals[0].bv_val = "subentry";
        vals[0].bv_len = sizeof("subentry")-1;
-       attr_merge_one( e, ad_structuralObjectClass, vals );
+       if( attr_merge_one( e, ad_structuralObjectClass, vals, vals ) )
+       {
+               /* Out of memory, do something about it */
+               entry_free( e );
+               *text = "out of memory";
+               return LDAP_OTHER;
+       }
 
        vals[0].bv_val = "top";
        vals[0].bv_len = sizeof("top")-1;
@@ -53,7 +75,13 @@ schema_info( Entry **entry, const char **text )
        vals[3].bv_val = "extensibleObject";
        vals[3].bv_len = sizeof("extensibleObject")-1;
        vals[4].bv_val = NULL;
-       attr_merge( e, ad_objectClass, vals );
+       if( attr_merge( e, ad_objectClass, vals, vals ) )
+       {
+               /* Out of memory, do something about it */
+               entry_free( e );
+               *text = "out of memory";
+               return LDAP_OTHER;
+       }
 
        {
                int rc;
@@ -78,14 +106,66 @@ schema_info( Entry **entry, const char **text )
                        return LDAP_OTHER;
                }
 
-               attr_merge_one( e, desc, vals );
+               nvals[0].bv_val = strchr( global_schemandn.bv_val, '=' );
+               assert( nvals[0].bv_val );
+               nvals[0].bv_val++;
+               nvals[0].bv_len = global_schemandn.bv_len -
+                       (nvals[0].bv_val - global_schemandn.bv_val);
+
+               if( attr_merge_one( e, desc, vals, nvals ) )
+               {
+                       /* Out of memory, do something about it */
+                       entry_free( e );
+                       *text = "out of memory";
+                       return LDAP_OTHER;
+               }
+       }
+
+       {
+               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 );
+
+               if( attr_merge_one( e, ad_createTimestamp, vals, vals ) )
+               {
+                       /* Out of memory, do something about it */
+                       entry_free( e );
+                       *text = "out of memory";
+                       return LDAP_OTHER;
+               }
+               if( attr_merge_one( e, ad_modifyTimestamp, vals, vals ) )
+               {
+                       /* Out of memory, do something about it */
+                       entry_free( e );
+                       *text = "out of memory";
+                       return LDAP_OTHER;
+               }
        }
 
        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 +176,3 @@ schema_info( Entry **entry, const char **text )
        *entry = e;
        return LDAP_SUCCESS;
 }
-#endif