Free IDL_CACHE locks

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

diff --git a/servers/slapd/back-ldap/back-ldap.h b/servers/slapd/back-ldap/back-ldap.h
index ff9b9f33d596c8a921ecdb20a27cd8fd6bb6fad1..dc67f7e1586c0a964f097e8cf992bec23afd4723 100644 (file)
--- a/servers/slapd/back-ldap/back-ldap.h
+++ b/servers/slapd/back-ldap/back-ldap.h
@@ -1,7 +1,7 @@
 /* back-ldap.h - ldap backend header file */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /* This is an altered version */
@@ -49,13 +49,16 @@ LDAP_BEGIN_DECL
 
 struct slap_conn;
 struct slap_op;
+struct slap_backend_db;
 
 struct ldapconn {
        struct slap_conn        *conn;
        LDAP            *ld;
        struct berval   cred;
        struct berval   bound_dn;
+       struct berval   local_dn;
        int             bound;
+       ldap_pvt_thread_mutex_t         lc_mutex;
 };
 
 struct ldapmap {
@@ -70,13 +73,35 @@ struct ldapmapping {
        struct berval dst;
 };
 
+struct ldaprwmap {
+       /*
+        * DN rewriting
+        */
+#ifdef ENABLE_REWRITE
+       struct rewrite_info *rwm_rw;
+#else /* !ENABLE_REWRITE */
+       /* some time the suffix massaging without librewrite
+        * will be disabled */
+       BerVarray rwm_suffix_massage;
+#endif /* !ENABLE_REWRITE */
+
+       /*
+        * Attribute/objectClass mapping
+        */
+       struct ldapmap rwm_oc;
+       struct ldapmap rwm_at;
+};
+
 struct ldapinfo {
+       struct slap_backend_db  *be;
        char *url;
-       char *binddn;
-       char *bindpw;
+       struct berval binddn;
+       struct berval bindpw;
        ldap_pvt_thread_mutex_t         conn_mutex;
        int savecred;
        Avlnode *conntree;
+
+#if 0
 #ifdef ENABLE_REWRITE
        struct rewrite_info *rwinfo;
 #else /* !ENABLE_REWRITE */
@@ -85,27 +110,48 @@ struct ldapinfo {
 
        struct ldapmap oc_map;
        struct ldapmap at_map;
+#endif
+
+       struct ldaprwmap rwmap;
 };
 
-struct ldapconn *ldap_back_getconn(struct ldapinfo *li, struct slap_conn *conn,
-       struct slap_op *op);
-int ldap_back_dobind(struct ldapconn *lc, Operation *op);
-int ldap_back_map_result(int err);
-int ldap_back_op_result(struct ldapconn *lc, Operation *op);
+/* Whatever context ldap_back_dn_massage needs... */
+typedef struct dncookie {
+       struct ldaprwmap *rwmap;
+
+#ifdef ENABLE_REWRITE
+       Connection *conn;
+       char *ctx;
+       SlapReply *rs;
+#else
+       int normalized;
+       int tofrom;
+#endif
+} dncookie;
+
+struct ldapconn *ldap_back_getconn(struct slap_op *op, struct slap_rep *rs);
+int ldap_back_dobind(struct ldapconn *lc, Operation *op, SlapReply *rs);
+int ldap_back_map_result(SlapReply *rs);
+int ldap_back_op_result(struct ldapconn *lc, Operation *op, SlapReply *rs,
+       ber_int_t msgid, int sendok);
 int    back_ldap_LTX_init_module(int argc, char *argv[]);
 
-void ldap_back_dn_massage(struct ldapinfo *li, struct berval *dn,
-       struct berval *res, int normalized, int tofrom);
+int ldap_back_dn_massage(dncookie *dc, struct berval *dn,
+       struct berval *res);
 
 extern int ldap_back_conn_cmp( const void *c1, const void *c2);
 extern int ldap_back_conn_dup( void *c1, void *c2 );
+extern void ldap_back_conn_free( void *c );
 
+/* attributeType/objectClass mapping */
 int mapping_cmp (const void *, const void *);
 int mapping_dup (void *, void *);
 
 void ldap_back_map_init ( struct ldapmap *lm, struct ldapmapping ** );
 void ldap_back_map ( struct ldapmap *map, struct berval *s, struct berval *m,
        int remap );
+#define BACKLDAP_MAP   0
+#define BACKLDAP_REMAP 1
 char *
 ldap_back_map_filter(
                struct ldapmap *at_map,
@@ -113,22 +159,41 @@ ldap_back_map_filter(
                struct berval *f,
                int remap
 );
-char **
+
+int
 ldap_back_map_attrs(
                struct ldapmap *at_map,
                AttributeName *a,
-               int remap
+               int remap,
+               char ***mapped_attrs
 );
 
 extern void mapping_free ( void *mapping );
 
+extern int ldap_back_map_config(
+               struct ldapmap  *oc_map,
+               struct ldapmap  *at_map,
+               const char      *fname,
+               int             lineno,
+               int             argc,
+               char            **argv );
+
+extern int
+ldap_back_filter_map_rewrite(
+               dncookie                *dc,
+               Filter                  *f,
+               struct berval           *fstr,
+               int                     remap );
+
+/* suffix massaging by means of librewrite */
 #ifdef ENABLE_REWRITE
 extern int suffix_massage_config( struct rewrite_info *info,
                struct berval *pvnc, struct berval *nvnc,
                struct berval *prnc, struct berval *nrnc);
-extern int ldap_dnattr_rewrite( struct rewrite_info *rwinfo, BerVarray a_vals, void *cookie );
 #endif /* ENABLE_REWRITE */
+extern int ldap_dnattr_rewrite( dncookie *dc, BerVarray a_vals );
+extern int ldap_dnattr_result_rewrite( dncookie *dc, BerVarray a_vals );
 
 LDAP_END_DECL
 
-#endif
+#endif /* SLAPD_LDAP_H */