Happy new year! (belated)

[openldap] / servers / slapd / schema.c

diff --git a/servers/slapd/schema.c b/servers/slapd/schema.c
index 69d243b04d5dc4fb540fc7483b212111b121f6eb..43afea834b45638c27a73e7734011d6449aa1b0a 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-2008 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -83,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";
@@ -102,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);
@@ -117,10 +117,6 @@ 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 ];
 
                /*
@@ -134,19 +130,10 @@ 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 );
+               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 */