ITS#8731 General Debug() related fixes

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);

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;
 	}