X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fschema.c;h=bd1601ce0da03b76c69c08a3afba93f3b84c9248;hb=ae3f784d5b8b022fc8bb5ecd2e612d9b1cdd13ed;hp=4d401f85186e1b2833dffa6eedfe0bab03a460df;hpb=2d98b19bf76b0ac01abf5df0dc2d05ae3c01e967;p=openldap

diff --git a/servers/slapd/schema.c b/servers/slapd/schema.c
index 4d401f8518..bd1601ce0d 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-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2005 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
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
@@ -14,7 +23,6 @@
 #include <ac/socket.h>
 
 #include "slap.h"
-#include "ldap_pvt.h"
 #include "lutil.h"
 
 
@@ -32,17 +40,13 @@ schema_info( Entry **entry, const char **text )
 
 	Entry		*e;
 	struct berval	vals[5];
+	struct berval	nvals[5];
 
 	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;
 	}
@@ -51,29 +55,24 @@ schema_info( Entry **entry, const char **text )
 	/* 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 );
+	ber_dupbv( &e->e_name, &frontendDB->be_schemadn );
+	ber_dupbv( &e->e_nname, &frontendDB->be_schemandn );
 	e->e_private = NULL;
 
-	vals[0].bv_val = "subentry";
-	vals[0].bv_len = sizeof("subentry")-1;
-	if( attr_merge_one( e, ad_structuralObjectClass, 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;
 	}
 
-	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 ) ) {
+	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";
@@ -83,7 +82,7 @@ schema_info( Entry **entry, const char **text )
 	{
 		int rc;
 		AttributeDescription *desc = NULL;
-		struct berval rdn = global_schemadn;
+		struct berval rdn = frontendDB->be_schemadn;
 		vals[0].bv_val = strchr( rdn.bv_val, '=' );
 
 		if( vals[0].bv_val == NULL ) {
@@ -103,7 +102,13 @@ schema_info( Entry **entry, const char **text )
 			return LDAP_OTHER;
 		}
 
-		if( attr_merge_one( e, desc, vals ) ) {
+		nvals[0].bv_val = strchr( frontendDB->be_schemandn.bv_val, '=' );
+		assert( nvals[0].bv_val );
+		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";
@@ -113,6 +118,9 @@ schema_info( Entry **entry, const char **text )
 
 	{
 		struct		tm *ltm;
+#ifdef HAVE_GMTIME_R
+		struct		tm ltm_buf;
+#endif
 		char		timebuf[ LDAP_LUTIL_GENTIME_BUFSIZE ];
 
 		/*
@@ -126,21 +134,27 @@ schema_info( Entry **entry, const char **text )
 		 * AND modified at server startup time ...
 		 */
 
+#ifdef HAVE_GMTIME_R
+		ltm = gmtime_r( &starttime, &ltm_buf );
+#else
 		ldap_pvt_thread_mutex_lock( &gmtime_mutex );
 		ltm = gmtime( &starttime );
+#endif /* HAVE_GMTIME_R */
 		lutil_gentime( timebuf, sizeof(timebuf), ltm );
+#ifndef HAVE_GMTIME_R
 		ldap_pvt_thread_mutex_unlock( &gmtime_mutex );
+#endif
 
 		vals[0].bv_val = timebuf;
 		vals[0].bv_len = strlen( timebuf );
 
-		if( attr_merge_one( e, ad_createTimestamp, 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 ) ) {
+		if( attr_merge_one( e, ad_modifyTimestamp, vals, NULL ) ) {
 			/* Out of memory, do something about it */
 			entry_free( e );
 			*text = "out of memory";