/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 2003-2006 The OpenLDAP Foundation.
+ * Copyright 2003-2011 The OpenLDAP Foundation.
* Portions Copyright 1999-2003 Howard Chu.
* Portions Copyright 2000-2003 Pierangelo Masarati.
* All rights reserved.
#include <ac/socket.h>
#include "slap.h"
+#include "config.h"
#include "back-ldap.h"
+static const ldap_extra_t ldap_extra = {
+ ldap_back_proxy_authz_ctrl,
+ ldap_back_controls_free,
+ slap_idassert_authzfrom_parse_cf,
+ slap_idassert_passthru_parse_cf,
+ slap_idassert_parse_cf,
+ slap_retry_info_destroy,
+ slap_retry_info_parse,
+ slap_retry_info_unparse,
+ ldap_back_connid2str
+};
+
int
ldap_back_open( BackendInfo *bi )
{
* and the entryTtl attribute */
SLAP_BFLAG_DYNAMIC |
#endif /* LDAP_DYNAMIC_OBJECTS */
- 0;
+
+ /* back-ldap recognizes RFC4525 increment;
+ * let the remote server complain, if needed (ITS#5912) */
+ SLAP_BFLAG_INCREMENT;
bi->bi_open = ldap_back_open;
bi->bi_config = 0;
bi->bi_connection_init = 0;
bi->bi_connection_destroy = ldap_back_conn_destroy;
+ bi->bi_extra = (void *)&ldap_extra;
+
+ rc = ldap_back_init_cf( bi );
+ if ( rc ) {
+ return rc;
+ }
+
rc = chain_initialize();
if ( rc ) {
return rc;
}
+ rc = pbind_initialize();
+ if ( rc ) {
+ return rc;
+ }
+
#ifdef SLAP_DISTPROC
rc = distproc_initialize();
if ( rc ) {
return rc;
}
#endif
-
- return ldap_back_init_cf( bi );
+ return rc;
}
int
-ldap_back_db_init( Backend *be )
+ldap_back_db_init( Backend *be, ConfigReply *cr )
{
ldapinfo_t *li;
int rc;
+ unsigned i;
li = (ldapinfo_t *)ch_calloc( 1, sizeof( ldapinfo_t ) );
if ( li == NULL ) {
ldap_pvt_thread_mutex_init( &li->li_conninfo.lai_mutex );
+ for ( i = LDAP_BACK_PCONN_FIRST; i < LDAP_BACK_PCONN_LAST; i++ ) {
+ li->li_conn_priv[ i ].lic_num = 0;
+ LDAP_TAILQ_INIT( &li->li_conn_priv[ i ].lic_priv );
+ }
+ li->li_conn_priv_max = LDAP_BACK_CONN_PRIV_DEFAULT;
+
be->be_private = li;
SLAP_DBFLAGS( be ) |= SLAP_DBFLAG_NOLASTMOD;
be->be_cf_ocs = be->bd_info->bi_cf_ocs;
rc = ldap_back_monitor_db_init( be );
+ if ( rc != 0 ) {
+ /* ignore, by now */
+ rc = 0;
+ }
return rc;
}
int
-ldap_back_db_open( BackendDB *be )
+ldap_back_db_open( BackendDB *be, ConfigReply *cr )
{
ldapinfo_t *li = (ldapinfo_t *)be->be_private;
- slap_bindconf sb = { 0 };
+ slap_bindconf sb = { BER_BVNULL };
int rc = 0;
Debug( LDAP_DEBUG_TRACE,
BER_BVSTR( &sb.sb_binddn, "" );
if ( LDAP_BACK_T_F_DISCOVER( li ) && !LDAP_BACK_T_F( li ) ) {
- int rc;
-
rc = slap_discover_feature( &sb,
slap_schema.si_ad_supportedFeatures->ad_cname.bv_val,
LDAP_FEATURE_ABSOLUTE_FILTERS );
if ( rc != 0 ) {
/* ignore by now */
rc = 0;
-#if 0
- goto fail;
-#endif
}
li->li_flags |= LDAP_BACK_F_ISOPEN;
-fail:;
return rc;
}
if ( !BER_BVISNULL( &lc->lc_local_ndn ) ) {
ch_free( lc->lc_local_ndn.bv_val );
}
+ lc->lc_q.tqe_prev = NULL;
+ lc->lc_q.tqe_next = NULL;
ch_free( lc );
}
int
-ldap_back_db_close( Backend *be )
+ldap_back_db_close( Backend *be, ConfigReply *cr )
{
int rc = 0;
}
int
-ldap_back_db_destroy( Backend *be )
+ldap_back_db_destroy( Backend *be, ConfigReply *cr )
{
if ( be->be_private ) {
ldapinfo_t *li = ( ldapinfo_t * )be->be_private;
+ unsigned i;
(void)ldap_back_monitor_db_destroy( be );
ber_bvarray_free( li->li_bvuri );
li->li_bvuri = NULL;
}
- if ( !BER_BVISNULL( &li->li_acl_authcID ) ) {
- ch_free( li->li_acl_authcID.bv_val );
- BER_BVZERO( &li->li_acl_authcID );
- }
- if ( !BER_BVISNULL( &li->li_acl_authcDN ) ) {
- ch_free( li->li_acl_authcDN.bv_val );
- BER_BVZERO( &li->li_acl_authcDN );
- }
- if ( !BER_BVISNULL( &li->li_acl_passwd ) ) {
- ch_free( li->li_acl_passwd.bv_val );
- BER_BVZERO( &li->li_acl_passwd );
- }
- if ( !BER_BVISNULL( &li->li_acl_sasl_mech ) ) {
- ch_free( li->li_acl_sasl_mech.bv_val );
- BER_BVZERO( &li->li_acl_sasl_mech );
- }
- if ( !BER_BVISNULL( &li->li_acl_sasl_realm ) ) {
- ch_free( li->li_acl_sasl_realm.bv_val );
- BER_BVZERO( &li->li_acl_sasl_realm );
- }
- if ( !BER_BVISNULL( &li->li_idassert_authcID ) ) {
- ch_free( li->li_idassert_authcID.bv_val );
- BER_BVZERO( &li->li_idassert_authcID );
- }
- if ( !BER_BVISNULL( &li->li_idassert_authcDN ) ) {
- ch_free( li->li_idassert_authcDN.bv_val );
- BER_BVZERO( &li->li_idassert_authcDN );
- }
- if ( !BER_BVISNULL( &li->li_idassert_passwd ) ) {
- ch_free( li->li_idassert_passwd.bv_val );
- BER_BVZERO( &li->li_idassert_passwd );
- }
- if ( !BER_BVISNULL( &li->li_idassert_authzID ) ) {
- ch_free( li->li_idassert_authzID.bv_val );
- BER_BVZERO( &li->li_idassert_authzID );
- }
- if ( !BER_BVISNULL( &li->li_idassert_sasl_mech ) ) {
- ch_free( li->li_idassert_sasl_mech.bv_val );
- BER_BVZERO( &li->li_idassert_sasl_mech );
- }
- if ( !BER_BVISNULL( &li->li_idassert_sasl_realm ) ) {
- ch_free( li->li_idassert_sasl_realm.bv_val );
- BER_BVZERO( &li->li_idassert_sasl_realm );
- }
+
+ bindconf_free( &li->li_tls );
+ bindconf_free( &li->li_acl );
+ bindconf_free( &li->li_idassert.si_bc );
+
if ( li->li_idassert_authz != NULL ) {
ber_bvarray_free( li->li_idassert_authz );
li->li_idassert_authz = NULL;
if ( li->li_conninfo.lai_tree ) {
avl_free( li->li_conninfo.lai_tree, ldap_back_conn_free );
}
+ for ( i = LDAP_BACK_PCONN_FIRST; i < LDAP_BACK_PCONN_LAST; i++ ) {
+ while ( !LDAP_TAILQ_EMPTY( &li->li_conn_priv[ i ].lic_priv ) ) {
+ ldapconn_t *lc = LDAP_TAILQ_FIRST( &li->li_conn_priv[ i ].lic_priv );
+
+ LDAP_TAILQ_REMOVE( &li->li_conn_priv[ i ].lic_priv, lc, lc_q );
+ ldap_back_conn_free( lc );
+ }
+ }
if ( LDAP_BACK_QUARANTINE( li ) ) {
slap_retry_info_destroy( &li->li_quarantine );
ldap_pvt_thread_mutex_destroy( &li->li_quarantine_mutex );
projects / openldap / blobdiff