--- servers/slapd/overlays/rwm.c	2005/01/24 21:28:53	1.37.2.3
+++ servers/slapd/overlays/rwm.c	2005/02/02 17:32:45	1.37.2.4
@@ -1,5 +1,5 @@
 /* rwm.c - rewrite/remap operations */
-/* $OpenLDAP: pkg/ldap/servers/slapd/overlays/rwm.c,v 1.45 2005/01/20 21:44:54 ando Exp $ */
+/* $OpenLDAP: pkg/ldap/servers/slapd/overlays/rwm.c,v 1.37.2.3 2005/01/24 21:28:53 kurt Exp $ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
  * Copyright 2003-2005 The OpenLDAP Foundation.
@@ -785,7 +785,7 @@ rwm_matched( Operation *op, SlapReply *r
 }
 
 static int
-rwm_attrs( Operation *op, SlapReply *rs, Attribute** a_first )
+rwm_attrs( Operation *op, SlapReply *rs, Attribute** a_first, int stripEntryDN )
 {
 	slap_overinst		*on = (slap_overinst *) op->o_bd->bd_info;
 	struct ldaprwmap	*rwmap = 
@@ -852,11 +852,13 @@ rwm_attrs( Operation *op, SlapReply *rs,
 		}
 
 		if ( (*ap)->a_desc == slap_schema.si_ad_entryDN ) {
-			/* will be generated by frontend */
-			goto cleanup_attr;
-		}
-
-		if ( !isupdate && (*ap)->a_desc->ad_type->sat_no_user_mod 
+			if ( stripEntryDN ) {
+				/* will be generated by frontend */
+				goto cleanup_attr;
+			}
+			
+		} else if ( !isupdate
+			&& (*ap)->a_desc->ad_type->sat_no_user_mod 
 			&& (*ap)->a_desc->ad_type != slap_schema.si_at_undefined )
 		{
 			goto next_attr;
@@ -1029,7 +1031,13 @@ rwm_send_entry( Operation *op, SlapReply
 	/* FIXME: the entries are in the remote mapping form;
 	 * so we need to select those attributes we are willing
 	 * to return, and remap them accordingly */
-	(void)rwm_attrs( op, rs, &e->e_attrs );
+	(void)rwm_attrs( op, rs, &e->e_attrs, 1 );
+
+#if 0
+	if ( rs->sr_operational_attrs ) {
+		(void)rwm_attrs( op, rs, &rs->sr_operational_attrs, 0 );
+	}
+#endif
 
 	rs->sr_entry = e;
 	rs->sr_flags = flags;
@@ -1059,7 +1067,7 @@ rwm_operational( Operation *op, SlapRepl
 	 * so we need to select those attributes we are willing
 	 * to return, and remap them accordingly */
 	if ( rs->sr_operational_attrs ) {
-		rwm_attrs( op, rs, &rs->sr_operational_attrs );
+		rwm_attrs( op, rs, &rs->sr_operational_attrs, 1 );
 	}
 
 	return SLAP_CB_CONTINUE;