Minor cleanup

[openldap] / servers / slapd / controls.c

diff --git a/servers/slapd/controls.c b/servers/slapd/controls.c
index 5dc4b6cd468fc05e335a5bd04dcfc775cc66cd34..ec3712c31abbcedce439ce9f981317114bb4014b 100644 (file)
--- a/servers/slapd/controls.c
+++ b/servers/slapd/controls.c
@@ -56,8 +56,8 @@ int get_ctrls(
        }
 
 #ifdef NEW_LOGGING
-        LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
-                   "get_ctrls: conn %d\n", conn->c_connid ));
+       LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
+                  "get_ctrls: conn %d\n", conn->c_connid ));
 #else
        Debug( LDAP_DEBUG_TRACE, "=> get_ctrls\n", 0, 0, 0 );
 #endif
@@ -121,9 +121,9 @@ int get_ctrls(
 
                if( tag == LBER_ERROR ) {
 #ifdef NEW_LOGGING
-                    LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-                               "get_ctrls: conn %d  get OID failed.\n",
-                               conn->c_connid ));
+                       LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+                                  "get_ctrls: conn %d  get OID failed.\n",
+                                  conn->c_connid ));
 #else
                        Debug( LDAP_DEBUG_TRACE, "=> get_ctrls: get oid failed.\n",
                                0, 0, 0 );
@@ -143,9 +143,9 @@ int get_ctrls(
 
                        if( tag == LBER_ERROR ) {
 #ifdef NEW_LOGGING
-                            LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-                                       "get_ctrls: conn %d  get crit failed.\n",
-                                       conn->c_connid ));
+                               LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+                                          "get_ctrls: conn %d  get crit failed.\n",
+                                          conn->c_connid ));
 #else
                                Debug( LDAP_DEBUG_TRACE, "=> get_ctrls: get crit failed.\n",
                                        0, 0, 0 );
@@ -162,10 +162,10 @@ int get_ctrls(
                }
 
 #ifdef NEW_LOGGING
-                LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-                           "get_ctrls: conn %d oid=\"%s\" (%scritical)\n",
-                           conn->c_connid, tctrl->ldctl_oid,
-                           tctrl->ldctl_iscritical ? "" : "non" ));
+               LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+                          "get_ctrls: conn %d oid=\"%s\" (%scritical)\n",
+                          conn->c_connid, tctrl->ldctl_oid,
+                          tctrl->ldctl_iscritical ? "" : "non" ));
 #else
                Debug( LDAP_DEBUG_TRACE, "=> get_ctrls: oid=\"%s\" (%scritical)\n",
                        tctrl->ldctl_oid, 
@@ -177,8 +177,8 @@ int get_ctrls(
 
                        if( tag == LBER_ERROR ) {
 #ifdef NEW_LOGGING
-                            LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
-                                       "get_ctrls: conn %d  get value failed.\n", conn->c_connid ));
+                               LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+                                          "get_ctrls: conn %d  get value failed.\n", conn->c_connid ));
 #else
                                Debug( LDAP_DEBUG_TRACE, "=> get_ctrls: get value failed.\n",
                                        0, 0, 0 );
@@ -204,16 +204,17 @@ int get_ctrls(
 
 return_results:
 #ifdef NEW_LOGGING
-        LDAP_LOG(( "operation", LDAP_LEVEL_RESULTS,
-                   "get_ctrls: conn %s  %d %d %s\n",
-                   conn->c_connid, nctrls, rc, errmsg ? errmsg : "" ));
+       LDAP_LOG(( "operation", LDAP_LEVEL_RESULTS,
+                  "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 );