upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-23 08:09:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup

Browse source
This commit is contained in:
Kurt Zeilenga 2003-11-18 22:11:11 +00:00
parent 72cfae7264
commit 99ba95ab92
1 changed files with 132 additions and 133 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

263
servers/slapd/connection.c
View file

@ -78,7 +78,7 @@ int connections_init(void)
if( connections != NULL) { if( connections != NULL) {
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, INFO, LDAP_LOG( CONNECTION, INFO,
"connections_init: already initialized.\n", 0, 0, 0 ); "connections_init: already initialized.\n", 0, 0, 0 );
#else #else
Debug( LDAP_DEBUG_ANY, "connections_init: already initialized.\n", Debug( LDAP_DEBUG_ANY, "connections_init: already initialized.\n",
0, 0, 0 ); 0, 0, 0 );
@ -94,8 +94,8 @@ int connections_init(void)
if( connections == NULL ) { if( connections == NULL ) {
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, ERR, LDAP_LOG( CONNECTION, ERR,
"connections_init: allocation (%d * %ld) of connection " "connections_init: allocation (%d * %ld) of connection "
"array failed\n", dtblsize, (long) sizeof(Connection), 0 ); "array failed\n", dtblsize, (long) sizeof(Connection), 0 );
#else #else
Debug( LDAP_DEBUG_ANY, Debug( LDAP_DEBUG_ANY,
"connections_init: allocation (%d*%ld) of connection array failed\n", "connections_init: allocation (%d*%ld) of connection array failed\n",
@ -104,8 +104,8 @@ int connections_init(void)
return -1; return -1;
} }
assert( connections[0].c_struct_state == SLAP_C_UNINITIALIZED ); assert( connections[0].c_struct_state == SLAP_C_UNINITIALIZED );
assert( connections[dtblsize-1].c_struct_state == SLAP_C_UNINITIALIZED ); assert( connections[dtblsize-1].c_struct_state == SLAP_C_UNINITIALIZED );
/* /*
* per entry initialization of the Connection array initialization * per entry initialization of the Connection array initialization
@ -127,7 +127,7 @@ int connections_destroy(void)
if( connections == NULL) { if( connections == NULL) {
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, INFO, LDAP_LOG( CONNECTION, INFO,
"connections_destroy: nothing to destroy.\n", 0, 0, 0 ); "connections_destroy: nothing to destroy.\n", 0, 0, 0 );
#else #else
Debug( LDAP_DEBUG_ANY, "connections_destroy: nothing to destroy.\n", Debug( LDAP_DEBUG_ANY, "connections_destroy: nothing to destroy.\n",
0, 0, 0 ); 0, 0, 0 );
@ -292,7 +292,7 @@ static Connection* connection_get( ber_socket_t s )
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, ARGS, LDAP_LOG( CONNECTION, ARGS,
"connection_get: connection %d not used\n", s, 0, 0 ); "connection_get: connection %d not used\n", s, 0, 0 );
#else #else
Debug( LDAP_DEBUG_TRACE, Debug( LDAP_DEBUG_TRACE,
"connection_get(%d): connection not used\n", "connection_get(%d): connection not used\n",
@ -361,11 +361,10 @@ long connection_init(
if( s == AC_SOCKET_INVALID ) { if( s == AC_SOCKET_INVALID ) {
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, INFO, LDAP_LOG( CONNECTION, INFO,
"connection_init: init of socket %ld invalid.\n", (long)s, 0, 0 ); "connection_init: init of socket %ld invalid.\n", (long)s, 0, 0 );
#else #else
Debug( LDAP_DEBUG_ANY, Debug( LDAP_DEBUG_ANY,
"connection_init(%ld): invalid.\n", "connection_init: init of socket %ld invalid.\n", (long)s, 0, 0 );
(long) s, 0, 0 );
#endif #endif
return -1; return -1;
} }
@ -382,48 +381,49 @@ long connection_init(
#else #else
{ {
ber_socket_t i; ber_socket_t i;
c = NULL; c = NULL;
for( i=0; i < dtblsize; i++) { for( i=0; i < dtblsize; i++) {
ber_socket_t sd; ber_socket_t sd;
if( connections[i].c_struct_state == SLAP_C_UNINITIALIZED ) { if( connections[i].c_struct_state == SLAP_C_UNINITIALIZED ) {
assert( connections[i].c_sb == 0 ); assert( connections[i].c_sb == 0 );
c = &connections[i]; c = &connections[i];
break; break;
} }
sd = AC_SOCKET_INVALID; sd = AC_SOCKET_INVALID;
if (connections[i].c_sb != NULL) if (connections[i].c_sb != NULL) {
ber_sockbuf_ctrl( connections[i].c_sb, LBER_SB_OPT_GET_FD, &sd ); ber_sockbuf_ctrl( connections[i].c_sb,
LBER_SB_OPT_GET_FD, &sd );
}
if( connections[i].c_struct_state == SLAP_C_UNUSED ) { if( connections[i].c_struct_state == SLAP_C_UNUSED ) {
assert( sd == AC_SOCKET_INVALID ); assert( sd == AC_SOCKET_INVALID );
c = &connections[i]; c = &connections[i];
break; break;
} }
assert( connections[i].c_struct_state == SLAP_C_USED ); assert( connections[i].c_struct_state == SLAP_C_USED );
assert( connections[i].c_conn_state != SLAP_C_INVALID ); assert( connections[i].c_conn_state != SLAP_C_INVALID );
assert( sd != AC_SOCKET_INVALID ); assert( sd != AC_SOCKET_INVALID );
} }
if( c == NULL ) { if( c == NULL ) {
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, INFO, LDAP_LOG( CONNECTION, INFO,
"connection_init: skt %d connection table full " "connection_init(%d): connection table full "
"(%d/%d)\n", s, i, dtblsize ); "(%d/%d)\n", s, i, dtblsize );
#else #else
Debug( LDAP_DEBUG_ANY, Debug( LDAP_DEBUG_ANY,
"connection_init(%d): connection table full " "connection_init(%d): connection table full "
"(%d/%d)\n", s, i, dtblsize); "(%d/%d)\n", s, i, dtblsize);
#endif #endif
ldap_pvt_thread_mutex_unlock( &connections_mutex ); ldap_pvt_thread_mutex_unlock( &connections_mutex );
return -1; return -1;
}
} }
}
#endif #endif
assert( c != NULL ); assert( c != NULL );
@ -484,17 +484,17 @@ long connection_init(
c->c_struct_state = SLAP_C_UNUSED; c->c_struct_state = SLAP_C_UNUSED;
} }
ldap_pvt_thread_mutex_lock( &c->c_mutex ); ldap_pvt_thread_mutex_lock( &c->c_mutex );
assert( c->c_struct_state == SLAP_C_UNUSED ); assert( c->c_struct_state == SLAP_C_UNUSED );
assert( c->c_authmech.bv_val == NULL ); assert( c->c_authmech.bv_val == NULL );
assert( c->c_dn.bv_val == NULL ); assert( c->c_dn.bv_val == NULL );
assert( c->c_ndn.bv_val == NULL ); assert( c->c_ndn.bv_val == NULL );
assert( c->c_listener == NULL ); assert( c->c_listener == NULL );
assert( c->c_peer_domain.bv_val == NULL ); assert( c->c_peer_domain.bv_val == NULL );
assert( c->c_peer_name.bv_val == NULL ); assert( c->c_peer_name.bv_val == NULL );
assert( LDAP_STAILQ_EMPTY(&c->c_ops) ); assert( LDAP_STAILQ_EMPTY(&c->c_ops) );
assert( LDAP_STAILQ_EMPTY(&c->c_pending_ops) ); assert( LDAP_STAILQ_EMPTY(&c->c_pending_ops) );
assert( c->c_sasl_bind_mech.bv_val == NULL ); assert( c->c_sasl_bind_mech.bv_val == NULL );
assert( c->c_sasl_done == 0 ); assert( c->c_sasl_done == 0 );
assert( c->c_sasl_authctx == NULL ); assert( c->c_sasl_authctx == NULL );
@ -517,10 +517,10 @@ long connection_init(
ber_str2bv( dnsname, 0, 1, &c->c_peer_domain ); ber_str2bv( dnsname, 0, 1, &c->c_peer_domain );
ber_str2bv( peername, 0, 1, &c->c_peer_name ); ber_str2bv( peername, 0, 1, &c->c_peer_name );
c->c_n_ops_received = 0; c->c_n_ops_received = 0;
c->c_n_ops_executing = 0; c->c_n_ops_executing = 0;
c->c_n_ops_pending = 0; c->c_n_ops_pending = 0;
c->c_n_ops_completed = 0; c->c_n_ops_completed = 0;
c->c_n_get = 0; c->c_n_get = 0;
c->c_n_read = 0; c->c_n_read = 0;
@ -570,8 +570,8 @@ long connection_init(
{ {
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, INFO, LDAP_LOG( CONNECTION, INFO,
"connection_init: conn %lu set nonblocking failed\n", "connection_init: conn %lu set nonblocking failed\n",
c->c_connid, 0, 0 ); c->c_connid, 0, 0 );
#else #else
Debug( LDAP_DEBUG_ANY, Debug( LDAP_DEBUG_ANY,
"connection_init(%d, %s): set nonblocking failed\n", "connection_init(%d, %s): set nonblocking failed\n",
@ -579,33 +579,33 @@ long connection_init(
#endif #endif
} }
id = c->c_connid = conn_nextid++; id = c->c_connid = conn_nextid++;
c->c_conn_state = SLAP_C_INACTIVE; c->c_conn_state = SLAP_C_INACTIVE;
c->c_struct_state = SLAP_C_USED; c->c_struct_state = SLAP_C_USED;
c->c_ssf = c->c_transport_ssf = ssf; c->c_ssf = c->c_transport_ssf = ssf;
c->c_tls_ssf = 0; c->c_tls_ssf = 0;
#ifdef HAVE_TLS #ifdef HAVE_TLS
if ( flags == CONN_IS_TLS ) { if ( flags == CONN_IS_TLS ) {
c->c_is_tls = 1; c->c_is_tls = 1;
c->c_needs_tls_accept = 1; c->c_needs_tls_accept = 1;
} else { } else {
c->c_is_tls = 0; c->c_is_tls = 0;
c->c_needs_tls_accept = 0; c->c_needs_tls_accept = 0;
} }
#endif #endif
slap_sasl_open( c, 0 ); slap_sasl_open( c, 0 );
slap_sasl_external( c, ssf, authid ); slap_sasl_external( c, ssf, authid );
ldap_pvt_thread_mutex_unlock( &c->c_mutex ); ldap_pvt_thread_mutex_unlock( &c->c_mutex );
ldap_pvt_thread_mutex_unlock( &connections_mutex ); ldap_pvt_thread_mutex_unlock( &connections_mutex );
backend_connection_init(c); backend_connection_init(c);
return id; return id;
} }
void connection2anonymous( Connection *c ) void connection2anonymous( Connection *c )
@ -642,24 +642,24 @@ static void
connection_destroy( Connection *c ) connection_destroy( Connection *c )
{ {
/* note: connections_mutex should be locked by caller */ /* note: connections_mutex should be locked by caller */
ber_socket_t sd; ber_socket_t sd;
unsigned long connid; unsigned long connid;
assert( connections != NULL ); assert( connections != NULL );
assert( c != NULL ); assert( c != NULL );
assert( c->c_struct_state != SLAP_C_UNUSED ); assert( c->c_struct_state != SLAP_C_UNUSED );
assert( c->c_conn_state != SLAP_C_INVALID ); assert( c->c_conn_state != SLAP_C_INVALID );
assert( LDAP_STAILQ_EMPTY(&c->c_ops) ); assert( LDAP_STAILQ_EMPTY(&c->c_ops) );
/* only for stats (print -1 as "%lu" may give unexpected results ;) */ /* only for stats (print -1 as "%lu" may give unexpected results ;) */
connid = c->c_connid; connid = c->c_connid;
backend_connection_destroy(c); backend_connection_destroy(c);
c->c_protocol = 0; c->c_protocol = 0;
c->c_connid = -1; c->c_connid = -1;
c->c_activitytime = c->c_starttime = 0; c->c_activitytime = c->c_starttime = 0;
connection2anonymous( c ); connection2anonymous( c );
c->c_listener = NULL; c->c_listener = NULL;
@ -694,7 +694,7 @@ connection_destroy( Connection *c )
slapd_remove( sd, 1, 0 ); slapd_remove( sd, 1, 0 );
Statslog( LDAP_DEBUG_STATS, Statslog( LDAP_DEBUG_STATS,
"conn=%lu fd=%ld closed\n", "conn=%lu fd=%ld closed\n",
connid, (long) sd, 0, 0, 0 ); connid, (long) sd, 0, 0, 0 );
} }
@ -707,8 +707,8 @@ connection_destroy( Connection *c )
ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_SET_MAX_INCOMING, &max ); ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_SET_MAX_INCOMING, &max );
} }
c->c_conn_state = SLAP_C_INVALID; c->c_conn_state = SLAP_C_INVALID;
c->c_struct_state = SLAP_C_UNUSED; c->c_struct_state = SLAP_C_UNUSED;
#ifdef LDAP_SLAPI #ifdef LDAP_SLAPI
/* call destructors, then constructors; avoids unnecessary allocation */ /* call destructors, then constructors; avoids unnecessary allocation */
@ -766,8 +766,8 @@ void connection_closing( Connection *c )
ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_GET_FD, &sd ); ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_GET_FD, &sd );
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, DETAIL1, LDAP_LOG( CONNECTION, DETAIL1,
"connection_closing: conn %lu readying socket %d for close.\n", "connection_closing: conn %lu readying socket %d for close.\n",
c->c_connid, sd, 0 ); c->c_connid, sd, 0 );
#else #else
Debug( LDAP_DEBUG_TRACE, Debug( LDAP_DEBUG_TRACE,
"connection_closing: readying conn=%lu sd=%d for close\n", "connection_closing: readying conn=%lu sd=%d for close\n",
@ -803,8 +803,8 @@ static void connection_close( Connection *c )
if( !LDAP_STAILQ_EMPTY(&c->c_ops) ) { if( !LDAP_STAILQ_EMPTY(&c->c_ops) ) {
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, DETAIL1, LDAP_LOG( CONNECTION, DETAIL1,
"connection_close: conn %lu deferring sd %d\n", "connection_close: conn %lu deferring sd %d\n",
c->c_connid, sd, 0 ); c->c_connid, sd, 0 );
#else #else
Debug( LDAP_DEBUG_TRACE, Debug( LDAP_DEBUG_TRACE,
"connection_close: deferring conn=%lu sd=%d\n", "connection_close: deferring conn=%lu sd=%d\n",
@ -815,7 +815,7 @@ static void connection_close( Connection *c )
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, RESULTS, LDAP_LOG( CONNECTION, RESULTS,
"connection_close: conn %lu sd %d\n", c->c_connid, sd, 0 ); "connection_close: conn %lu sd %d\n", c->c_connid, sd, 0 );
#else #else
Debug( LDAP_DEBUG_TRACE, "connection_close: conn=%lu sd=%d\n", Debug( LDAP_DEBUG_TRACE, "connection_close: conn=%lu sd=%d\n",
c->c_connid, sd, 0 ); c->c_connid, sd, 0 );
@ -1027,11 +1027,11 @@ connection_operation( void *ctx, void *arg_v )
default: default:
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, INFO, LDAP_LOG( CONNECTION, INFO,
"connection_operation: conn %lu unknown LDAP request 0x%lx\n", "connection_operation: conn %lu unknown LDAP request 0x%lx\n",
conn->c_connid, tag, 0 ); conn->c_connid, tag, 0 );
#else #else
Debug( LDAP_DEBUG_ANY, "unknown LDAP request 0x%lx\n", Debug( LDAP_DEBUG_ANY, "unknown LDAP request 0x%lx\n",
tag, 0, 0 ); tag, 0, 0 );
#endif #endif
op->o_tag = LBER_ERROR; op->o_tag = LBER_ERROR;
rs.sr_err = LDAP_PROTOCOL_ERROR; rs.sr_err = LDAP_PROTOCOL_ERROR;
@ -1244,8 +1244,8 @@ int connection_read(ber_socket_t s)
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, DETAIL1, LDAP_LOG( CONNECTION, DETAIL1,
"connection_read: conn %lu checking for input.\n", "connection_read: conn %lu checking for input.\n",
c->c_connid, 0, 0 ); c->c_connid, 0, 0 );
#else #else
Debug( LDAP_DEBUG_TRACE, Debug( LDAP_DEBUG_TRACE,
"connection_read(%d): checking for input on id=%lu\n", "connection_read(%d): checking for input on id=%lu\n",
@ -1263,8 +1263,8 @@ int connection_read(ber_socket_t s)
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, ERR, LDAP_LOG( CONNECTION, ERR,
"connection_read: conn %lu TLS accept error, error %d\n", "connection_read: conn %lu TLS accept error, error %d\n",
c->c_connid, rc, 0 ); c->c_connid, rc, 0 );
#else #else
Debug( LDAP_DEBUG_TRACE, Debug( LDAP_DEBUG_TRACE,
"connection_read(%d): TLS accept error " "connection_read(%d): TLS accept error "
@ -1281,10 +1281,10 @@ int connection_read(ber_socket_t s)
FD_ZERO(&rfd); FD_ZERO(&rfd);
FD_SET(s, &rfd); FD_SET(s, &rfd);
for (rc=1; rc>0;) { for (rc=1; rc>0;) {
tv.tv_sec = 1; tv.tv_sec = 1;
tv.tv_usec = 0; tv.tv_usec = 0;
rc = select(s+1, &rfd, NULL, NULL, &tv); rc = select(s+1, &rfd, NULL, NULL, &tv);
if (rc == 1) { if (rc == 1) {
ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_DRAIN, NULL); ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_DRAIN, NULL);
} }
} }
@ -1344,7 +1344,7 @@ int connection_read(ber_socket_t s)
c->c_sasl_layers = 0; c->c_sasl_layers = 0;
rc = ldap_pvt_sasl_install( c->c_sb, c->c_sasl_sockctx ); rc = ldap_pvt_sasl_install( c->c_sb, c->c_sasl_sockctx );
if( rc != LDAP_SUCCESS ) { if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
@ -1386,7 +1386,7 @@ int connection_read(ber_socket_t s)
if( rc < 0 ) { if( rc < 0 ) {
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, ERR, LDAP_LOG( CONNECTION, ERR,
"connection_read: conn %lu input error %d, closing.\n", "connection_read: conn %lu input error %d, closing.\n",
c->c_connid, rc, 0 ); c->c_connid, rc, 0 );
#else #else
Debug( LDAP_DEBUG_TRACE, Debug( LDAP_DEBUG_TRACE,
@ -1416,7 +1416,7 @@ int connection_read(ber_socket_t s)
static int static int
connection_input( connection_input(
Connection *conn Connection *conn
) )
{ {
Operation *op; Operation *op;
@ -1435,7 +1435,7 @@ connection_input(
{ {
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, ERR, LDAP_LOG( CONNECTION, ERR,
"connection_input: conn %lu ber_alloc failed.\n", "connection_input: conn %lu ber_alloc failed.\n",
conn->c_connid, 0, 0 ); conn->c_connid, 0, 0 );
#else #else
Debug( LDAP_DEBUG_ANY, "ber_alloc failed\n", 0, 0, 0 ); Debug( LDAP_DEBUG_ANY, "ber_alloc failed\n", 0, 0, 0 );
@ -1469,7 +1469,7 @@ connection_input(
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, ERR, LDAP_LOG( CONNECTION, ERR,
"connection_input: conn %lu ber_get_next failed, errno %d (%s).\n", "connection_input: conn %lu ber_get_next failed, errno %d (%s).\n",
conn->c_connid, err, sock_errstr(err) ); conn->c_connid, err, sock_errstr(err) );
#else #else
Debug( LDAP_DEBUG_TRACE, Debug( LDAP_DEBUG_TRACE,
@ -1493,11 +1493,11 @@ connection_input(
/* log, close and send error */ /* log, close and send error */
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, ERR, LDAP_LOG( CONNECTION, ERR,
"connection_input: conn %lu ber_get_int returns 0x%lx.\n", "connection_input: conn %lu ber_get_int returns 0x%lx.\n",
conn->c_connid, tag, 0 ); conn->c_connid, tag, 0 );
#else #else
Debug( LDAP_DEBUG_ANY, "ber_get_int returns 0x%lx\n", tag, 0, Debug( LDAP_DEBUG_ANY, "ber_get_int returns 0x%lx\n",
0 ); tag, 0, 0 );
#endif #endif
ber_free( ber, 1 ); ber_free( ber, 1 );
return -1; return -1;
@ -1507,11 +1507,11 @@ connection_input(
/* log, close and send error */ /* log, close and send error */
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, ERR, LDAP_LOG( CONNECTION, ERR,
"connection_input: conn %lu ber_peek_tag returns 0x%lx.\n", "connection_input: conn %lu ber_peek_tag returns 0x%lx.\n",
conn->c_connid, tag, 0 ); conn->c_connid, tag, 0 );
#else #else
Debug( LDAP_DEBUG_ANY, "ber_peek_tag returns 0x%lx\n", tag, 0, Debug( LDAP_DEBUG_ANY, "ber_peek_tag returns 0x%lx\n",
0 ); tag, 0, 0 );
#endif #endif
ber_free( ber, 1 ); ber_free( ber, 1 );
@ -1526,15 +1526,14 @@ connection_input(
} }
if( tag != LDAP_REQ_ABANDON && tag != LDAP_REQ_SEARCH ) { if( tag != LDAP_REQ_ABANDON && tag != LDAP_REQ_SEARCH ) {
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, ERR, LDAP_LOG( CONNECTION, ERR,
"connection_input: conn %lu invalid req for UDP 0x%lx.\n", "connection_input: conn %lu invalid req for UDP 0x%lx.\n",
conn->c_connid, tag, 0 ); conn->c_connid, tag, 0 );
#else #else
Debug( LDAP_DEBUG_ANY, "invalid req for UDP 0x%lx\n", tag, 0, Debug( LDAP_DEBUG_ANY, "invalid req for UDP 0x%lx\n", tag, 0, 0 );
0 );
#endif #endif
ber_free( ber, 1 ); ber_free( ber, 1 );
return 0; return 0;
} }
} }
#endif #endif
@ -1560,8 +1559,8 @@ connection_input(
#ifdef LDAP_CONNECTIONLESS #ifdef LDAP_CONNECTIONLESS
if (conn->c_is_udp) { if (conn->c_is_udp) {
if ( cdn ) { if ( cdn ) {
ber_str2bv( cdn, 0, 1, &op->o_dn ); ber_str2bv( cdn, 0, 1, &op->o_dn );
op->o_protocol = LDAP_VERSION2; op->o_protocol = LDAP_VERSION2;
} }
op->o_res_ber = ber_alloc_t( LBER_USE_DER ); op->o_res_ber = ber_alloc_t( LBER_USE_DER );
if (op->o_res_ber == NULL) return 1; if (op->o_res_ber == NULL) return 1;
@ -1572,7 +1571,7 @@ connection_input(
if (rc != sizeof(struct sockaddr)) { if (rc != sizeof(struct sockaddr)) {
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, INFO, LDAP_LOG( CONNECTION, INFO,
"connection_input: conn %lu ber_write failed\n", "connection_input: conn %lu ber_write failed\n",
conn->c_connid, 0, 0 ); conn->c_connid, 0, 0 );
#else #else
Debug( LDAP_DEBUG_ANY, "ber_write failed\n", 0, 0, 0 ); Debug( LDAP_DEBUG_ANY, "ber_write failed\n", 0, 0, 0 );
@ -1585,7 +1584,7 @@ connection_input(
if (rc == -1) { if (rc == -1) {
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, INFO, LDAP_LOG( CONNECTION, INFO,
"connection_input: conn %lu put outer sequence failed\n", "connection_input: conn %lu put outer sequence failed\n",
conn->c_connid, 0, 0 ); conn->c_connid, 0, 0 );
#else #else
Debug( LDAP_DEBUG_ANY, "ber_write failed\n", 0, 0, 0 ); Debug( LDAP_DEBUG_ANY, "ber_write failed\n", 0, 0, 0 );
@ -1618,7 +1617,7 @@ connection_input(
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, INFO, LDAP_LOG( CONNECTION, INFO,
"connection_input: conn %lu deferring operation\n", "connection_input: conn %lu deferring operation\n",
conn->c_connid, 0, 0 ); conn->c_connid, 0, 0 );
#else #else
Debug( LDAP_DEBUG_ANY, Debug( LDAP_DEBUG_ANY,
@ -1664,7 +1663,7 @@ connection_resched( Connection *conn )
if( rc ) { if( rc ) {
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, DETAIL1, LDAP_LOG( CONNECTION, DETAIL1,
"connection_resched: conn %lu reaquiring locks.\n", "connection_resched: conn %lu reaquiring locks.\n",
conn->c_connid, 0, 0 ); conn->c_connid, 0, 0 );
#else #else
Debug( LDAP_DEBUG_TRACE, Debug( LDAP_DEBUG_TRACE,
@ -1684,7 +1683,7 @@ connection_resched( Connection *conn )
if( conn->c_conn_state != SLAP_C_CLOSING ) { if( conn->c_conn_state != SLAP_C_CLOSING ) {
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, INFO, LDAP_LOG( CONNECTION, INFO,
"connection_resched: conn %lu closed by other thread.\n", "connection_resched: conn %lu closed by other thread.\n",
conn->c_connid, 0, 0 ); conn->c_connid, 0, 0 );
#else #else
Debug( LDAP_DEBUG_TRACE, "connection_resched: " Debug( LDAP_DEBUG_TRACE, "connection_resched: "
@ -1694,7 +1693,7 @@ connection_resched( Connection *conn )
} else { } else {
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, DETAIL1, LDAP_LOG( CONNECTION, DETAIL1,
"connection_resched: conn %lu attempting closing.\n", "connection_resched: conn %lu attempting closing.\n",
conn->c_connid, 0, 0 ); conn->c_connid, 0, 0 );
#else #else
Debug( LDAP_DEBUG_TRACE, "connection_resched: " Debug( LDAP_DEBUG_TRACE, "connection_resched: "
@ -1744,9 +1743,9 @@ static int connection_op_activate( Operation *op )
} }
if (!op->o_dn.bv_len) { if (!op->o_dn.bv_len) {
op->o_authz = op->o_conn->c_authz; op->o_authz = op->o_conn->c_authz;
ber_dupbv( &op->o_dn, &op->o_conn->c_dn ); ber_dupbv( &op->o_dn, &op->o_conn->c_dn );
ber_dupbv( &op->o_ndn, &op->o_conn->c_ndn ); ber_dupbv( &op->o_ndn, &op->o_conn->c_ndn );
} }
op->o_authtype = op->o_conn->c_authtype; op->o_authtype = op->o_conn->c_authtype;
ber_dupbv( &op->o_authmech, &op->o_conn->c_authmech ); ber_dupbv( &op->o_authmech, &op->o_conn->c_authmech );
@ -1799,7 +1798,7 @@ int connection_write(ber_socket_t s)
if( c == NULL ) { if( c == NULL ) {
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, ERR, LDAP_LOG( CONNECTION, ERR,
"connection_write: sock %ld no connection!\n", (long)s, 0, 0); "connection_write: sock %ld no connection!\n", (long)s, 0, 0);
#else #else
Debug( LDAP_DEBUG_ANY, Debug( LDAP_DEBUG_ANY,
"connection_write(%ld): no connection!\n", "connection_write(%ld): no connection!\n",
@ -1814,7 +1813,7 @@ int connection_write(ber_socket_t s)
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG( CONNECTION, DETAIL1, LDAP_LOG( CONNECTION, DETAIL1,
"connection_write conn %lu waking output.\n", c->c_connid, 0, 0 ); "connection_write conn %lu waking output.\n", c->c_connid, 0, 0 );
#else #else
Debug( LDAP_DEBUG_TRACE, Debug( LDAP_DEBUG_TRACE,
"connection_write(%d): waking output for id=%lu\n", "connection_write(%d): waking output for id=%lu\n",