allow backwards compatibility for 'T' option (single char)

[openldap] / servers / slapd / result.c

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index 3091d0b8c9995f8e817646aa484b9e867a3cb173..f591b5e6c29f09091fe92039a6db88038fcc47ac 100644 (file)
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -538,8 +538,9 @@ send_ldap_disconnect( Operation     *op, SlapReply *rs )
 
        if ( send_ldap_response( op, rs ) == SLAP_CB_CONTINUE ) {
                Statslog( LDAP_DEBUG_STATS,
-           "conn=%lu op=%lu DISCONNECT tag=%lu err=%d text=%s\n",
-               op->o_connid, op->o_opid, rs->sr_tag, rs->sr_err, rs->sr_text ? rs->sr_text : "" );
+                       "conn=%lu op=%lu DISCONNECT tag=%lu err=%d text=%s\n",
+                       op->o_connid, op->o_opid, rs->sr_tag, rs->sr_err,
+                       rs->sr_text ? rs->sr_text : "" );
        }
 }
 
@@ -556,7 +557,7 @@ slap_send_ldap_result( Operation *op, SlapReply *rs )
 
 #ifdef NEW_LOGGING
        LDAP_LOG( OPERATION, ENTRY, 
-               "send_ldap_result: conn %lu op=%lu p=%d\n",
+               "send_ldap_result: conn=%lu op=%lu p=%d\n",
                op->o_connid, op->o_opid, op->o_protocol );
 #else
        Debug( LDAP_DEBUG_TRACE,
@@ -1672,8 +1673,7 @@ int slap_read_controls(
 int
 slap_map_api2result( SlapReply *rs )
 {
-       switch(rs->sr_err)
-       {
+       switch(rs->sr_err) {
        case LDAP_SERVER_DOWN:
                return LDAP_UNAVAILABLE;
        case LDAP_LOCAL_ERROR:
@@ -1710,8 +1710,7 @@ slap_map_api2result( SlapReply *rs )
        case LDAP_REFERRAL_LIMIT_EXCEEDED:
                return LDAP_LOOP_DETECT;
        default:
-               if ( LDAP_API_ERROR(rs->sr_err) )
-                       return LDAP_OTHER;
+               if ( LDAP_API_ERROR(rs->sr_err) ) return LDAP_OTHER;
                return rs->sr_err;
        }
 }