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

[openldap] / servers / slapd / connection.c

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index b25feb5d31f65bce166391a992a5c330327afb6f..ffcb0312c584ffb32246582326acf12961ffe0f8 100644 (file)
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -1176,7 +1176,7 @@ int connection_client_setup(
 {
        Connection *c;
 
-       if ( connection_init( s, &dummy_list, "", "", CONN_IS_CLIENT, 0, NULL ) < 0 ) {
+       if ( connection_init( s, (Listener *)&dummy_list, "", "", CONN_IS_CLIENT, 0, NULL ) < 0 ) {
                return -1;
        }
 
@@ -1318,7 +1318,7 @@ int connection_read(ber_socket_t s)
 
                } else if ( rc == 0 ) {
                        void *ssl;
-                       struct berval authid = { 0, NULL };
+                       struct berval authid = BER_BVNULL;
 
                        c->c_needs_tls_accept = 0;
 
@@ -1865,20 +1865,20 @@ connection_fake_init(
        Operation *op,
        void *ctx )
 {
-        conn->c_connid = -1;
-        conn->c_send_ldap_result = slap_send_ldap_result;
-        conn->c_send_search_entry = slap_send_search_entry;
-        conn->c_send_search_reference = slap_send_search_reference;
-        conn->c_listener = (Listener *)&dummy_list;
-        conn->c_peer_name = slap_empty_bv;
-
-        /* set memory context */
-        op->o_tmpmemctx = sl_mem_create( SLMALLOC_SLAB_SIZE, ctx );
-        op->o_tmpmfuncs = &sl_mfuncs;
+       conn->c_connid = -1;
+       conn->c_send_ldap_result = slap_send_ldap_result;
+       conn->c_send_search_entry = slap_send_search_entry;
+       conn->c_send_search_reference = slap_send_search_reference;
+       conn->c_listener = (Listener *)&dummy_list;
+       conn->c_peer_name = slap_empty_bv;
+
+       /* set memory context */
+       op->o_tmpmemctx = sl_mem_create( SLMALLOC_SLAB_SIZE, ctx );
+       op->o_tmpmfuncs = &sl_mfuncs;
        op->o_threadctx = ctx;
 
-        op->o_conn = conn;
-        op->o_connid = op->o_conn->c_connid;
+       op->o_conn = conn;
+       op->o_connid = op->o_conn->c_connid;
 
        op->o_time = slap_get_time();
 }