ITS#6748

diff --git a/CHANGES b/CHANGES
index dc43dcec5e4c42772e1929af7cc8adcd6cf3caa0..475e462975e23674a9920508da5e9ab73ba388c1 100644 (file)
--- 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 88637b200fd40d5f11ddba6cbebc544c80ed7d74..1f6671ebbb8936b6fc269a63f4a8d702de66b3c7 100644 (file)
--- 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 );
                }