From f606d82024d3a74df2aeb5448944aa015e96cce2 Mon Sep 17 00:00:00 2001
From: Rob Crittenden <rcritten@redhat.com>
Date: Mon, 3 Jun 2019 15:26:43 -0400
Subject: [PATCH] Stop using 389-ds legacy backup and restoration utilities

Use dsctl instead, the modern replacement for ldif2db, db2ldif,
bak2db and db2bak.

https://pagure.io/freeipa/issue/7965

Signed-off-by: Rob Crittenden <rcritten@redhat.com>
Reviewed-By: Christian Heimes <cheimes@redhat.com>
---
 ipaplatform/base/paths.py        |  5 -----
 ipaserver/install/ipa_backup.py  | 16 ++++++++++------
 ipaserver/install/ipa_restore.py | 19 +++++++++----------
 3 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/ipaplatform/base/paths.py b/ipaplatform/base/paths.py
index e1d396690..373209b54 100644
--- a/ipaplatform/base/paths.py
+++ b/ipaplatform/base/paths.py
@@ -399,11 +399,6 @@ class BasePathNamespace:
     SLAPD_INSTANCE_ERROR_LOG_TEMPLATE = "/var/log/dirsrv/slapd-%s/errors"
     SLAPD_INSTANCE_SYSTEMD_IPA_ENV_TEMPLATE = \
         "/etc/systemd/system/dirsrv@%s.service.d/ipa-env.conf"
-    # Legacy 389 commands
-    LDIF2DB = '/usr/sbin/ldif2db'
-    DB2LDIF = '/usr/sbin/db2ldif'
-    BAK2DB = '/usr/sbin/bak2db'
-    DB2BAK = '/usr/sbin/db2bak'
     IPA_SERVER_UPGRADE = '/usr/sbin/ipa-server-upgrade'
     KEYCTL = '/bin/keyctl'
     GETENT = '/usr/bin/getent'
diff --git a/ipaserver/install/ipa_backup.py b/ipaserver/install/ipa_backup.py
index aaaeb8cb3..1ef10614f 100644
--- a/ipaserver/install/ipa_backup.py
+++ b/ipaserver/install/ipa_backup.py
@@ -452,11 +452,12 @@ class Backup(admintool.AdminTool):
                 )
 
         else:
-            args = [paths.DB2LDIF,
-                    '-Z', instance,
-                    '-r',
-                    '-n', backend,
-                    '-a', ldiffile]
+            args = [paths.DSCTL,
+                    instance,
+                    'db2ldif',
+                    '--replication',
+                    backend,
+                    ldiffile]
             result = run(args, raiseonerr=False)
             if result.returncode != 0:
                 raise admintool.ScriptError(
@@ -519,7 +520,10 @@ class Backup(admintool.AdminTool):
                 )
 
         else:
-            args = [paths.DB2BAK, bakdir, '-Z', instance]
+            args = [paths.DSCTL,
+                    instance,
+                    'db2bak',
+                    bakdir]
             result = run(args, raiseonerr=False)
             if result.returncode != 0:
                 raise admintool.ScriptError(
diff --git a/ipaserver/install/ipa_restore.py b/ipaserver/install/ipa_restore.py
index 5607ef354..7e67dc980 100644
--- a/ipaserver/install/ipa_restore.py
+++ b/ipaserver/install/ipa_restore.py
@@ -634,10 +634,11 @@ class Restore(admintool.AdminTool):
             # Restore SELinux context of template_dir
             tasks.restore_context(template_dir)
 
-            args = [paths.LDIF2DB,
-                    '-Z', instance,
-                    '-i', ldiffile,
-                    '-n', backend]
+            args = [paths.DSCTL,
+                    instance,
+                    'ldif2db',
+                    backend,
+                    ldiffile]
             result = run(args, raiseonerr=False)
             if result.returncode != 0:
                 logger.critical("ldif2db failed: %s", result.error_log)
@@ -647,7 +648,7 @@ class Restore(admintool.AdminTool):
         '''
         Restore a BAK backup of the data and changelog in this instance.
 
-        If backend is None then all backends are restored.
+        For offline restore backend is not used. All backends are restored.
 
         If executed online create a task and wait for it to complete.
 
@@ -687,12 +688,10 @@ class Restore(admintool.AdminTool):
             logger.info("Waiting for restore to finish")
             wait_for_task(conn, dn)
         else:
-            args = [paths.BAK2DB,
-                    '-Z', instance,
+            args = [paths.DSCTL,
+                    instance,
+                    'bak2db',
                     os.path.join(self.dir, instance)]
-            if backend is not None:
-                args.append('-n')
-                args.append(backend)
             result = run(args, raiseonerr=False)
             if result.returncode != 0:
                 logger.critical("bak2db failed: %s", result.error_log)