ITS#8731 General Debug() related fixes

diff --git a/contrib/slapd-modules/nssov/nssov.c b/contrib/slapd-modules/nssov/nssov.c
index dc8fef0692d6635de667d6ecdfe63f5eb763e143..806c8017cb163eefef93bbf0ac065895bda8e134 100644 (file)
--- 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 85483bb11ac01443b57d0f2e667847a7ff10ba5a..3455319406e8e4cee0435865edb5cd6ce0e0a721 100644 (file)
--- 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;
        }