Plug rdwr lock leak

diff --git a/CHANGES b/CHANGES
index 435a04477a77b67d35b78f377d32caedc44e7354..a66ad97184b477802c3276788f06b6554cf7f70b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,7 @@ Changes included in OpenLDAP 1.2.12 Engineering
        Fixed libldap/add mod_bvalues typo
        Fixed ldappasswd crypt(3) crash (ITD#598)
        Fixed slapd/config.c MAXARGS boundary condition bug
+       Fixed cn=monitor/config rdwr lock leak
        Build Environment
                Remove extra Digital UNIX symbol (ITS#590)
                Ignore make clean rm failure

diff --git a/servers/slapd/configinfo.c b/servers/slapd/configinfo.c
index 4becb0c090621529c13f264dda1b7a0c9f4c3b73..3cd78b37f5cb92bdb22e4cc2158dee818b9fbcb6 100644 (file)
--- a/servers/slapd/configinfo.c
+++ b/servers/slapd/configinfo.c
@@ -42,8 +42,6 @@ config_info(
        vals[1] = NULL;
 
        e = (Entry *) ch_calloc( 1, sizeof(Entry) );
-       /* initialize reader/writer lock */
-       entry_rdwr_init(e);
 
        e->e_attrs = NULL;
        e->e_dn = ch_strdup( SLAPD_CONFIG_DN );

diff --git a/servers/slapd/monitor.c b/servers/slapd/monitor.c
index ed29f78fafd0f87b6a789cf3d7b1c8489c21f399..04d51b1b3d6e27a6799a9d21af4008a8ddbd7412 100644 (file)
--- a/servers/slapd/monitor.c
+++ b/servers/slapd/monitor.c
@@ -47,7 +47,6 @@ monitor_info( Connection *conn, Operation *op,
 
        e = (Entry *) ch_calloc( 1, sizeof(Entry) );
        /* initialize reader/writer lock */
-       entry_rdwr_init(e);
        e->e_attrs = NULL;
        e->e_dn = ch_strdup( SLAPD_MONITOR_DN );
        e->e_ndn = dn_normalize_case( ch_strdup(SLAPD_MONITOR_DN) );