Use recursive mutex to avoid deadlocks

[openldap] / servers / slapd / root_dse.c

diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c
index a678bb25112a4171a92a6c33eeec07e406e54d06..356cbc78a68182b7c59ac41ae7c6bc2bcf4ca2fd 100644 (file)
--- a/servers/slapd/root_dse.c
+++ b/servers/slapd/root_dse.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2005 The OpenLDAP Foundation.
+ * Copyright 1999-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -214,7 +214,6 @@ root_dse_info(
                = slap_schema.si_ad_ref;
 
        e = (Entry *) SLAP_CALLOC( 1, sizeof(Entry) );
-
        if( e == NULL ) {
                Debug( LDAP_DEBUG_ANY,
                        "root_dse_info: SLAP_CALLOC failed", 0, 0, 0 );
@@ -478,7 +477,8 @@ slap_discover_feature(
                return rc;
        }
 
-       rc = ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION, &version );
+       rc = ldap_set_option( ld, LDAP_OPT_PROTOCOL_VERSION,
+               (const void *)&version );
        if ( rc != LDAP_SUCCESS ) {
                goto done;
        }