Commit c5c1ddb1 authored by Howard Chu's avatar Howard Chu
Browse files

Deleted Connection->c_cdn. Use conn->c_dn instead...

parent 674c55f7
......@@ -242,7 +242,7 @@ ldap_back_getconn(struct ldapinfo *li, Connection *conn, Operation *op)
( void )rewrite_session_init( li->rwinfo, conn );
#endif /* ENABLE_REWRITE */
if ( lc->conn->c_cdn.bv_len != 0 ) {
if ( lc->conn->c_dn.bv_len != 0 ) {
/*
* Rewrite the bind dn if needed
......@@ -251,23 +251,23 @@ ldap_back_getconn(struct ldapinfo *li, Connection *conn, Operation *op)
lc->bound_dn.bv_val = NULL;
lc->bound_dn.bv_len = 0;
switch ( rewrite_session( li->rwinfo, "bindDn",
lc->conn->c_cdn.bv_val, conn,
lc->conn->c_dn.bv_val, conn,
&lc->bound_dn.bv_val ) ) {
case REWRITE_REGEXEC_OK:
if ( lc->bound_dn.bv_val == NULL ) {
ber_dupbv( &lc->bound_dn, &lc->conn->c_cdn );
ber_dupbv( &lc->bound_dn, &lc->conn->c_dn );
}
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"[rw] bindDn: \"%s\" ->"
" \"%s\"\n%s",
lc->conn->c_cdn.bv_val,
lc->conn->c_dn.bv_val,
lc->bound_dn.bv_val ));
#else /* !NEW_LOGGING */
Debug( LDAP_DEBUG_ARGS,
"rw> bindDn: \"%s\" ->"
" \"%s\"\n%s",
lc->conn->c_cdn.bv_val,
lc->conn->c_dn.bv_val,
lc->bound_dn.bv_val, "" );
#endif /* !NEW_LOGGING */
break;
......@@ -288,8 +288,8 @@ ldap_back_getconn(struct ldapinfo *li, Connection *conn, Operation *op)
}
#else /* !ENABLE_REWRITE */
struct berval bv;
ldap_back_dn_massage( li, &lc->conn->c_cdn, &bv, 0, 1 );
if ( bv.bv_val == lc->conn->c_cdn.bv_val )
ldap_back_dn_massage( li, &lc->conn->c_dn, &bv, 0, 1 );
if ( bv.bv_val == lc->conn->c_dn.bv_val )
ber_dupbv( &lc->bound_dn, &bv );
else
lc->bound_dn = bv;
......
......@@ -275,27 +275,27 @@ init_one_conn(
/*
* If the connection dn is not null, an attempt to rewrite it is made
*/
if ( conn->c_cdn.bv_len != 0 ) {
if ( conn->c_dn.bv_len != 0 ) {
/*
* Rewrite the bind dn if needed
*/
lsc->bound_dn.bv_val = NULL;
switch ( rewrite_session( lt->rwinfo, "bindDn",
conn->c_cdn.bv_val, conn,
conn->c_dn.bv_val, conn,
&lsc->bound_dn.bv_val ) ) {
case REWRITE_REGEXEC_OK:
if ( lsc->bound_dn.bv_val == NULL ) {
ber_dupbv( &lsc->bound_dn, &conn->c_cdn );
ber_dupbv( &lsc->bound_dn, &conn->c_dn );
}
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"[rw] bindDn: \"%s\" -> \"%s\"\n",
conn->c_cdn.bv_val, lsc->bound_dn.bv_val ));
conn->c_dn.bv_val, lsc->bound_dn.bv_val ));
#else /* !NEW_LOGGING */
Debug( LDAP_DEBUG_ARGS,
"rw> bindDn: \"%s\" -> \"%s\"\n",
conn->c_cdn.bv_val, lsc->bound_dn.bv_val, 0 );
conn->c_dn.bv_val, lsc->bound_dn.bv_val, 0 );
#endif /* !NEW_LOGGING */
break;
......
......@@ -322,7 +322,7 @@ conn_create(
connection_state2str( c->c_conn_state ),
c->c_sasl_bind_in_progress ? "S" : "",
c->c_cdn.bv_len ? c->c_cdn.bv_val : SLAPD_ANONYMOUS,
c->c_dn.bv_len ? c->c_dn.bv_val : SLAPD_ANONYMOUS,
c->c_listener_url.bv_val,
c->c_peer_domain.bv_val,
......
......@@ -497,11 +497,10 @@ do_bind(
if(edn.bv_len) {
conn->c_dn = edn;
} else {
ber_dupbv( &conn->c_dn, &pdn );
conn->c_dn = pdn;
pdn.bv_val = NULL;
pdn.bv_len = 0;
}
conn->c_cdn = pdn;
pdn.bv_val = NULL;
pdn.bv_len = 0;
conn->c_ndn = ndn;
ndn.bv_val = NULL;
......@@ -516,11 +515,11 @@ do_bind(
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
"do_bind: conn %d v%d bind: \"%s\" to \"%s\" \n",
conn->c_connid, version, conn->c_cdn.bv_val, conn->c_dn.bv_val ));
conn->c_connid, version, dn.bv_val, conn->c_dn.bv_val ));
#else
Debug( LDAP_DEBUG_TRACE,
"do_bind: v%d bind: \"%s\" to \"%s\"\n",
version, conn->c_cdn.bv_val, conn->c_dn.bv_val );
version, dn.bv_val, conn->c_dn.bv_val );
#endif
ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
......
......@@ -417,8 +417,6 @@ long connection_init(
c->c_dn.bv_len = 0;
c->c_ndn.bv_val = NULL;
c->c_ndn.bv_len = 0;
c->c_cdn.bv_val = NULL;
c->c_cdn.bv_len = 0;
c->c_groups = NULL;
c->c_listener_url.bv_val = NULL;
......@@ -461,7 +459,6 @@ long connection_init(
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.bv_val == NULL );
assert( c->c_peer_domain.bv_val == NULL );
......@@ -598,12 +595,6 @@ void connection2anonymous( Connection *c )
}
c->c_ndn.bv_len = 0;
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_authz_backend = NULL;
{
......
......@@ -1550,7 +1550,6 @@ typedef struct slap_conn {
int c_sasl_bind_in_progress; /* multi-op bind in progress */
struct berval c_sasl_bind_mech; /* mech in progress */
struct berval c_sasl_dn; /* temporary storage */
struct berval c_cdn;
/* authorization backend */
Backend *c_authz_backend;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment