ITS#768: slurpd start tls init bug

diff --git a/CHANGES b/CHANGES
index 65b980d8fe3834a71cfc6773c20416d936b41f7e..5dd7e397efa4ea5e72ec8af02d1876e0910ee27d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,7 @@
 OpenLDAP 2.0 Change Log
 
 OpenLDAP 2.0.X Engineering
-       <insert here>
+       Fixed slurpd TLS initialization bug (ITS#768)
 
 OpenLDAP 2.0.4 Release
        Fixed clients printf/usage bugs (ITS#749)

diff --git a/servers/slurpd/ri.c b/servers/slurpd/ri.c
index de6d7b5a88f9fdb1aa8bef22ed464cc2942dae90..9ea1a2217420c1c489f24e0c388def41bdb39905 100644 (file)
--- a/servers/slurpd/ri.c
+++ b/servers/slurpd/ri.c
@@ -161,7 +161,7 @@ Ri_init(
     Ri **ri
 )
 {
-    (*ri) = ( Ri * ) malloc( sizeof( Ri ));
+    (*ri) = ( Ri * ) calloc( 1, sizeof( Ri ));
     if ( *ri == NULL ) {
        return -1;
     }
@@ -172,9 +172,7 @@ Ri_init(
 
     /* Initialize private data */
     (*ri)->ri_hostname = NULL;
-    (*ri)->ri_port = 0;
     (*ri)->ri_ldp = NULL;
-    (*ri)->ri_bind_method = 0;
     (*ri)->ri_bind_dn = NULL;
     (*ri)->ri_password = NULL;
     (*ri)->ri_authcId = NULL;