fix previous commit

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

diff --git a/servers/slapd/overlays/rwm.h b/servers/slapd/overlays/rwm.h
index 9d3cf31f418a59cdca7f441580bdd1497c5b6701..59e440c58744beb2a70b0c8a07b0f22714d008d1 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-2004 The OpenLDAP Foundation.
+ * Copyright 1999-2005 The OpenLDAP Foundation.
  * Portions Copyright 1999-2003 Howard Chu.
  * Portions Copyright 2000-2003 Pierangelo Masarati.
  * All rights reserved.
@@ -31,6 +31,9 @@
 
 LDAP_BEGIN_DECL
 
+/* define to enable referral DN massage by default */
+#undef RWM_REFERRAL_REWRITE
+
 struct ldapmap {
        int drop_missing;
 
@@ -87,14 +90,16 @@ typedef struct dncookie {
        Connection *conn;
        char *ctx;
        SlapReply *rs;
-#else
+#else /* !ENABLE_REWRITE */
        int normalized;
        int tofrom;
-#endif
+#endif /* !ENABLE_REWRITE */
 } dncookie;
 
-int rwm_dn_massage( dncookie *dc, struct berval *in,
-       struct berval *dn, struct berval *ndn );
+int rwm_dn_massage( dncookie *dc, struct berval *in, struct berval *dn );
+int rwm_dn_massage_pretty( dncookie *dc, struct berval *in, struct berval *pdn );
+int rwm_dn_massage_normalize( dncookie *dc, struct berval *in, struct berval *ndn );
+int rwm_dn_massage_pretty_normalize( dncookie *dc, struct berval *in, struct berval *pdn, struct berval *ndn );
 
 /* attributeType/objectClass mapping */
 int rwm_mapping_cmp (const void *, const void *);
@@ -156,7 +161,14 @@ extern int rwm_dnattr_rewrite(
        void                    *cookie,
        BerVarray               a_vals,
        BerVarray               *pa_nvals );
+extern int rwm_referral_rewrite(
+       Operation               *op,
+       SlapReply               *rs,
+       void                    *cookie,
+       BerVarray               a_vals,
+       BerVarray               *pa_nvals );
 extern int rwm_dnattr_result_rewrite( dncookie *dc, BerVarray a_vals );
+extern int rwm_referral_result_rewrite( dncookie *dc, BerVarray a_vals );
 
 LDAP_END_DECL