Completely untested built-in EXTERNAL implementation

[openldap] / servers / slapd / modify.c

diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c
index 4c28b687b2fb53b3b7e318d339d8138e4999ab18..9ab73b0725b944b6a92a721eaab0f8204f0712b0 100644 (file)
--- a/servers/slapd/modify.c
+++ b/servers/slapd/modify.c
@@ -1,10 +1,18 @@
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 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-2003 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>.
  */
-/*
- * Copyright (c) 1995 Regents of the University of Michigan.
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted
@@ -384,10 +392,10 @@ do_modify(
 #if defined( LDAP_SLAPI )
 #define pb     op->o_pb
        if ( pb ) {
-               slapi_x_pblock_set_operation( pb, op );
+               slapi_int_pblock_set_operation( pb, op );
                slapi_pblock_set( pb, SLAPI_MODIFY_TARGET, (void *)dn.bv_val );
                slapi_pblock_set( pb, SLAPI_MANAGEDSAIT, (void *)manageDSAit );
-               modv = slapi_x_modifications2ldapmods( &modlist );
+               modv = slapi_int_modifications2ldapmods( &modlist );
                slapi_pblock_set( pb, SLAPI_MODIFY_MODS, (void *)modv );
 
                rs->sr_err = doPluginFNs( op->o_bd, SLAPI_PLUGIN_PRE_MODIFY_FN, pb );
@@ -407,7 +415,7 @@ do_modify(
                                 rs->sr_err == LDAP_SUCCESS ) {
                                rs->sr_err = LDAP_OTHER;
                        }
-                       slapi_x_free_ldapmods( modv );
+                       slapi_int_free_ldapmods( modv );
                        modv = NULL;
                        goto cleanup;
                }
@@ -417,11 +425,11 @@ do_modify(
                 * modification array, so we need to convert it back to
                 * a Modification list.
                 *
-                * Calling slapi_x_modifications2ldapmods() destroyed modlist so
+                * Calling slapi_int_modifications2ldapmods() destroyed modlist so
                 * we don't need to free it.
                 */
                slapi_pblock_get( pb, SLAPI_MODIFY_MODS, (void **)&modv );
-               modlist = slapi_x_ldapmods2modifications( modv );
+               modlist = slapi_int_ldapmods2modifications( modv );
        }
 
        /*
@@ -429,7 +437,7 @@ do_modify(
         * (for example, a plugin might store some attributes elsewhere
         * and remove them from the modification list; if only those
         * attribute types were included in the modification request,
-        * then slapi_x_ldapmods2modifications() above will return
+        * then slapi_int_ldapmods2modifications() above will return
         * NULL).
         *
         * However, the post-operation plugin should still be 
@@ -558,7 +566,7 @@ cleanup:
        op->o_tmpfree( op->o_req_ndn.bv_val, op->o_tmpmemctx );
        if ( modlist != NULL ) slap_mods_free( modlist );
 #if defined( LDAP_SLAPI )
-       if ( modv != NULL ) slapi_x_free_ldapmods( modv );
+       if ( modv != NULL ) slapi_int_free_ldapmods( modv );
 #endif
        return rs->sr_err;
 }
@@ -793,15 +801,24 @@ int slap_mods_opattrs(
 
        if ( SLAP_LASTMOD( op->o_bd )) {
                struct tm *ltm;
+#ifdef HAVE_GMTIME_R
+               struct tm ltm_buf;
+#endif
                time_t now = slap_get_time();
 
+#ifdef HAVE_GMTIME_R
+               ltm = gmtime_r( &now, &ltm_buf );
+#else
                ldap_pvt_thread_mutex_lock( &gmtime_mutex );
                ltm = gmtime( &now );
+#endif /* HAVE_GMTIME_R */
                lutil_gentime( timebuf, sizeof(timebuf), ltm );
 
                slap_get_csn( op, csnbuf, sizeof(csnbuf), &csn, 1 );
 
+#ifndef HAVE_GMTIME_R
                ldap_pvt_thread_mutex_unlock( &gmtime_mutex );
+#endif
 
                timestamp.bv_val = timebuf;
                timestamp.bv_len = strlen(timebuf);