Moved AttributeDescription caching into main code:

[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 fdbe1a2d9c0d4504ffb19f79e738e7719f58bee0..45fb33bea6074df2c6e7aeaae0fffac5c608025d 100644 (file)
--- a/servers/slapd/back-ldap/back-ldap.h
+++ b/servers/slapd/back-ldap/back-ldap.h
@@ -40,6 +40,11 @@
 
 #include "external.h"
 
+/* String rewrite library */
+#ifdef ENABLE_REWRITE
+#include "rewrite.h"
+#endif /* ENABLE_REWRITE */
+
 LDAP_BEGIN_DECL
 
 struct slap_conn;
@@ -52,16 +57,32 @@ struct ldapconn {
        int             bound;
 };
 
+struct ldapmap {
+       int drop_missing;
+
+       Avlnode *map;
+       Avlnode *remap;
+};
+
+struct ldapmapping {
+       char *src;
+       char *dst;
+};
+
 struct ldapinfo {
        char *url;
-#if 0 /* unused! */
-       char *suffix;
-#endif /* 0 */
-       char **suffix_massage;
        char *binddn;
        char *bindpw;
        ldap_pvt_thread_mutex_t         conn_mutex;
        Avlnode *conntree;
+#ifdef ENABLE_REWRITE
+       struct rewrite_info *rwinfo;
+#else /* !ENABLE_REWRITE */
+       char **suffix_massage;
+#endif /* !ENABLE_REWRITE */
+
+       struct ldapmap oc_map;
+       struct ldapmap at_map;
 };
 
 struct ldapconn *ldap_back_getconn(struct ldapinfo *li, struct slap_conn *conn,
@@ -74,9 +95,34 @@ int  back_ldap_LTX_init_module(int argc, char *argv[]);
 char *ldap_back_dn_massage(struct ldapinfo *li, char *dn, int normalized);
 char *ldap_back_dn_restore(struct ldapinfo *li, char *dn, int normalized);
 
-int conn_cmp(const void *, const void *);
-int conn_dup(void *, void *);
-                       
+extern int ldap_back_conn_cmp( const void *c1, const void *c2);
+extern int ldap_back_conn_dup( void *c1, void *c2 );
+
+int mapping_cmp (const void *, const void *);
+int mapping_dup (void *, void *);
+
+char *ldap_back_map ( struct ldapmap *map, char *s, int remap );
+char *
+ldap_back_map_filter(
+               struct ldapmap *at_map,
+               struct ldapmap *oc_map,
+               char *f,
+               int remap
+);
+char **
+ldap_back_map_attrs(
+               struct ldapmap *at_map,
+               char **a,
+               int remap
+);
+
+extern void mapping_free ( struct ldapmapping *mapping );
+
+#ifdef ENABLE_REWRITE
+extern int suffix_massage_config( struct rewrite_info *info, int argc, char **argv );
+extern int ldap_dnattr_rewrite( struct rewrite_info *rwinfo, struct berval **a_vals, void *cookie );
+#endif /* ENABLE_REWRITE */
+
 LDAP_END_DECL
 
 #endif