ITS#5235

diff --git a/CHANGES b/CHANGES
index 95c3c1cde4236dd930861648867421496d5ef84d..80fe37b949e559aeb50f5c66f8279c5cf31d3e66 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -13,6 +13,7 @@ OpenLDAP 2.4.7 Engineering
        Fixed slapd-bdb to report and fail on internal errors (ITS#5232)
        Fixed slapo-pcache op->o_abandon handling (ITS#5187)
        Fixed slapo-ppolicy single password check on modify (ITS#5146)
+       Fixed slapo-ppolicy internal search (ITS#5235)
        Fixed slapo-syncprov refresh and persist cookie sending (ITS#5210)
        Fixed slapo-syncprov ignore invalid cookies (ITS#5211)
        Fixed slapo-translucent interaction with slapo-rwm (ITS#4889)

diff --git a/servers/slapd/overlays/ppolicy.c b/servers/slapd/overlays/ppolicy.c
index cc401aefaaa6fb69d35db740911063e87a12dd14..b7f32c3570d57d2162ee4615d3b0a52f5c891a4e 100644 (file)
--- a/servers/slapd/overlays/ppolicy.c
+++ b/servers/slapd/overlays/ppolicy.c
@@ -2121,8 +2121,11 @@ ppolicy_db_init(
 
        on->on_bi.bi_private = ch_calloc( sizeof(pp_info), 1 );
 
-       if ( dtblsize && !pwcons )
-               pwcons = ch_calloc(sizeof(pw_conn), dtblsize );
+       if ( dtblsize && !pwcons ) {
+               /* accommodate for c_conn_idx == -1 */
+               pwcons = ch_calloc( sizeof(pw_conn), dtblsize + 1 );
+               pwcons++;
+       }
 
        return 0;
 }
@@ -2149,6 +2152,7 @@ ppolicy_close(
        /* Perhaps backover should provide bi_destroy hooks... */
        ov_count--;
        if ( ov_count <=0 && pwcons ) {
+               pwcons--;
                free( pwcons );
                pwcons = NULL;
        }