ITS#3846 don't give hashed passwords to SASL, it only wants cleartext.

[openldap] / servers / slapd / schema.c

diff --git a/servers/slapd/schema.c b/servers/slapd/schema.c
index c9d4436e8bc12f7da86f7cb4b8b8801cc9d2523e..c2f0970ff9b1615a0e4381909ee6a11f99b1979e 100644 (file)
--- 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,36 +40,49 @@ schema_info( Entry **entry, const char **text )
 
        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 */
+               Debug( LDAP_DEBUG_ANY, 
+                       "schema_info: SLAP_CALLOC failed - out of memory.\n", 0, 0, 0 );
+               *text = "out of memory";
+               return LDAP_OTHER;
+       }
 
        e->e_attrs = NULL;
        /* 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;
-       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 );
+       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;
+       }
+
+       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;
-               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 ) {
@@ -81,11 +102,21 @@ schema_info( Entry **entry, const char **text )
                        return LDAP_OTHER;
                }
 
-               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";
+                       return LDAP_OTHER;
+               }
        }
 
        {
-               struct          tm *ltm;
                char            timebuf[ LDAP_LUTIL_GENTIME_BUFSIZE ];
 
                /*
@@ -99,16 +130,23 @@ schema_info( Entry **entry, const char **text )
                 * 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 );
+               vals[0].bv_len = sizeof( timebuf );
+
+               slap_timestamp( &starttime, vals );
 
-               attr_merge_one( e, ad_createTimestamp, vals );
-               attr_merge_one( e, ad_modifyTimestamp, 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 )