Merge remote branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / servers / slapd / overlays / rwm.h

diff --git a/servers/slapd/overlays/rwm.h b/servers/slapd/overlays/rwm.h
index f2bc816a0947619c5e038bfa4e42a9175e867708..493f6dc4510bac86f1ba5a969bb0ad875d36271e 100644 (file)
--- a/servers/slapd/overlays/rwm.h
+++ b/servers/slapd/overlays/rwm.h
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2007 The OpenLDAP Foundation.
+ * Copyright 1999-2012 The OpenLDAP Foundation.
  * Portions Copyright 1999-2003 Howard Chu.
  * Portions Copyright 2000-2003 Pierangelo Masarati.
  * All rights reserved.
@@ -81,6 +81,7 @@ struct ldaprwmap {
 
 #define        RWM_F_NONE                      (0x0000U)
 #define        RWM_F_NORMALIZE_MAPPED_ATTRS    (0x0001U)
+#define        RWM_F_DROP_UNREQUESTED_ATTRS    (0x0002U)
 #define        RWM_F_SUPPORT_T_F               (0x4000U)
 #define        RWM_F_SUPPORT_T_F_DISCOVER      (0x8000U)
 #define        RWM_F_SUPPORT_T_F_MASK          (RWM_F_SUPPORT_T_F)
@@ -119,15 +120,18 @@ rwm_map_filter(
                struct ldapmap *oc_map,
                struct berval *f );
 
+#if 0 /* unused! */
 int
 rwm_map_attrs(
                struct ldapmap *at_map,
                AttributeName *a,
                int remap,
                char ***mapped_attrs );
+#endif
 
 int
 rwm_map_attrnames(
+               Operation *op,
                struct ldapmap *at_map,
                struct ldapmap *oc_map,
                AttributeName *an,
@@ -175,7 +179,7 @@ rwm_referral_rewrite(
        void                    *cookie,
        BerVarray               a_vals,
        BerVarray               *pa_nvals );
-extern int rwm_dnattr_result_rewrite( dncookie *dc, BerVarray a_vals );
+extern int rwm_dnattr_result_rewrite( dncookie *dc, BerVarray a_vals, BerVarray a_nvals );
 extern int rwm_referral_result_rewrite( dncookie *dc, BerVarray a_vals );
 
 LDAP_END_DECL