From 687ebd18a1927cd6dcbb6cb884b979096c8a44aa Mon Sep 17 00:00:00 2001
From: Fraser Tweedale <ftweedal@redhat.com>
Date: Nov 21 2016 17:03:52 +0000
Subject: Remove references to ds_newinst.pl


ds_newinst.pl was removed from 389 DS over 9 years ago. Remove
references to it.

Fixes: https://fedorahosted.org/freeipa/ticket/6496
Reviewed-By: Christian Heimes <cheimes@redhat.com>

---

diff --git a/ipaplatform/base/paths.py b/ipaplatform/base/paths.py
index bbf6b53..a30e6b3 100644
--- a/ipaplatform/base/paths.py
+++ b/ipaplatform/base/paths.py
@@ -157,7 +157,6 @@ class BasePathNamespace(object):
     PKCS12EXPORT = "/usr/bin/PKCS12Export"
     CERTUTIL = "/usr/bin/certutil"
     CHROMIUM_BROWSER = "/usr/bin/chromium-browser"
-    DS_NEWINST_PL = "/usr/bin/ds_newinst.pl"
     FIREFOX = "/usr/bin/firefox"
     GETCERT = "/usr/bin/getcert"
     GPG = "/usr/bin/gpg"
diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py
index f76378e..9a90e99 100644
--- a/ipaserver/install/dsinstance.py
+++ b/ipaserver/install/dsinstance.py
@@ -551,12 +551,12 @@ class DsInstance(service.Service):
         inf_fd = ipautil.write_tmp_file(inf_txt)
         inf_txt = re.sub(r"RootDNPwd=.*\n", "", inf_txt)
         root_logger.debug(inf_txt)
-        if ipautil.file_exists(paths.SETUP_DS_PL):
-            args = [paths.SETUP_DS_PL, "--silent", "--logfile", "-", "-f", inf_fd.name]
-            root_logger.debug("calling setup-ds.pl")
-        else:
-            args = [paths.DS_NEWINST_PL, inf_fd.name]
-            root_logger.debug("calling ds_newinst.pl")
+        args = [
+            paths.SETUP_DS_PL, "--silent",
+            "--logfile", "-",
+            "-f", inf_fd.name,
+        ]
+        root_logger.debug("calling setup-ds.pl")
         try:
             ipautil.run(args)
             root_logger.debug("completed creating ds instance")