ITS#8990 pickup SLAP_MOD_SOFT modops

diff --git a/servers/slapd/overlays/accesslog.c b/servers/slapd/overlays/accesslog.c
index ef79b5620019bb33921b3d39b0f7552c23c5e10c..96af8735be3c9d713435ac236136082854975ccd 100644 (file)
--- a/servers/slapd/overlays/accesslog.c
+++ b/servers/slapd/overlays/accesslog.c
@@ -1587,6 +1587,7 @@ static int accesslog_response(Operation *op, SlapReply *rs) {
                        if ( m->sml_values ) {
                                i += m->sml_numvals;
                        } else if ( m->sml_op == LDAP_MOD_DELETE ||
+                               m->sml_op == SLAP_MOD_SOFTDEL ||
                                m->sml_op == LDAP_MOD_REPLACE )
                        {
                                i++;
@@ -1635,8 +1636,10 @@ static int accesslog_response(Operation *op, SlapReply *rs) {
                                        char c_op;
 
                                        switch ( m->sml_op ) {
-                                       case LDAP_MOD_ADD: c_op = '+'; break;
-                                       case LDAP_MOD_DELETE:   c_op = '-'; break;
+                                       case LDAP_MOD_ADD:      /* FALLTHRU */
+                                       case SLAP_MOD_SOFTADD: c_op = '+'; break;
+                                       case LDAP_MOD_DELETE: /* FALLTHRU */
+                                       case SLAP_MOD_SOFTDEL: c_op = '-'; break;
                                        case LDAP_MOD_REPLACE:  c_op = '='; break;
                                        case LDAP_MOD_INCREMENT:        c_op = '#'; break;
 
@@ -1649,6 +1652,7 @@ static int accesslog_response(Operation *op, SlapReply *rs) {
                                        accesslog_val2val( m->sml_desc, b, c_op, &vals[i] );
                                }
                        } else if ( m->sml_op == LDAP_MOD_DELETE ||
+                               m->sml_op == SLAP_MOD_SOFTDEL ||
                                m->sml_op == LDAP_MOD_REPLACE )
                        {
                                vals[i].bv_len = m->sml_desc->ad_cname.bv_len + 2;
@@ -1656,7 +1660,7 @@ static int accesslog_response(Operation *op, SlapReply *rs) {
                                ptr = lutil_strcopy( vals[i].bv_val,
                                        m->sml_desc->ad_cname.bv_val );
                                *ptr++ = ':';
-                               if ( m->sml_op == LDAP_MOD_DELETE ) {
+                               if ( m->sml_op == LDAP_MOD_DELETE || m->sml_op == SLAP_MOD_SOFTDEL ) {
                                        *ptr++ = '-';
                                } else {
                                        *ptr++ = '=';