This commit is contained in:
Kurt Zeilenga 2003-11-18 22:11:11 +00:00
parent 72cfae7264
commit 99ba95ab92

View file

@ -364,8 +364,7 @@ long connection_init(
"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;
} }
@ -383,7 +382,6 @@ 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++) {
@ -396,8 +394,10 @@ long connection_init(
} }
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 );
@ -413,7 +413,7 @@ long connection_init(
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,
@ -1496,8 +1496,8 @@ connection_input(
"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;
@ -1510,8 +1510,8 @@ connection_input(
"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 );
@ -1530,8 +1530,7 @@ connection_input(
"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;