cleanup: Rename rs_ensure_entry_modifiable().

The name rs_entry2modifiable() is more reasonably sized.
For now, leave behind a macro rs_ensure_entry_modifiable in proto-slap.h.

contrib/slapd-modules/cloak/cloak.c

@@ -220,7 +220,7 @@ cloak_search_response_cb( Operation *op, SlapReply *rs )
 	/*
 	 * We are now committed to cloak an attribute.
 	 */
-	rs_ensure_entry_modifiable( op, rs, (slap_overinst *) op->o_bd->bd_info );
+	rs_entry2modifiable( op, rs, (slap_overinst *) op->o_bd->bd_info );
 	me = rs->sr_entry;
 		
 	for ( ci = (cloak_info_t *)sc->sc_private; ci; ci = ci->ci_next ) {

contrib/slapd-modules/dupent/dupent.c

@@ -403,7 +403,7 @@ dupent_response_entry( Operation *op, SlapReply *rs )
 		return SLAP_CB_CONTINUE;
 	}
 
-	rs_ensure_entry_modifiable( op, rs, dc->dc_on );
+	rs_entry2modifiable( op, rs, dc->dc_on );
 	rs->sr_flags &= ~(REP_ENTRY_MODIFIABLE | REP_ENTRY_MUSTBEFREED);
 	e = rs->sr_entry;
 

contrib/slapd-modules/usn/usn.c

@@ -135,7 +135,7 @@ usn_operational(
 				}
 
 			if ( !ap ) {
-				if ( rs_ensure_entry_modifiable( op,rs, on )) {
+				if ( rs_entry2modifiable( op,rs, on )) {
 					a = attr_find( rs->sr_entry->e_attrs,
 						ad_usnChanged );
 				}

servers/slapd/overlays/collect.c

@@ -386,7 +386,7 @@ collect_response( Operation *op, SlapReply *rs )
 			* don't modify it directly. Make a copy and
 			* work with that instead.
 			*/
-			rs_ensure_entry_modifiable( op, rs, on );
+			rs_entry2modifiable( op, rs, on );
 
 			/* Loop for each attribute in this collectinfo */
 			for(idx=0; idx<ci->ci_ad_num; idx++) {

servers/slapd/overlays/syncprov.c

@@ -2762,7 +2762,7 @@ syncprov_operational(
 				}
 
 				if ( !ap ) {
-					if ( rs_ensure_entry_modifiable( op, rs, on )) {
+					if ( rs_entry2modifiable( op, rs, on )) {
 						a = attr_find( rs->sr_entry->e_attrs,
 							slap_schema.si_ad_contextCSN );
 					}

servers/slapd/overlays/valsort.c

@@ -297,7 +297,7 @@ valsort_response( Operation *op, SlapReply *rs )
 		a = attr_find( rs->sr_entry->e_attrs, vi->vi_ad );
 		if ( !a ) continue;
 
-		if ( rs_ensure_entry_modifiable( op, rs, on )) {
+		if ( rs_entry2modifiable( op, rs, on )) {
 			a = attr_find( rs->sr_entry->e_attrs, vi->vi_ad );
 		}
 

servers/slapd/proto-slap.h

@@ -1578,8 +1578,9 @@ LDAP_SLAPD_F (void) rs_flush_entry LDAP_P(( Operation *op,
 	SlapReply *rs, slap_overinst *on ));
 LDAP_SLAPD_F (void) rs_replace_entry LDAP_P(( Operation *op,
 	SlapReply *rs, slap_overinst *on, Entry *e ));
-LDAP_SLAPD_F (int) rs_ensure_entry_modifiable LDAP_P(( Operation *op,
+LDAP_SLAPD_F (int) rs_entry2modifiable LDAP_P(( Operation *op,
 	SlapReply *rs, slap_overinst *on ));
+#define rs_ensure_entry_modifiable rs_entry2modifiable /* older name */
 LDAP_SLAPD_F (void) slap_send_ldap_result LDAP_P(( Operation *op, SlapReply *rs ));
 LDAP_SLAPD_F (void) send_ldap_sasl LDAP_P(( Operation *op, SlapReply *rs ));
 LDAP_SLAPD_F (void) send_ldap_disconnect LDAP_P(( Operation *op, SlapReply *rs ));

servers/slapd/result.c

@@ -268,7 +268,7 @@ rs_replace_entry( Operation *op, SlapReply *rs, slap_overinst *on, Entry *e )
  * Return nonzero if rs->sr_entry was replaced.
  */
 int
-rs_ensure_entry_modifiable( Operation *op, SlapReply *rs, slap_overinst *on )
+rs_entry2modifiable( Operation *op, SlapReply *rs, slap_overinst *on )
 {
 	if ( rs->sr_flags & REP_ENTRY_MODIFIABLE ) {
 		rs_assert_ok( rs );