From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Tue, 24 Nov 2009 01:51:40 +0000 (+0000)
Subject: ITS#6398 fix onetime leak
X-Git-Tag: OPENLDAP_REL_ENG_2_4_20~6
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=580f045a9a86304cc3a6f9ada402c02f9979cb7b;p=openldap

ITS#6398 fix onetime leak
---

diff --git a/CHANGES b/CHANGES
index 731151b79c..aef0d0f427 100644
--- 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 7c948a809d..f3cf2de504 100644
--- 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;