From: Ondřej Kuzník <okuznik@symas.com>
Date: Mon, 11 Sep 2017 13:26:45 +0000 (+0000)
Subject: ITS#8731 General Debug() related fixes
X-Git-Tag: OPENLDAP_REL_ENG_2_4_55~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d3cccc3580125625f4642f713cc3aa166fb35dbf;p=thirdparty%2Fopenldap.git

ITS#8731 General Debug() related fixes
---

diff --git a/contrib/slapd-modules/nssov/nssov.c b/contrib/slapd-modules/nssov/nssov.c
index dc8fef0692..806c8017cb 100644
--- a/contrib/slapd-modules/nssov/nssov.c
+++ b/contrib/slapd-modules/nssov/nssov.c
@@ -947,7 +947,7 @@ nssov_db_close(
 
 	if ( slapMode & SLAP_SERVER_MODE ) {
 		/* close socket if it's still in use */
-		if (ni->ni_socket >= 0);
+		if (ni->ni_socket >= 0)
 		{
 			if (close(ni->ni_socket))
 				Debug( LDAP_DEBUG_ANY,"problem closing server socket (ignored): %s",strerror(errno),0,0);
diff --git a/servers/slapd/controls.c b/servers/slapd/controls.c
index 85483bb11a..3455319406 100644
--- a/servers/slapd/controls.c
+++ b/servers/slapd/controls.c
@@ -257,7 +257,7 @@ register_supported_control2(const char *controloid,
 	if ( num_known_controls >= SLAP_MAX_CIDS ) {
 		Debug( LDAP_DEBUG_ANY, "Too many controls registered."
 			" Recompile slapd with SLAP_MAX_CIDS defined > %d\n",
-		SLAP_MAX_CIDS, 0, 0 );
+		num_known_controls, 0, 0 );
 		return LDAP_OTHER;
 	}