Cleanup prev commit

diff --git a/doc/man/man5/slapo-accesslog.5 b/doc/man/man5/slapo-accesslog.5
index 6f52392c718864d4692281aa9ac554a78b2495f1..031784662a5ef23f8765b2f85f97b86cf669ff6b 100644 (file)
--- a/doc/man/man5/slapo-accesslog.5
+++ b/doc/man/man5/slapo-accesslog.5
@@ -49,7 +49,7 @@ abandon, bind, unbind
 all operations
 .RE
 .TP
-.B logoldfilter <filter>
+.B logold <filter>
 Specify a filter for matching against Deleted and Modified entries. If
 the entry matches the filter, the old contents of the entry will be
 logged along with the current request.
@@ -99,7 +99,7 @@ succeed or not. The default is FALSE.
        overlay accesslog
        logdb cn=log
        logops writes reads
-       logfilter (objectclass=person)
+       logold (objectclass=person)
 .fi
 
 .SH SCHEMA

diff --git a/servers/slapd/overlays/accesslog.c b/servers/slapd/overlays/accesslog.c
index 008fe66ec7a4968c437bd01787e94c56e427ad79..06f3962250a690025c5da9765cb1f21a26052925 100644 (file)
--- a/servers/slapd/overlays/accesslog.c
+++ b/servers/slapd/overlays/accesslog.c
@@ -57,7 +57,7 @@ typedef struct log_info {
        int li_age;
        int li_cycle;
        struct re_s *li_task;
-       Filter *li_filter;
+       Filter *li_oldf;
        Entry *li_old;
        int li_success;
        ldap_pvt_thread_mutex_t li_op_mutex;
@@ -71,7 +71,7 @@ enum {
        LOG_OPS,
        LOG_PURGE,
        LOG_SUCCESS,
-       LOG_FILTER
+       LOG_OLD
 };
 
 static ConfigTable log_cfats[] = {
@@ -93,8 +93,8 @@ static ConfigTable log_cfats[] = {
                log_cf_gen, "( OLcfgOvAt:4.4 NAME 'olcAccessLogSuccess' "
                        "DESC 'Log successful ops only' "
                        "SYNTAX OMsBoolean SINGLE-VALUE )", NULL, NULL },
-       { "logoldfilter", NULL, 2, 2, 0, ARG_MAGIC|LOG_FILTER,
-               log_cf_gen, "( OLcfgOvAt:4.5 NAME 'olcAccessLogOldFilter' "
+       { "logold", "filter", 2, 2, 0, ARG_MAGIC|LOG_OLD,
+               log_cf_gen, "( OLcfgOvAt:4.5 NAME 'olcAccessLogOld' "
                        "DESC 'Log old values when modifying entries matching the filter' "
                        "SYNTAX OMsDirectoryString SINGLE-VALUE )", NULL, NULL },
        { NULL }
@@ -107,7 +107,7 @@ static ConfigOCs log_cfocs[] = {
                "SUP olcOverlayConfig "
                "MUST olcAccessLogDB "
                "MAY ( olcAccessLogOps $ olcAccessLogPurge $ olcAccessLogSuccess $ "
-                       "olcAccessLogOldFilter ) )",
+                       "olcAccessLogOld ) )",
                        Cft_Overlay, log_cfats },
        { NULL }
 };
@@ -613,9 +613,9 @@ log_cf_gen(ConfigArgs *c)
                        else
                                rc = 1;
                        break;
-               case LOG_FILTER:
-                       if ( li->li_filter ) {
-                               filter2bv( li->li_filter, &agebv );
+               case LOG_OLD:
+                       if ( li->li_oldf ) {
+                               filter2bv( li->li_oldf, &agebv );
                                value_add_one( &c->rvalue_vals, &agebv );
                        }
                        else
@@ -651,10 +651,10 @@ log_cf_gen(ConfigArgs *c)
                case LOG_SUCCESS:
                        li->li_success = 0;
                        break;
-               case LOG_FILTER:
-                       if ( li->li_filter ) {
-                               filter_free( li->li_filter );
-                               li->li_filter = NULL;
+               case LOG_OLD:
+                       if ( li->li_oldf ) {
+                               filter_free( li->li_oldf );
+                               li->li_oldf = NULL;
                        }
                        break;
                }
@@ -702,9 +702,9 @@ log_cf_gen(ConfigArgs *c)
                case LOG_SUCCESS:
                        li->li_success = c->value_int;
                        break;
-               case LOG_FILTER:
-                       li->li_filter = str2filter( c->argv[1] );
-                       if ( !li->li_filter ) {
+               case LOG_OLD:
+                       li->li_oldf = str2filter( c->argv[1] );
+                       if ( !li->li_oldf ) {
                                sprintf( c->msg, "bad filter!" );
                                rc = 1;
                        }
@@ -1185,7 +1185,7 @@ accesslog_op_mod( Operation *op, SlapReply *rs )
                 * overlays like refint to keep working.
                 */
                ldap_pvt_thread_mutex_lock( &li->li_op_mutex );
-               if ( li->li_filter && ( op->o_tag == LDAP_REQ_DELETE ||
+               if ( li->li_oldf && ( op->o_tag == LDAP_REQ_DELETE ||
                        op->o_tag == LDAP_REQ_MODIFY )) {
                        int rc;
                        Entry *e;
@@ -1193,7 +1193,7 @@ accesslog_op_mod( Operation *op, SlapReply *rs )
                        op->o_bd->bd_info = on->on_info->oi_orig;
                        rc = be_entry_get_rw( op, &op->o_req_ndn, NULL, NULL, 0, &e );
                        if ( e ) {
-                               if ( test_filter( op, e, li->li_filter ) == LDAP_COMPARE_TRUE )
+                               if ( test_filter( op, e, li->li_oldf ) == LDAP_COMPARE_TRUE )
                                        li->li_old = entry_dup( e );
                                be_entry_release_rw( op, e, 0 );
                        }