]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/schema.c
silence warning
[openldap] / servers / slapd / schema.c
index f56ca4deffbdc1fe0e6aa4924258810e20f3784f..d0dfa3021d2f7c4f52bc28278228429e2f132f08 100644 (file)
@@ -1,7 +1,7 @@
 /* schema.c - routines to manage schema definitions */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
 
 #include "slap.h"
 #include "ldap_pvt.h"
+#include "lutil.h"
 
 
-#if defined( SLAPD_SCHEMA_DN )
-
 int
 schema_info( Entry **entry, const char **text )
 {
-       AttributeDescription *ad_objectClass = slap_schema.si_ad_objectClass;
+       AttributeDescription *ad_structuralObjectClass
+               = 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];
+       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;
-       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 = "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 );
+       vals[0].bv_val = "subentry";
+       vals[0].bv_len = sizeof("subentry")-1;
+       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;
+       }
 
-       val.bv_val = "extensibleObject";
-       val.bv_len = sizeof("extensibleObject")-1;
-       attr_merge( e, ad_objectClass, 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;
+       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;
                AttributeDescription *desc = NULL;
-               char *rdn = ch_strdup( SLAPD_SCHEMA_DN );
-               val.bv_val = strchr( rdn, '=' );
+               struct berval rdn = global_schemadn;
+               vals[0].bv_val = strchr( rdn.bv_val, '=' );
 
-               if( val.bv_val == NULL ) {
-                       free( rdn );
+               if( vals[0].bv_val == NULL ) {
                        *text = "improperly configured subschema subentry";
                        return LDAP_OTHER;
                }
 
-               *val.bv_val = '\0';
-               val.bv_len = strlen( ++val.bv_val );
+               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_str2ad( rdn, &desc, text );
+               rc = slap_bv2ad( &rdn, &desc, text );
 
                if( rc != LDAP_SUCCESS ) {
-                       free( rdn );
                        entry_free( e );
                        *text = "improperly configured subschema subentry";
                        return LDAP_OTHER;
                }
 
-               attr_merge( e, desc, vals );
-               free( rdn );
+               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 );
@@ -97,5 +176,3 @@ schema_info( Entry **entry, const char **text )
        *entry = e;
        return LDAP_SUCCESS;
 }
-#endif
-