ITS#6286

diff --git a/CHANGES b/CHANGES
index b8a56a8b1cade8e9f88bc5970de5c12be40759be..94c580e87bc596916467a4682b98e05f79579ee7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,7 @@ OpenLDAP 2.4.19 Engineering
        Fixed slapadd to warn about missing attrs for replicas (ITS#6281)
        Fixed slapd tools to allow -n for conversion (ITS#6258)
        Fixed slapd-ldif buffer overflow (ITS#6303)
+       Fixed slapo-auditlog comments when modifying (ITS#6286)
        Fixed slapo-dynlist lock leak (ITS#6308)
        Fixed slapo-pcache cache corruption (ITS#6242)
        Fixed slapo-sssvlv sort control dereferencing (ITS#6288)

diff --git a/servers/slapd/overlays/auditlog.c b/servers/slapd/overlays/auditlog.c
index c7d7b5e2288501f0c0d99a2e7ea362549d0ddbf2..77d05b37211594b38919bafe10a70a386ab919fa 100644 (file)
--- a/servers/slapd/overlays/auditlog.c
+++ b/servers/slapd/overlays/auditlog.c
@@ -73,7 +73,7 @@ static int auditlog_response(Operation *op, SlapReply *rs) {
        Attribute *a;
        Modifications *m;
        struct berval *b, *who = NULL;
-       char *what, *suffix;
+       char *what, *whatm, *suffix;
        time_t stamp;
        int i;
 
@@ -147,15 +147,15 @@ static int auditlog_response(Operation *op, SlapReply *rs) {
          case LDAP_REQ_MODIFY:
                for(m = op->orm_modlist; m; m = m->sml_next) {
                        switch(m->sml_op & LDAP_MOD_OP) {
-                               case LDAP_MOD_ADD:       what = "add";          break;
-                               case LDAP_MOD_REPLACE:   what = "replace";      break;
-                               case LDAP_MOD_DELETE:    what = "delete";       break;
-                               case LDAP_MOD_INCREMENT: what = "increment";    break;
+                               case LDAP_MOD_ADD:       whatm = "add";         break;
+                               case LDAP_MOD_REPLACE:   whatm = "replace";     break;
+                               case LDAP_MOD_DELETE:    whatm = "delete";      break;
+                               case LDAP_MOD_INCREMENT: whatm = "increment";   break;
                                default:
                                        fprintf(f, "# MOD_TYPE_UNKNOWN:%02x\n", m->sml_op & LDAP_MOD_OP);
                                        continue;
                        }
-                       fprintf(f, "%s: %s\n", what, m->sml_desc->ad_cname.bv_val);
+                       fprintf(f, "%s: %s\n", whatm, m->sml_desc->ad_cname.bv_val);
                        if((b = m->sml_values) != NULL)
                          for(i = 0; b[i].bv_val; i++)
                                fprint_ldif(f, m->sml_desc->ad_cname.bv_val, b[i].bv_val, b[i].bv_len);