use more appropriate error code

[openldap] / servers / slapd / schema.c

diff --git a/servers/slapd/schema.c b/servers/slapd/schema.c
index da4b968f98a88ecb49b2127f6cf317ab70adc18f..c9d4436e8bc12f7da86f7cb4b8b8801cc9d2523e 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-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 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,57 +25,53 @@ 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   val;
-       struct berval   *vals[2];
-
-       vals[0] = &val;
-       vals[1] = NULL;
+       struct berval   vals[5];
 
        e = (Entry *) ch_calloc( 1, sizeof(Entry) );
 
        e->e_attrs = NULL;
-       e->e_dn = ch_strdup( SLAPD_SCHEMA_DN );
-       e->e_ndn = ch_strdup( SLAPD_SCHEMA_DN );
-       (void) dn_normalize( e->e_ndn );
+       /* 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;
 
-       val.bv_val = "LDAPsubentry";
-       val.bv_len = sizeof("LDAPsubentry")-1;
-       attr_merge( e, ad_structuralObjectClass, vals );
-
-       val.bv_val = "top";
-       val.bv_len = sizeof("top")-1;
-       attr_merge( e, ad_objectClass, vals );
-
-       val.bv_val = "LDAPsubentry";
-       val.bv_len = sizeof("LDAPsubentry")-1;
-       attr_merge( e, ad_objectClass, vals );
-
-       val.bv_val = "subschema";
-       val.bv_len = sizeof("subschema")-1;
-       attr_merge( e, ad_objectClass, vals );
-
-       val.bv_val = "extensibleObject";
-       val.bv_len = sizeof("extensibleObject")-1;
+       vals[0].bv_val = "subentry";
+       vals[0].bv_len = sizeof("subentry")-1;
+       attr_merge_one( e, ad_structuralObjectClass, vals );
+
+       vals[0].bv_val = "top";
+       vals[0].bv_len = sizeof("top")-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 };
-               val.bv_val = strchr( rdn.bv_val, '=' );
+               struct berval rdn = global_schemadn;
+               vals[0].bv_val = strchr( rdn.bv_val, '=' );
 
-               if( val.bv_val == NULL ) {
+               if( vals[0].bv_val == NULL ) {
                        *text = "improperly configured subschema subentry";
                        return LDAP_OTHER;
                }
 
-               val.bv_val++;
-               val.bv_len = rdn.bv_len - (val.bv_val - rdn.bv_val);
-               rdn.bv_len -= val.bv_len + 1;
+               vals[0].bv_val++;
+               vals[0].bv_len = rdn.bv_len - (vals[0].bv_val - rdn.bv_val);
+               rdn.bv_len -= vals[0].bv_len + 1;
 
                rc = slap_bv2ad( &rdn, &desc, text );
 
@@ -86,13 +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 );
@@ -103,5 +127,3 @@ schema_info( Entry **entry, const char **text )
        *entry = e;
        return LDAP_SUCCESS;
 }
-#endif
-