Support LDAP_MOD_INCREMENT in slapi_modify_internal()

[openldap] / servers / slapd / slapi / slapi_utils.c

diff --git a/servers/slapd/slapi/slapi_utils.c b/servers/slapd/slapi/slapi_utils.c
index bfaf8587550a9d53a54985d990eec6971c25cef6..3a69cc4a55960ffc49e2d9588c37bb51646d2f73 100644 (file)
--- a/servers/slapd/slapi/slapi_utils.c
+++ b/servers/slapd/slapi/slapi_utils.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2002-2004 The OpenLDAP Foundation.
+ * Copyright 2002-2005 The OpenLDAP Foundation.
  * Portions Copyright 1997,2002-2003 IBM Corporation.
  * All rights reserved.
  *
@@ -134,9 +134,9 @@ slapi_entry2str(
 #ifdef LDAP_SLAPI
        char            *ret;
 
-       ldap_pvt_thread_mutex_lock( &SLAPD_GLOBAL(entry2str_mutex) );
+       ldap_pvt_thread_mutex_lock( &entry2str_mutex );
        ret = entry2str( e, len );
-       ldap_pvt_thread_mutex_unlock( &SLAPD_GLOBAL(entry2str_mutex) );
+       ldap_pvt_thread_mutex_unlock( &entry2str_mutex );
 
        return ret;
 #else /* LDAP_SLAPI */
@@ -1422,7 +1422,7 @@ slapi_register_supported_control(
 
        slapiControlOp2SlapControlMask( controlops, &controlmask );
 
-       register_supported_control( controloid, controlmask, NULL, slapi_int_parse_control );
+       register_supported_control( controloid, controlmask, NULL, slapi_int_parse_control, NULL );
 #endif /* LDAP_SLAPI */
 }