X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fschema.c;h=22d76a34b95ab0b1b3288dd60361adc0dec4ee46;hb=294da7ed11a9a5721b15d0ed81682f123e20cbb0;hp=f28c99161e74fd225600d9a167d680201d0eb3c0;hpb=948925a68307c69157c1d6fa14575e032cba7afb;p=openldap
diff --git a/servers/slapd/schema.c b/servers/slapd/schema.c
index f28c99161e..22d76a34b9 100644
--- a/servers/slapd/schema.c
+++ b/servers/slapd/schema.c
@@ -1,8 +1,17 @@
/* schema.c - routines to manage schema definitions */
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2008 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * .
*/
#include "portable.h"
@@ -14,11 +23,9 @@
#include
#include "slap.h"
-#include "ldap_pvt.h"
+#include "lutil.h"
-#if defined( SLAPD_SCHEMA_DN )
-
int
schema_info( Entry **entry, const char **text )
{
@@ -26,74 +33,128 @@ 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];
+ struct berval nvals[5];
- e = (Entry *) ch_calloc( 1, sizeof(Entry) );
+ e = entry_alloc();
+ if( e == NULL ) {
+ /* Out of memory, do something about it */
+ Debug( LDAP_DEBUG_ANY,
+ "schema_info: entry_alloc failed - out of memory.\n", 0, 0, 0 );
+ *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, &frontendDB->be_schemadn );
+ ber_dupbv( &e->e_nname, &frontendDB->be_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 );
+ BER_BVSTR( &vals[0], "subentry" );
+ if( attr_merge_one( e, ad_structuralObjectClass, vals, NULL ) ) {
+ /* 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 );
+ BER_BVSTR( &vals[0], "top" );
+ BER_BVSTR( &vals[1], "subentry" );
+ BER_BVSTR( &vals[2], "subschema" );
+ BER_BVSTR( &vals[3], "extensibleObject" );
+ BER_BVZERO( &vals[4] );
+ if ( attr_merge( e, ad_objectClass, vals, NULL ) ) {
+ /* 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 = frontendDB->be_schemadn;
+ vals[0].bv_val = ber_bvchr( &rdn, '=' );
- 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 = ber_bvchr( &frontendDB->be_schemandn, '=' );
+ assert( nvals[0].bv_val != NULL );
+ nvals[0].bv_val++;
+ nvals[0].bv_len = frontendDB->be_schemandn.bv_len -
+ (nvals[0].bv_val - frontendDB->be_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;
+ }
+ }
+
+ {
+ char timebuf[ LDAP_LUTIL_GENTIME_BUFSIZE ];
+
+ /*
+ * According to RFC 4512:
+
+ Servers SHOULD maintain the 'creatorsName', 'createTimestamp',
+ 'modifiersName', and 'modifyTimestamp' attributes for all entries of
+ the DIT.
+
+ * to be conservative, we declare schema created
+ * AND modified at server startup time ...
+ */
+
+ vals[0].bv_val = timebuf;
+ vals[0].bv_len = sizeof( timebuf );
+
+ slap_timestamp( &starttime, vals );
+
+ if( attr_merge_one( e, ad_createTimestamp, vals, NULL ) ) {
+ /* 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, NULL ) ) {
+ /* 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 );
@@ -104,5 +165,3 @@ schema_info( Entry **entry, const char **text )
*entry = e;
return LDAP_SUCCESS;
}
-#endif
-