Sync with HEAD

diff --git a/servers/slapd/back-monitor/init.c b/servers/slapd/back-monitor/init.c
index 14b3a60b888687f28e40ef80d5b83713f550ba7c..5292bc85b61c5205e7db09ba6e73df5f18fcbf84 100644 (file)
--- a/servers/slapd/back-monitor/init.c
+++ b/servers/slapd/back-monitor/init.c
@@ -1557,7 +1557,7 @@ monitor_back_db_open(
                "description: This subtree contains monitoring/managing objects.\n"
                "description: This object contains information about this server.\n"
                "description: Most of the information is held in operational"
-               " attributeTypes, which must be explicitly requested.\n"
+               " attributes, which must be explicitly requested.\n"
                "creatorsName: %s\n"
                "modifiersName: %s\n"
                "createTimestamp: %s\n"

diff --git a/servers/slapd/overlays/accesslog.c b/servers/slapd/overlays/accesslog.c
index e802492e8f2c8204a0383fbfb3e4c44f68d09f9f..5ce4356aa6496bbf952109a7d5a42b818407e2ac 100644 (file)
--- a/servers/slapd/overlays/accesslog.c
+++ b/servers/slapd/overlays/accesslog.c
@@ -1280,8 +1280,10 @@ accesslog_db_open(
                        Attribute *a;
 
                        a = attr_find( e_ctx->e_attrs, slap_schema.si_ad_contextCSN );
-                       if ( a )
+                       if ( a ) {
+                               attr_merge( e, slap_schema.si_ad_entryCSN, a->a_vals, NULL );
                                attr_merge( e, a->a_desc, a->a_vals, NULL );
+                       }
                        be_entry_release_rw( op, e_ctx, 0 );
                }
                op->o_bd->bd_info = (BackendInfo *)on;