|
 |
6f51e1 |
From c903f66194f04e97fc684f5a9654cedb27530931 Mon Sep 17 00:00:00 2001
|
|
|
6f51e1 |
From: Ludwig Krispenz <lkrispen@redhat.com>
|
|
|
6f51e1 |
Date: Mon, 31 Jul 2017 10:51:08 +0200
|
|
|
6f51e1 |
Subject: [PATCH 1/3] Ticket 49334 - fix backup restore if changelog exists
|
|
|
6f51e1 |
|
|
|
6f51e1 |
The corrcect flag to copy a directory in backup/restore must be passed for the changelog directory
|
|
|
6f51e1 |
|
|
|
6f51e1 |
Reviewed by: William, thanks
|
|
|
6f51e1 |
---
|
|
|
6f51e1 |
ldap/servers/slapd/back-ldbm/dblayer.c | 4 ++--
|
|
|
6f51e1 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
6f51e1 |
|
|
|
6f51e1 |
diff --git a/ldap/servers/slapd/back-ldbm/dblayer.c b/ldap/servers/slapd/back-ldbm/dblayer.c
|
|
|
6f51e1 |
index ff97aa4..3a97f2f 100644
|
|
|
6f51e1 |
--- a/ldap/servers/slapd/back-ldbm/dblayer.c
|
|
|
6f51e1 |
+++ b/ldap/servers/slapd/back-ldbm/dblayer.c
|
|
|
6f51e1 |
@@ -6143,7 +6143,7 @@ dblayer_backup(struct ldbminfo *li, char *dest_dir, Slapi_Task *task)
|
|
|
6f51e1 |
return_value = dblayer_copy_directory(li, task, changelogdir,
|
|
|
6f51e1 |
changelog_destdir,
|
|
|
6f51e1 |
0 /* backup */,
|
|
|
6f51e1 |
- &cnt, 1, 0, 0);
|
|
|
6f51e1 |
+ &cnt, 0, 0, 1);
|
|
|
6f51e1 |
if (return_value) {
|
|
|
6f51e1 |
slapi_log_err(SLAPI_LOG_ERR,
|
|
|
6f51e1 |
"dblayer_backup", "Error in copying directory "
|
|
|
6f51e1 |
@@ -6823,7 +6823,7 @@ int dblayer_restore(struct ldbminfo *li, char *src_dir, Slapi_Task *task, char *
|
|
|
6f51e1 |
*cldirname = '\0';
|
|
|
6f51e1 |
return_value = dblayer_copy_directory(li, task, filename1,
|
|
|
6f51e1 |
changelogdir, 1 /* restore */,
|
|
|
6f51e1 |
- &cnt, 1, 0 ,0);
|
|
|
6f51e1 |
+ &cnt, 0, 0 ,1);
|
|
|
6f51e1 |
*cldirname = '/';
|
|
|
6f51e1 |
if (return_value) {
|
|
|
6f51e1 |
slapi_log_err(SLAPI_LOG_ERR,
|
|
|
6f51e1 |
--
|
|
|
6f51e1 |
2.9.4
|
|
|
6f51e1 |
|