From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Date: Fri, 26 Oct 2018 07:41:50 +0000 (+1300)
Subject: Python provision: remove "ExistingBackend"
X-Git-Tag: tdb-1.3.17~1024
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9b457941667bf011ab15e33567a6034133e5dde;p=thirdparty%2Fsamba.git

Python provision: remove "ExistingBackend"

This was unused and broken. e.g. here:

-    def init(self):
-        # Check to see that this 'existing' LDAP backend in fact exists
-        ldapi_db = Ldb(self.ldapi_uri)

there is no attribute self.ldapi_uri, so this would always raise an
exception.

It was being left around in case it became useful, but that doesn't
seem to be happening.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <noel.power@suse.com>
---

diff --git a/python/samba/provision/__init__.py b/python/samba/provision/__init__.py
index d9cab252224..7a6d2f79653 100644
--- a/python/samba/provision/__init__.py
+++ b/python/samba/provision/__init__.py
@@ -77,7 +77,6 @@ from samba.ms_display_specifiers import read_ms_ldif
 from samba.ntacls import setntacl, getntacl, dsacl2fsacl
 from samba.ndr import ndr_pack, ndr_unpack
 from samba.provision.backend import (
-    ExistingBackend,
     FDSBackend,
     LDBBackend,
     OpenLDAPBackend,
@@ -2237,13 +2236,6 @@ def provision(logger, session_info, smbconf=None,
         provision_backend = LDBBackend(backend_type, paths=paths,
                                        lp=lp,
                                        names=names, logger=logger)
-    elif backend_type == "existing":
-        # If support for this is ever added back, then the URI will need to be
-        # specified again
-        provision_backend = ExistingBackend(backend_type, paths=paths,
-                                            lp=lp,
-                                            names=names, logger=logger,
-                                            ldap_backend_forced_uri=ldap_backend_forced_uri)
     elif backend_type == "fedora-ds":
         provision_backend = FDSBackend(backend_type, paths=paths,
                                        lp=lp,
diff --git a/python/samba/provision/backend.py b/python/samba/provision/backend.py
index 502afdf53ff..fdf8fb76d7b 100644
--- a/python/samba/provision/backend.py
+++ b/python/samba/provision/backend.py
@@ -131,26 +131,6 @@ class LDBBackend(ProvisionBackend):
         pass
 
 
-class ExistingBackend(ProvisionBackend):
-
-    def __init__(self, backend_type, paths=None, lp=None,
-                 names=None, logger=None, ldapi_uri=None):
-
-        super(ExistingBackend, self).__init__(backend_type=backend_type,
-                                              paths=paths, lp=lp,
-                                              names=names, logger=logger,
-                                              ldap_backend_forced_uri=ldapi_uri)
-
-    def init(self):
-        # Check to see that this 'existing' LDAP backend in fact exists
-        ldapi_db = Ldb(self.ldapi_uri)
-        ldapi_db.search(base="", scope=SCOPE_BASE,
-                        expression="(objectClass=OpenLDAProotDSE)")
-
-        # For now, assume existing backends at least emulate OpenLDAP
-        self.ldap_backend_type = "openldap"
-
-
 class LDAPBackend(ProvisionBackend):
 
     def __init__(self, backend_type, paths=None, lp=None,