ITS#6152 add olcProxyCacheOffline for manually toggling cache expiration,

[openldap] / servers / slapd / schema.c

diff --git a/servers/slapd/schema.c b/servers/slapd/schema.c
index 0d4b99af688e52efeee4409757992c6cca143469..e9667799e857a7f37fd0ec04456ac7fe97d9b5b8 100644 (file)
--- a/servers/slapd/schema.c
+++ b/servers/slapd/schema.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2009 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -23,7 +23,6 @@
 #include <ac/socket.h>
 
 #include "slap.h"
-#include "ldap_pvt.h"
 #include "lutil.h"
 
 
@@ -43,16 +42,11 @@ schema_info( Entry **entry, const char **text )
        struct berval   vals[5];
        struct berval   nvals[5];
 
-       e = (Entry *) SLAP_CALLOC( 1, sizeof(Entry) );
+       e = entry_alloc();
        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
+                       "schema_info: entry_alloc failed - out of memory.\n", 0, 0, 0 );
                *text = "out of memory";
                return LDAP_OTHER;
        }
@@ -89,7 +83,7 @@ schema_info( Entry **entry, const char **text )
                int rc;
                AttributeDescription *desc = NULL;
                struct berval rdn = frontendDB->be_schemadn;
-               vals[0].bv_val = strchr( rdn.bv_val, '=' );
+               vals[0].bv_val = ber_bvchr( &rdn, '=' );
 
                if( vals[0].bv_val == NULL ) {
                        *text = "improperly configured subschema subentry";
@@ -108,8 +102,8 @@ schema_info( Entry **entry, const char **text )
                        return LDAP_OTHER;
                }
 
-               nvals[0].bv_val = strchr( frontendDB->be_schemandn.bv_val, '=' );
-               assert( nvals[0].bv_val );
+               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);
@@ -123,36 +117,23 @@ 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 ];
 
                /*
-                * According to RFC 2251:
+                * According to RFC 4512:
 
-   Servers SHOULD provide the attributes createTimestamp and
-   modifyTimestamp in subschema entries, in order to allow clients to
-   maintain their caches of schema information.
+   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 ...
                 */
 
-#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 );
+               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 */