Minor cleanup

[openldap] / servers / slapd / controls.c

diff --git a/servers/slapd/controls.c b/servers/slapd/controls.c
index 90716a38dd5cc1582d72e1d4abc59e2d96cae89e..ec3712c31abbcedce439ce9f981317114bb4014b 100644 (file)
--- a/servers/slapd/controls.c
+++ b/servers/slapd/controls.c
@@ -205,15 +205,16 @@ int get_ctrls(
 return_results:
 #ifdef NEW_LOGGING
        LDAP_LOG(( "operation", LDAP_LEVEL_RESULTS,
-                  "get_ctrls: conn %s  %d %d %s\n",
+                  "get_ctrls: conn %d  %d %d %s\n",
                   conn->c_connid, nctrls, rc, errmsg ? errmsg : "" ));
 #else
        Debug( LDAP_DEBUG_TRACE, "<= get_ctrls: %d %d %s\n",
                nctrls, rc, errmsg ? errmsg : "");
 #endif
+
        if( sendres && rc != LDAP_SUCCESS ) {
                if( rc == SLAPD_DISCONNECT ) {
-                       send_ldap_disconnect( conn, op, rc, errmsg );
+                       send_ldap_disconnect( conn, op, LDAP_PROTOCOL_ERROR, errmsg );
                } else {
                        send_ldap_result( conn, op, rc,
                                NULL, errmsg, NULL, NULL );