From 58c4f9526233a440baeb34ce4e7ab06eeb9e46c7 Mon Sep 17 00:00:00 2001 From: Ludwig Krispenz Date: Jul 31 2017 08:41:58 +0000 Subject: 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 --- 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,