refine fix to ITS#4315; apply it to back-meta as well

[openldap] / servers / slapd / back-meta / back-meta.h

diff --git a/servers/slapd/back-meta/back-meta.h b/servers/slapd/back-meta/back-meta.h
index 620bb93e14c96ef7976c3e43c5cb6adff728166e..4f27415c37a323e92054fc8b56ebd0857d977213 100644 (file)
--- a/servers/slapd/back-meta/back-meta.h
+++ b/servers/slapd/back-meta/back-meta.h
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2005 The OpenLDAP Foundation.
+ * Copyright 1999-2006 The OpenLDAP Foundation.
  * Portions Copyright 2001-2003 Pierangelo Masarati.
  * Portions Copyright 1999-2003 Howard Chu.
  * All rights reserved.
@@ -82,9 +82,6 @@ typedef struct dncookie {
 #endif
 } dncookie;
 
-/* TODO: allow to define it on a per-target basis */
-#define META_BIND_TIMEOUT      10000
-
 int ldap_back_dn_massage(dncookie *dc, struct berval *dn,
        struct berval *res);
 
@@ -166,10 +163,18 @@ typedef struct metasingleconn_t {
        LDAP                    *msc_ld;
        struct berval           msc_bound_ndn;
        struct berval           msc_cred;
+       unsigned                msc_mscflags;
+       /* NOTE: lc_lcflags is redefined to msc_mscflags to reuse the macros
+        * defined for back-ldap */
+#define        lc_lcflags              msc_mscflags
+#if 0
        int                     msc_bound;
 #define META_UNBOUND           0
 #define META_BOUND             1
 #define META_ANONYMOUS         2
+#endif
+
+       time_t                  msc_time;
 
        struct metainfo_t       *msc_info;
 } metasingleconn_t;
