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 99fb67e88d143c1fb8197b207a64e1ef45a53e2d..45fb33bea6074df2c6e7aeaae0fffac5c608025d 100644 (file)
--- a/servers/slapd/back-ldap/back-ldap.h
+++ b/servers/slapd/back-ldap/back-ldap.h
@@ -1,5 +1,10 @@
 /* back-ldap.h - ldap backend header file */
-
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
+/* This is an altered version */
 /*
  * Copyright 1999, Howard Chu, All rights reserved. <hyc@highlandsun.com>
  * 
@@ -19,6 +24,15 @@
  *    ever read sources, credits should appear in the documentation.
  * 
  * 4. This notice may not be removed or altered.
+ *
+ *
+ *
+ * Copyright 2000, Pierangelo Masarati, All rights reserved. <ando@sys-net.it>
+ * 
+ * This software is being modified by Pierangelo Masarati.
+ * The previously reported conditions apply to the modified code as well.
+ * Changes in the original code are highlighted where required.
+ * Credits for the original code go to the author, Howard Chu.      
  */
 
 #ifndef SLAPD_LDAP_H
@@ -26,28 +40,88 @@
 
 #include "external.h"
 
+/* String rewrite library */
+#ifdef ENABLE_REWRITE
+#include "rewrite.h"
+#endif /* ENABLE_REWRITE */
+
 LDAP_BEGIN_DECL
 
 struct slap_conn;
 struct slap_op;
 
 struct ldapconn {
-       struct ldapconn *next;
        struct slap_conn        *conn;
        LDAP            *ld;
+       char            *bound_dn;
        int             bound;
 };
 
+struct ldapmap {
+       int drop_missing;
+
+       Avlnode *map;
+       Avlnode *remap;
+};
+
+struct ldapmapping {
+       char *src;
+       char *dst;
+};
+
 struct ldapinfo {
-       char *host;
-       int port;
-       char *suffix;
+       char *url;
+       char *binddn;
+       char *bindpw;
        ldap_pvt_thread_mutex_t         conn_mutex;
-       struct ldapconn *lcs;
+       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,
        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);
+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);
+
+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