--- servers/slapd/back-meta/back-meta.h 2005/08/17 16:15:36 1.23.2.9
+++ servers/slapd/back-meta/back-meta.h 2005/09/28 00:30:33 1.23.2.10
@@ -1,4 +1,4 @@
-/* $OpenLDAP: pkg/ldap/servers/slapd/back-meta/back-meta.h,v 1.47 2005/08/17 06:34:49 ando Exp $ */
+/* $OpenLDAP: pkg/ldap/servers/slapd/back-meta/back-meta.h,v 1.48 2005/09/24 16:39:26 ando Exp $ */
/* This work is part of OpenLDAP Software .
*
* Copyright 1999-2005 The OpenLDAP Foundation.
@@ -166,10 +166,16 @@ 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
struct metainfo_t *msc_info;
} metasingleconn_t;
@@ -179,11 +185,16 @@ typedef struct metaconn_t {
ldap_pvt_thread_mutex_t mc_mutex;
unsigned mc_refcnt;
+ 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 */
@@ -258,10 +269,14 @@ typedef struct metainfo_t {
unsigned flags;
/* uses flags as defined in */
-#define META_BACK_F_ONERR_STOP 0x00010000U
+#define META_BACK_F_ONERR_STOP 0x00010000U
+#define META_BACK_F_DEFER_ROOTDN_BIND 0x00020000U
+
#define META_BACK_ONERR_STOP(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)->flags & META_BACK_F_DEFER_ROOTDN_BIND )
+
int mi_version;
time_t mi_timeout[ META_OP_LAST ];
} metainfo_t;
@@ -404,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 */