[389-ds-base] branch master updated (4b139f8 -> 58c4f95)

[git repository hosting]

This is an automated email from the git hooks/post-receive script.

lkrispen pushed a change to branch master
in repository 389-ds-base.

from  4b139f8   additional fix for 49316 to make checkpointing work again
       new  58c4f95   Ticket 49334 - fix backup restore if changelog exists

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.

Summary of changes:
 ldap/servers/slapd/back-ldbm/dblayer.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

[389-ds-base] 01/01: Ticket 49334 - fix backup restore if changelog exists

[git repository hosting]

This is an automated email from the git hooks/post-receive script.

lkrispen pushed a commit to branch master
in repository 389-ds-base.

commit 58c4f9526233a440baeb34ce4e7ab06eeb9e46c7
Author: Ludwig Krispenz 
Date:   Fri Jul 28 12:39:03 2017 +0200

Ticket 49334 - fix backup restore if changelog exists

The corrcect flag to copy a directory in backup/restore must be passed for the changelog directory

Reviewed by: William, thanks
---
 ldap/servers/slapd/back-ldbm/dblayer.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ldap/servers/slapd/back-ldbm/dblayer.c b/ldap/servers/slapd/back-ldbm/dblayer.c
index e16754a..620af6a 100644
--- a/ldap/servers/slapd/back-ldbm/dblayer.c
+++ b/ldap/servers/slapd/back-ldbm/dblayer.c
@@ -5946,7 +5946,7 @@ dblayer_backup(struct ldbminfo *li, char *dest_dir, Slapi_Task *task)
             return_value = dblayer_copy_directory(li, task, changelogdir,
                                                   changelog_destdir,
                                                   0 /* backup */,
-                                                  &cnt, 1, 0, 0);
+                                                  &cnt, 0, 0, 1);
             if (return_value) {
                 slapi_log_err(SLAPI_LOG_ERR,
                               "dblayer_backup", "Error in copying directory "
@@ -6606,7 +6606,7 @@ dblayer_restore(struct ldbminfo *li, char *src_dir, Slapi_Task *task, char *bena
                     *cldirname = '\0';
                     return_value = dblayer_copy_directory(li, task, filename1,
                                                           changelogdir, 1 /* restore */,
-                                                          &cnt, 1, 0, 0);
+                                                          &cnt, 0, 0, 1);
                     *cldirname = '/';
                     if (return_value) {
                         slapi_log_err(SLAPI_LOG_ERR,