assert( c != NULL );
if( c->c_struct_state == SLAP_C_UNINITIALIZED ) {
- c->c_authmech = NULL;
+ c->c_authmech.bv_val = NULL;
+ c->c_authmech.bv_len = 0;
c->c_dn.bv_val = NULL;
c->c_dn.bv_len = 0;
c->c_ndn.bv_val = NULL;
c->c_ndn.bv_len = 0;
- c->c_cdn = NULL;
+ c->c_cdn.bv_val = NULL;
+ c->c_cdn.bv_len = 0;
c->c_groups = NULL;
- c->c_listener_url = NULL;
- c->c_peer_domain = NULL;
- c->c_peer_name = NULL;
- c->c_sock_name = NULL;
+ c->c_listener_url.bv_val = NULL;
+ c->c_listener_url.bv_len = 0;
+ c->c_peer_domain.bv_val = NULL;
+ c->c_peer_domain.bv_len = 0;
+ c->c_peer_name.bv_val = NULL;
+ c->c_peer_name.bv_len = 0;
+ c->c_sock_name.bv_val = NULL;
+ c->c_sock_name.bv_len = 0;
LDAP_STAILQ_INIT(&c->c_ops);
LDAP_STAILQ_INIT(&c->c_pending_ops);
- c->c_sasl_bind_mech = NULL;
+ c->c_sasl_bind_mech.bv_val = NULL;
+ c->c_sasl_bind_mech.bv_len = 0;
c->c_sasl_context = NULL;
c->c_sasl_extra = NULL;
ldap_pvt_thread_mutex_lock( &c->c_mutex );
assert( c->c_struct_state == SLAP_C_UNUSED );
- assert( c->c_authmech == NULL );
- assert( c->c_dn.bv_val == NULL );
- assert( c->c_ndn.bv_val == NULL );
- assert( c->c_cdn == NULL );
+ assert( c->c_authmech.bv_val == NULL );
+ assert( c->c_dn.bv_val == NULL );
+ assert( c->c_ndn.bv_val == NULL );
+ assert( c->c_cdn.bv_val == NULL );
assert( c->c_groups == NULL );
- assert( c->c_listener_url == NULL );
- assert( c->c_peer_domain == NULL );
- assert( c->c_peer_name == NULL );
- assert( c->c_sock_name == NULL );
+ assert( c->c_listener_url.bv_val == NULL );
+ assert( c->c_peer_domain.bv_val == NULL );
+ assert( c->c_peer_name.bv_val == NULL );
+ assert( c->c_sock_name.bv_val == NULL );
assert( LDAP_STAILQ_EMPTY(&c->c_ops) );
assert( LDAP_STAILQ_EMPTY(&c->c_pending_ops) );
- assert( c->c_sasl_bind_mech == NULL );
+ assert( c->c_sasl_bind_mech.bv_val == NULL );
assert( c->c_sasl_context == NULL );
assert( c->c_sasl_extra == NULL );
assert( c->c_currentber == NULL );
- c->c_listener_url = ch_strdup( url );
- c->c_peer_domain = ch_strdup( dnsname );
- c->c_peer_name = ch_strdup( peername );
- c->c_sock_name = ch_strdup( sockname );
+ ber_str2bv( url, 0, 1, &c->c_listener_url );
+ ber_str2bv( dnsname, 0, 1, &c->c_peer_domain );
+ ber_str2bv( peername, 0, 1, &c->c_peer_name );
+ ber_str2bv( sockname, 0, 1, &c->c_sock_name );
c->c_n_ops_received = 0;
c->c_n_ops_executing = 0;
#endif
ber_sockbuf_add_io( c->c_sb, &ber_sockbuf_io_udp,
LBER_SBIOD_LEVEL_PROVIDER, (void *)&s );
+ ber_sockbuf_add_io( c->c_sb, &ber_sockbuf_io_readahead,
+ LBER_SBIOD_LEVEL_PROVIDER, NULL );
} else
#endif
{
ber_sockbuf_add_io( c->c_sb, &ber_sockbuf_io_tcp,
LBER_SBIOD_LEVEL_PROVIDER, (void *)&s );
}
- ber_sockbuf_add_io( c->c_sb, &ber_sockbuf_io_readahead,
- LBER_SBIOD_LEVEL_PROVIDER, NULL );
#ifdef LDAP_DEBUG
ber_sockbuf_add_io( c->c_sb, &ber_sockbuf_io_debug,
ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_SET_MAX_INCOMING, &max );
}
- if(c->c_authmech != NULL ) {
- free(c->c_authmech);
- c->c_authmech = NULL;
+ if(c->c_authmech.bv_val != NULL ) {
+ free(c->c_authmech.bv_val);
+ c->c_authmech.bv_val = NULL;
}
+ c->c_authmech.bv_len = 0;
if(c->c_dn.bv_val != NULL) {
free(c->c_dn.bv_val);
}
c->c_ndn.bv_len = 0;
- if(c->c_cdn != NULL) {
- free(c->c_cdn);
- c->c_cdn = NULL;
+ if(c->c_cdn.bv_val != NULL) {
+ free(c->c_cdn.bv_val);
+ c->c_cdn.bv_val = NULL;
}
+ c->c_cdn.bv_len = 0;
c->c_authc_backend = NULL;
c->c_authz_backend = NULL;
GroupAssertion *g, *n;
for (g = c->c_groups; g; g=n)
{
- n = g->next;
+ n = g->ga_next;
free(g);
}
c->c_groups = NULL;
connection2anonymous( c );
- if(c->c_listener_url != NULL) {
- free(c->c_listener_url);
- c->c_listener_url = NULL;
+ if(c->c_listener_url.bv_val != NULL) {
+ free(c->c_listener_url.bv_val);
+ c->c_listener_url.bv_val = NULL;
}
+ c->c_listener_url.bv_len = 0;
- if(c->c_peer_domain != NULL) {
- free(c->c_peer_domain);
- c->c_peer_domain = NULL;
+ if(c->c_peer_domain.bv_val != NULL) {
+ free(c->c_peer_domain.bv_val);
+ c->c_peer_domain.bv_val = NULL;
}
- if(c->c_peer_name != NULL) {
+ c->c_peer_domain.bv_len = 0;
+ if(c->c_peer_name.bv_val != NULL) {
#ifdef LDAP_PF_lOCAL
/*
* If peer was a domain socket, unlink. Mind you,
* they may be un-named. Should we leave this to
* the client?
*/
- if (strncmp(c->c_peer_name, "PATH=", 5) == 0) {
- char *path = c->c_peer_name + 5;
+ if (strncmp(c->c_peer_name.bv_val, "PATH=", 5) == 0) {
+ char *path = c->c_peer_name.bv_val + 5;
if (path != '\0') {
(void)unlink(path);
}
}
#endif /* LDAP_PF_LOCAL */
- free(c->c_peer_name);
- c->c_peer_name = NULL;
+ free(c->c_peer_name.bv_val);
+ c->c_peer_name.bv_val = NULL;
}
- if(c->c_sock_name != NULL) {
- free(c->c_sock_name);
- c->c_sock_name = NULL;
+ c->c_peer_name.bv_len = 0;
+ if(c->c_sock_name.bv_val != NULL) {
+ free(c->c_sock_name.bv_val);
+ c->c_sock_name.bv_val = NULL;
}
+ c->c_sock_name.bv_len = 0;
c->c_sasl_bind_in_progress = 0;
- if(c->c_sasl_bind_mech != NULL) {
- free(c->c_sasl_bind_mech);
- c->c_sasl_bind_mech = NULL;
+ if(c->c_sasl_bind_mech.bv_val != NULL) {
+ free(c->c_sasl_bind_mech.bv_val);
+ c->c_sasl_bind_mech.bv_val = NULL;
}
+ c->c_sasl_bind_mech.bv_len = 0;
slap_sasl_close( c );
conn->c_ndn.bv_val : "" );
}
arg->co_op->o_authtype = conn->c_authtype;
- arg->co_op->o_authmech = conn->c_authmech != NULL
- ? ch_strdup( conn->c_authmech ) : NULL;
+ ber_dupbv( &arg->co_op->o_authmech, &conn->c_authmech );
if (!arg->co_op->o_protocol) {
arg->co_op->o_protocol = conn->c_protocol
return 0;
}
-
-/*
- * Create client side and server side connection structures, connected to
- * one another, for the front end to use for searches on arbitrary back ends.
- */
-
-int connection_internal_open( Connection **conn, LDAP **ldp, const char *id )
-{
- int rc;
- ber_socket_t fd[2] = {-1,-1};
- Operation *op;
-
- *conn=NULL;
- *ldp=NULL;
-
- rc = lutil_pair( fd );
- if( rc == -1 ) {
- return LDAP_OTHER;
- }
-
- rc = connection_init( fd[1], "INT", "localhost",
- "localhost:0", "localhost:00", 0, 256, id );
- if( rc < 0 ) {
- tcp_close( fd[0] );
- tcp_close( fd[1] );
- return LDAP_OTHER;
- }
- slapd_add_internal( fd[1] );
-
- /* A search operation, number 0 */
- op = slap_op_alloc( NULL, 0, LDAP_REQ_SEARCH, 0);
- op->o_ndn.bv_val = ch_strdup( id );
- op->o_ndn.bv_len = strlen( id );
- op->o_protocol = LDAP_VERSION3;
-
- (*conn) = connection_get( fd[1] );
- LDAP_STAILQ_INSERT_HEAD( &(*conn)->c_ops, op, o_next);
- (*conn)->c_conn_state = SLAP_C_ACTIVE;
-
- /* Create the client side of the connection */
- rc = ldap_open_internal_connection( ldp, &(fd[0]) );
- if( rc != LDAP_SUCCESS ) {
- tcp_close( fd[0] );
- return LDAP_OTHER;
- }
-
- /* The connection_get() will have locked the connection's mutex */
- ldap_pvt_thread_mutex_unlock( &((*conn)->c_mutex) );
-
- return LDAP_SUCCESS;
-}
-
-
-void connection_internal_close( Connection *conn )
-{
- Operation *op = LDAP_STAILQ_FIRST(&conn->c_ops);
-
- LDAP_STAILQ_REMOVE_HEAD(&conn->c_ops, o_next);
- LDAP_STAILQ_NEXT(op, o_next) = NULL;
- slap_op_free( op );
- connection_closing( conn );
- connection_close( conn );
-}
projects / openldap / blobdiff