ITS#6398 fix onetime leak

diff --git a/CHANGES b/CHANGES
index 731151b79ca37b8d9c9a74d046f56be26bc6fcf1..aef0d0f4274618b05cc9a42884552c079341c005 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -21,6 +21,7 @@ OpenLDAP 2.4.20 Engineering
        Fixed slapd inclusion of ac/unistd.h (ITS#6342)
        Fixed slapd invalid dn log message (ITS#6309)
        Fixed slapd lockup on shutdown (ITS#6372)
+       Fixed slapd onetime leak (ITS#6398)
        Fixed slapd RID range to be decimal only (ITS#6394)
        Fixed slapd sl_free to better reclaim memory (ITS#6380)
        Fixed slapd syncrepl deletes in MirrorMode (ITS#6368)

diff --git a/servers/slapd/slapcommon.c b/servers/slapd/slapcommon.c
index 7c948a809d9cc42fc332982d13869259a5ff4c3f..f3cf2de504bd28649ba9fe3a5e69a15de14b292e 100644 (file)
--- a/servers/slapd/slapcommon.c
+++ b/servers/slapd/slapcommon.c
@@ -763,6 +763,11 @@ startup:;
                conffile = NULL;
        }
 
+       if ( confdir != NULL ) {
+               ch_free( confdir );
+               confdir = NULL;
+       }
+
        if ( ldiffile != NULL ) {
                ch_free( ldiffile );
                ldiffile = NULL;