Add validation.

[openldap] / servers / slapd / controls.c

diff --git a/servers/slapd/controls.c b/servers/slapd/controls.c
index e2147fe7ccb17c6c824436614e3feaf06bdc92ed..7c3bf61b6bdab7126c06800d4b3bb505e0849906 100644 (file)
--- a/servers/slapd/controls.c
+++ b/servers/slapd/controls.c
@@ -57,9 +57,11 @@ static struct slap_control {
        { LDAP_CONTROL_MANAGEDSAIT,
                SLAP_CTRL_ACCESS, NULL,
                parseManageDSAit },
+#ifdef LDAP_CONTROL_SUBENTRIES
        { LDAP_CONTROL_SUBENTRIES,
                SLAP_CTRL_SEARCH, NULL,
                parseSubentries },
+#endif
 #ifdef LDAP_CONTROL_NOOP
        { LDAP_CONTROL_NOOP,
                SLAP_CTRL_UPDATE, NULL,
@@ -342,10 +344,10 @@ int get_ctrls(
 return_results:
 #ifdef NEW_LOGGING
        LDAP_LOG(( "operation", LDAP_LEVEL_RESULTS,
-               "get_ctrls: conn %d     %d %d %s\n",
+               "get_ctrls: conn=%d     n=%d rc=%d err=%s\n",
                conn->c_connid, nctrls, rc, errmsg ? errmsg : "" ));
 #else
-       Debug( LDAP_DEBUG_TRACE, "<= get_ctrls: %d %d %s\n",
+       Debug( LDAP_DEBUG_TRACE, "<= get_ctrls: n=%d rc=%d err=%s\n",
                nctrls, rc, errmsg ? errmsg : "");
 #endif
 
@@ -384,6 +386,7 @@ static int parseManageDSAit (
        return LDAP_SUCCESS;
 }
 
+#ifdef LDAP_CONTROL_SUBENTRIES
 static int parseSubentries (
        Connection *conn,
        Operation *op,
@@ -412,7 +415,9 @@ static int parseSubentries (
 
        return LDAP_SUCCESS;
 }
+#endif
 
+#ifdef LDAP_CONTROL_NOOP
 static int parseNoOp (
        Connection *conn,
        Operation *op,
@@ -435,4 +440,5 @@ static int parseNoOp (
 
        return LDAP_SUCCESS;
 }
+#endif