From c5c1ddb1ca9bc33f49b89d79ef7376bb1b7d15aa Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Wed, 12 Jun 2002 08:38:59 +0000 Subject: [PATCH] Deleted Connection->c_cdn. Use conn->c_dn instead... --- servers/slapd/back-ldap/bind.c | 14 +++++++------- servers/slapd/back-meta/conn.c | 10 +++++----- servers/slapd/back-monitor/conn.c | 2 +- servers/slapd/bind.c | 11 +++++------ servers/slapd/connection.c | 9 --------- servers/slapd/slap.h | 1 - 6 files changed, 18 insertions(+), 29 deletions(-) diff --git a/servers/slapd/back-ldap/bind.c b/servers/slapd/back-ldap/bind.c index 2c1af55ef7..c0e532930a 100644 --- a/servers/slapd/back-ldap/bind.c +++ b/servers/slapd/back-ldap/bind.c @@ -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; diff --git a/servers/slapd/back-meta/conn.c b/servers/slapd/back-meta/conn.c index 66f820c979..8f17f60590 100644 --- a/servers/slapd/back-meta/conn.c +++ b/servers/slapd/back-meta/conn.c @@ -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; diff --git a/servers/slapd/back-monitor/conn.c b/servers/slapd/back-monitor/conn.c index ae877020b7..43ba3dc4e4 100644 --- a/servers/slapd/back-monitor/conn.c +++ b/servers/slapd/back-monitor/conn.c @@ -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, diff --git a/servers/slapd/bind.c b/servers/slapd/bind.c index 677d7dea1e..abd8ed182a 100644 --- a/servers/slapd/bind.c +++ b/servers/slapd/bind.c @@ -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 ); diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c index 037f4c759b..0f4ce390da 100644 --- a/servers/slapd/connection.c +++ b/servers/slapd/connection.c @@ -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; { diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h index f6009fee69..fb8ab890a5 100644 --- a/servers/slapd/slap.h +++ b/servers/slapd/slap.h @@ -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; -- 2.39.5