@@ -177,20 +182,31 @@ typedef struct metasingleconn_t {
 typedef struct metaconn_t {
        struct slap_conn        *mc_conn;
        ldap_pvt_thread_mutex_t mc_mutex;
+       unsigned                mc_refcnt;
+       int                     mc_tainted;
        
+       struct berval           mc_local_ndn;
+       /* NOTE: msc_mscflags is used to recycle the #define
+        * in metasingleconn_t */
+       unsigned                msc_mscflags;
+
        /*
         * means that the connection is bound; 
         * of course only one target actually is ...
         */
-       int                     mc_auth_target;
+       int                     mc_authz_target;
 #define META_BOUND_NONE                (-1)
 #define META_BOUND_ALL         (-2)
        /* supersedes the connection stuff */
-       metasingleconn_t        *mc_conns;
+       metasingleconn_t        mc_conns[ 1 ];
+       /* NOTE: mc_conns must be last, because
+        * the required number of conns is malloc'ed
+        * in one block with the metaconn_t structure */
 } metaconn_t;
 
 typedef struct metatarget_t {
        char                    *mt_uri;
+       int                     mt_scope;
 
        struct berval           mt_psuffix;             /* pretty suffix */
        struct berval           mt_nsuffix;             /* normalized suffix */
@@ -211,6 +227,11 @@ typedef struct metatarget_t {
 
        unsigned                mt_flags;
        int                     mt_version;
+       time_t                  mt_network_timeout;
+       time_t                  mt_idle_timeout;
+       struct timeval          mt_bind_timeout;
+#define META_BIND_TIMEOUT      10000
+       time_t                  mt_timeout[ LDAP_BACK_OP_LAST ];
 } metatarget_t;
 
 typedef struct metadncache_t {
@@ -218,38 +239,44 @@ typedef struct metadncache_t {
        Avlnode                 *tree;
 
 #define META_DNCACHE_DISABLED   (0)
-#define META_DNCACHE_FOREVER    (-1)
-       long int                ttl;  /* seconds; 0: no cache, -1: no expiry */
+#define META_DNCACHE_FOREVER    ((time_t)(-1))
+       time_t                  ttl;  /* seconds; 0: no cache, -1: no expiry */
 } metadncache_t;
 
+typedef struct metacandidates_t {
+       int                     mc_ntargets;
+       SlapReply               *mc_candidates;
+} metacandidates_t;
+
 typedef struct metainfo_t {
        int                     mi_ntargets;
        int                     mi_defaulttarget;
-       int                     mi_network_timeout;
 #define META_DEFAULT_TARGET_NONE       (-1)
        int                     mi_nretries;
 
        metatarget_t            *mi_targets;
-       SlapReply               *mi_candidates;
+       metacandidates_t        *mi_candidates;
 
        metadncache_t           mi_cache;
        
-       ldap_pvt_thread_mutex_t mi_conn_mutex;
-       Avlnode                 *mi_conntree;
+       ldap_avl_info_t         mi_conninfo;
 
-       unsigned                flags;
-#if 0
-/* defined in <back-ldap/back-ldap.h> */
-#define LDAP_BACK_F_NONE               0x00U
-#define LDAP_BACK_F_SAVECRED           0x01U
-#define LDAP_BACK_F_USE_TLS            0x02U
-#define LDAP_BACK_F_PROPAGATE_TLS      0x04U
-#define LDAP_BACK_F_TLS_CRITICAL       0x08U
-#define LDAP_BACK_F_TLS_MASK           (LDAP_BACK_F_USE_TLS|LDAP_BACK_F_PROPAGATE_TLS|LDAP_BACK_F_TLS_CRITICAL)
-#define LDAP_BACK_F_CHASE_REFERRALS    0x10U
-#endif
+       unsigned                mi_flags;
+#define        li_flags                mi_flags
+/* uses flags as defined in <back-ldap/back-ldap.h> */
+#define        META_BACK_F_ONERR_STOP          0x00010000U
+#define        META_BACK_F_DEFER_ROOTDN_BIND   0x00020000U
+
+#define        META_BACK_ONERR_STOP(mi)        ( (mi)->mi_flags & META_BACK_F_ONERR_STOP )
+#define        META_BACK_ONERR_CONTINUE(mi)    ( !META_BACK_ONERR_CONTINUE( (mi) ) )
+
+#define META_BACK_DEFER_ROOTDN_BIND(mi)        ( (mi)->mi_flags & META_BACK_F_DEFER_ROOTDN_BIND )
 
        int                     mi_version;
+       time_t                  mi_network_timeout;
+       time_t                  mi_idle_timeout;
+       struct timeval          mi_bind_timeout;
+       time_t                  mi_timeout[ LDAP_BACK_OP_LAST ];
 } metainfo_t;
 
 typedef enum meta_op_type {
@@ -268,6 +295,11 @@ meta_back_getconn(
        int                     *candidate,
        ldap_back_send_t        sendok );
 
+extern void
+meta_back_release_conn(
+               Operation               *op,
+       metaconn_t              *mc );
+
 extern int
 meta_back_retry(
        Operation               *op,
@@ -277,14 +309,17 @@ meta_back_retry(
        ldap_back_send_t        sendok );
 
 extern void
-meta_back_conn_free( metaconn_t *mc );
+meta_back_conn_free(
+       void                    *v_mc );
 
 extern int
 meta_back_init_one_conn(
        Operation               *op,
        SlapReply               *rs,
        metatarget_t            *mt, 
-       metasingleconn_t        *msc,
+       metaconn_t              *mc,
+       int                     candidate,
+       int                     ispriv,
        ldap_back_send_t        sendok );
 
 extern int
@@ -301,7 +336,8 @@ meta_back_single_dobind(
        metaconn_t              *msc,
        int                     candidate,
        ldap_back_send_t        sendok,
-       int                     retries );
+       int                     retries,
+       int                     dolock );
 
 extern int
 meta_back_op_result(
@@ -331,6 +367,7 @@ meta_back_conn_dup(
 extern int
 meta_back_is_candidate(
        struct berval           *nsuffix,
+       int                     suffixscope,
        struct berval           *ndn,
        int                     scope );
 
@@ -382,6 +419,8 @@ meta_dncache_delete_entry(
 extern void
 meta_dncache_free( void *entry );
 
+extern LDAP_REBIND_PROC                *meta_back_rebind_f;
+
 LDAP_END_DECL
 
 #endif /* SLAPD_META_H */