better error handling when returning results

[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 ed34a21b3c9702d35f80e30ae283028755dc3bca..3145ddd881ea556d9f375c72dcba0d8cb12477d1 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-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /* This is an altered version */
@@ -53,6 +53,7 @@ struct slap_op;
 struct ldapconn {
        struct slap_conn        *conn;
        LDAP            *ld;
+       struct berval   cred;
        struct berval   bound_dn;
        int             bound;
 };
@@ -74,11 +75,12 @@ struct ldapinfo {
        char *binddn;
        char *bindpw;
        ldap_pvt_thread_mutex_t         conn_mutex;
+       int savecred;
        Avlnode *conntree;
 #ifdef ENABLE_REWRITE
        struct rewrite_info *rwinfo;
 #else /* !ENABLE_REWRITE */
-       struct berval **suffix_massage;
+       BerVarray suffix_massage;
 #endif /* !ENABLE_REWRITE */
 
        struct ldapmap oc_map;
@@ -121,8 +123,10 @@ ldap_back_map_attrs(
 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 );
+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 */
 
 LDAP_END_DECL