From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Tue, 4 Jan 2011 18:42:22 +0000 (+0000)
Subject: ITS#6748
X-Git-Tag: OPENLDAP_REL_ENG_2_4_24~152
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9fd7e5121b39a58c38eb3c9c94fb42f47c6f813d;p=openldap

ITS#6748
---

diff --git a/CHANGES b/CHANGES
index dc43dcec5e..475e462975 100644
--- a/CHANGES
+++ b/CHANGES
@@ -54,6 +54,7 @@ OpenLDAP 2.4.24 Engineering
 	Fixed slapd-monitor hasSubordinates generation (ITS#6712)
 	Fixed slapd-sql with null objectClass (ITS#6616)
 	Fixed slapd-sql hasSubordinates generation (ITS#6712)
+	Fixed slapo-memberof log messages (ITS#6748)
 	Fixed slapo-pcache callback freeing (ITS#6640)
 	Fixed slapo-pcache to ignore undefined attrs (ITS#6600)
 	Fixed slapo-ppolicy don't update opattrs on consumers (ITS#6608)
diff --git a/servers/slapd/overlays/memberof.c b/servers/slapd/overlays/memberof.c
index 88637b200f..1f6671ebbb 100644
--- a/servers/slapd/overlays/memberof.c
+++ b/servers/slapd/overlays/memberof.c
@@ -401,9 +401,8 @@ memberof_value_modify(
 		if ( rs2.sr_err != LDAP_SUCCESS ) {
 			char buf[ SLAP_TEXT_BUFLEN ];
 			snprintf( buf, sizeof( buf ),
-				"memberof_value_modify %s=\"%s\" failed err=%d text=%s",
-				ad->ad_cname.bv_val, new_dn->bv_val, rs2.sr_err,
-				rs2.sr_text ? rs2.sr_text : "" );
+				"memberof_value_modify %s=\"%s\" failed err=%d",
+				ad->ad_cname.bv_val, new_dn->bv_val, rs2.sr_err );
 			Debug( LDAP_DEBUG_ANY, "%s: %s\n",
 				op->o_log_prefix, buf, 0 );
 		}
@@ -436,9 +435,8 @@ memberof_value_modify(
 		if ( rs2.sr_err != LDAP_SUCCESS ) {
 			char buf[ SLAP_TEXT_BUFLEN ];
 			snprintf( buf, sizeof( buf ),
-				"memberof_value_modify %s=\"%s\" failed err=%d text=%s",
-				ad->ad_cname.bv_val, old_dn->bv_val, rs2.sr_err,
-				rs2.sr_text ? rs2.sr_text : "" );
+				"memberof_value_modify %s=\"%s\" failed err=%d",
+				ad->ad_cname.bv_val, old_dn->bv_val, rs2.sr_err );
 			Debug( LDAP_DEBUG_ANY, "%s: %s\n",
 				op->o_log_prefix, buf, 0 );
 		}