[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Fri Aug 30 09:51:02 UTC 2019
The branch, master has been updated
via 2b0fc74a091 dsdb: Remove OpenLDAP backend complexity from samba_dsdb module
via 3da41b51b00 dsdb: Remove OpenLDAP backend complexity from partitions module
via 6d1fe284110 dsdb: Remove LDAP backend specific modules from extended_dn_out
via a4f0a6519cd samba-tool domain provision: Remove experimental OpenLDAP support
via 4a2d3d8fd63 sefltest: Remove tests for obsolete OpenLDAP backend
via 5f70f972a58 selftest: Remove obsolete LDAP backend hooks from selftest.pl et al
from b5b6b74b826 paged results: tests without server_sort ctrl
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 2b0fc74a0916a6ab0d5ac007cc5e100d4682b2ea
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Mar 12 11:46:42 2019 +1300
dsdb: Remove OpenLDAP backend complexity from samba_dsdb module
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Nadezhda Ivanova <nivanova at symas.com>
Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
Autobuild-Date(master): Fri Aug 30 09:50:25 UTC 2019 on sn-devel-184
commit 3da41b51b00da97cfe63616d26555441f744ebf3
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Mar 12 11:46:28 2019 +1300
dsdb: Remove OpenLDAP backend complexity from partitions module
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Nadezhda Ivanova <nivanova at symas.com>
commit 6d1fe2841105b7ba3a1384ef6baef399f30800a6
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Mar 12 11:43:15 2019 +1300
dsdb: Remove LDAP backend specific modules from extended_dn_out
This simplifies the code considerably. A real attempt at an LDAP backend would need to implement this
module in a similar way to LDB.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Nadezhda Ivanova <nivanova at symas.com>
commit a4f0a6519cde558fdedb08fbb4742dbf57ee4283
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Mar 12 10:52:24 2019 +1300
samba-tool domain provision: Remove experimental OpenLDAP support
This feature has long been obsolete, remaining only in the hope
that it might be revived in the future.
Specifically, in 2011 the S4 OpenLDAP backend HOWTO was removed:
commit 1d46325af8541ea467c79cd86e65f93ce6a14ff4
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Apr 27 22:42:29 2011 +1000
Remove outdated S4 OpenLDAP backend HOWTO.
There is a project to revive this, hosted here:
https://github.com/Symas/samba
and
https://github.com/Symas/samba_overlays
However discussions at SambaXP with Nadezhda Ivanova
indicate a new approach with slapd being started by Samba
and taught to read native Samba ldb files is more likely
in the short term.
This has the advantage that Samba's provision and offline
tooling would not need to change, with the solution looking
more like how BIND9_DLZ has access to the Samba DB.
If any of this is required then reverting these patches will be
the least of the difficulties in bringing this to production.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Nadezhda Ivanova <nivanova at symas.com>
commit 4a2d3d8fd6318858260c3bc47443a6337da829ce
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Mar 12 11:49:01 2019 +1300
sefltest: Remove tests for obsolete OpenLDAP backend
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Nadezhda Ivanova <nivanova at symas.com>
commit 5f70f972a5871d473f66d7c50ebb3181652b3cae
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Mar 12 11:41:12 2019 +1300
selftest: Remove obsolete LDAP backend hooks from selftest.pl et al
This removes some quite complex logic that has not been used since the LDAP
backend project was shelved prior to 2011.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Nadezhda Ivanova <nivanova at symas.com>
-----------------------------------------------------------------------
Summary of changes:
python/samba/netcmd/domain.py | 41 --
python/samba/provision/__init__.py | 40 +-
python/samba/provision/backend.py | 737 +---------------------
python/samba/upgradehelpers.py | 2 -
selftest/selftest.pl | 20 +-
selftest/target/Samba.pm | 4 +-
selftest/target/Samba4.pm | 114 +---
source4/dsdb/samdb/ldb_modules/extended_dn_out.c | 342 +---------
source4/dsdb/samdb/ldb_modules/partition.h | 1 -
source4/dsdb/samdb/ldb_modules/partition_init.c | 62 +-
source4/dsdb/samdb/ldb_modules/samba_dsdb.c | 158 +----
source4/selftest/tests.py | 2 -
source4/setup/fedora-ds-init.ldif | 24 -
source4/setup/fedorads-dna.ldif | 17 -
source4/setup/fedorads-partitions.ldif | 45 --
source4/setup/fedorads-refint-add.ldif | 6 -
source4/setup/fedorads-refint-delete.ldif | 20 -
source4/setup/fedorads.inf | 36 --
source4/setup/slapd.conf | 194 ------
source4/setup/tests/blackbox_provision-backend.sh | 26 -
20 files changed, 45 insertions(+), 1846 deletions(-)
delete mode 100644 source4/setup/fedora-ds-init.ldif
delete mode 100644 source4/setup/fedorads-dna.ldif
delete mode 100644 source4/setup/fedorads-partitions.ldif
delete mode 100644 source4/setup/fedorads-refint-add.ldif
delete mode 100644 source4/setup/fedorads-refint-delete.ldif
delete mode 100644 source4/setup/fedorads.inf
delete mode 100644 source4/setup/slapd.conf
delete mode 100755 source4/setup/tests/blackbox_provision-backend.sh
Changeset truncated at 500 lines:
diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py
index 66027b26d26..542461bc9f7 100644
--- a/python/samba/netcmd/domain.py
+++ b/python/samba/netcmd/domain.py
@@ -289,24 +289,6 @@ class cmd_domain_provision(Command):
Option("--use-rfc2307", action="store_true", help="Use AD to store posix attributes (default = no)"),
]
- openldap_options = [
- Option("--ldapadminpass", type="string", metavar="PASSWORD",
- help="choose password to set between Samba and its LDAP backend (otherwise random)"),
- Option("--ldap-backend-type", type="choice", metavar="LDAP-BACKEND-TYPE",
- help="Test initialisation support for unsupported LDAP backend type (fedora-ds or openldap) DO NOT USE",
- choices=["fedora-ds", "openldap"]),
- Option("--ol-mmr-urls", type="string", metavar="LDAPSERVER",
- help="List of LDAP-URLS [ ldap://<FQHN>:<PORT>/ (where <PORT> has to be different than 389!) ] separated with comma (\",\") for use with OpenLDAP-MMR (Multi-Master-Replication), e.g.: \"ldap://s4dc1:9000,ldap://s4dc2:9000\""),
- Option("--ldap-dryrun-mode", help="Configure LDAP backend, but do not run any binaries and exit early. Used only for the test environment. DO NOT USE",
- action="store_true"),
- Option("--slapd-path", type="string", metavar="SLAPD-PATH",
- help="Path to slapd for LDAP backend [e.g.:'/usr/local/libexec/slapd']. Required for Setup with LDAP-Backend. OpenLDAP Version >= 2.4.17 should be used."),
- Option("--ldap-backend-extra-port", type="int", metavar="LDAP-BACKEND-EXTRA-PORT", help="Additional TCP port for LDAP backend server (to use for replication)"),
- Option("--ldap-backend-forced-uri", type="string", metavar="LDAP-BACKEND-FORCED-URI",
- help="Force the LDAP backend connection to be to a particular URI. Use this ONLY for 'existing' backends, or when debugging the interaction with the LDAP backend and you need to intercept the LDA"),
- Option("--ldap-backend-nosync", help="Configure LDAP backend not to call fsync() (for performance in test environments)", action="store_true"),
- ]
-
ntvfs_options = [
Option("--use-xattrs", type="choice", choices=["yes", "no", "auto"],
metavar="[yes|no|auto]",
@@ -318,9 +300,6 @@ class cmd_domain_provision(Command):
takes_options.extend(common_provision_join_options)
- if os.getenv('TEST_LDAP', "no") == "yes":
- takes_options.extend(openldap_options)
-
if samba.is_ntvfs_fileserver_built():
takes_options.extend(common_ntvfs_options)
takes_options.extend(ntvfs_options)
@@ -350,21 +329,14 @@ class cmd_domain_provision(Command):
users=None,
quiet=None,
blank=None,
- ldap_backend_type=None,
server_role=None,
function_level=None,
next_rid=None,
partitions_only=None,
targetdir=None,
- ol_mmr_urls=None,
use_xattrs="auto",
- slapd_path=None,
use_ntvfs=False,
use_rfc2307=None,
- ldap_backend_nosync=None,
- ldap_backend_extra_port=None,
- ldap_backend_forced_uri=None,
- ldap_dryrun_mode=None,
base_schema=None,
plaintext_secrets=False,
backend_store=None,
@@ -500,14 +472,6 @@ class cmd_domain_provision(Command):
if eadb:
self.logger.info("not using extended attributes to store ACLs and other metadata. If you intend to use this provision in production, rerun the script as root on a system supporting xattrs.")
- if ldap_backend_type == "existing":
- if ldap_backend_forced_uri is not None:
- self.logger.warn("You have specified to use an existing LDAP server as the backend, please make sure an LDAP server is running at %s" % ldap_backend_forced_uri)
- else:
- self.logger.info("You have specified to use an existing LDAP server as the backend, please make sure an LDAP server is running at the default location")
- else:
- if ldap_backend_forced_uri is not None:
- self.logger.warn("You have specified to use an fixed URI %s for connecting to your LDAP server backend. This is NOT RECOMMENDED, as our default communiation over ldapi:// is more secure and much less")
if domain_sid is not None:
domain_sid = security.dom_sid(domain_sid)
@@ -529,13 +493,8 @@ class cmd_domain_provision(Command):
dnspass=dnspass, root=root, nobody=nobody,
users=users,
serverrole=server_role, dom_for_fun_level=dom_for_fun_level,
- backend_type=ldap_backend_type,
- ldapadminpass=ldapadminpass, ol_mmr_urls=ol_mmr_urls, slapd_path=slapd_path,
useeadb=eadb, next_rid=next_rid, lp=lp, use_ntvfs=use_ntvfs,
use_rfc2307=use_rfc2307, skip_sysvolacl=False,
- ldap_backend_extra_port=ldap_backend_extra_port,
- ldap_backend_forced_uri=ldap_backend_forced_uri,
- nosync=ldap_backend_nosync, ldap_dryrun_mode=ldap_dryrun_mode,
base_schema=base_schema,
plaintext_secrets=plaintext_secrets,
backend_store=backend_store,
diff --git a/python/samba/provision/__init__.py b/python/samba/provision/__init__.py
index 2ffaf9fc250..217840989aa 100644
--- a/python/samba/provision/__init__.py
+++ b/python/samba/provision/__init__.py
@@ -77,9 +77,7 @@ 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 (
- FDSBackend,
LDBBackend,
- OpenLDAPBackend,
)
from samba.descriptor import (
get_empty_descriptor,
@@ -2162,13 +2160,11 @@ def provision(logger, session_info, smbconf=None,
krbtgtpass=None, domainguid=None, policyguid=None, policyguid_dc=None,
dns_backend=None, dns_forwarder=None, dnspass=None,
invocationid=None, machinepass=None, ntdsguid=None,
- root=None, nobody=None, users=None, backup=None, aci=None,
- serverrole=None, dom_for_fun_level=None, backend_type=None,
- sitename=None, ol_mmr_urls=None, ol_olc=None, slapd_path=None,
+ root=None, nobody=None, users=None, backup=None,
+ sitename=None, serverrole=None, dom_for_fun_level=None,
useeadb=False, am_rodc=False, lp=None, use_ntvfs=False,
use_rfc2307=False, maxuid=None, maxgid=None, skip_sysvolacl=True,
- ldap_backend_forced_uri=None, nosync=False, ldap_dryrun_mode=False,
- ldap_backend_extra_port=None, base_schema="2012_R2",
+ base_schema="2012_R2",
plaintext_secrets=False, backend_store=None,
backend_store_size=None, batch_mode=False):
"""Provision samba4
@@ -2185,8 +2181,6 @@ def provision(logger, session_info, smbconf=None,
# Make a new, random password between Samba and it's LDAP server
ldapadminpass = samba.generate_random_password(128, 255)
- if backend_type is None:
- backend_type = "ldb"
if backend_store is None:
backend_store = get_default_backend_store()
@@ -2288,28 +2282,9 @@ def provision(logger, session_info, smbconf=None,
schema = Schema(domainsid, invocationid=invocationid,
schemadn=names.schemadn, base_schema=base_schema)
- if backend_type == "ldb":
- provision_backend = LDBBackend(backend_type, paths=paths,
- lp=lp,
- names=names, logger=logger)
- elif backend_type == "fedora-ds":
- provision_backend = FDSBackend(backend_type, paths=paths,
- lp=lp,
- names=names, logger=logger, domainsid=domainsid,
- schema=schema, hostname=hostname, ldapadminpass=ldapadminpass,
- slapd_path=slapd_path,
- root=root)
- elif backend_type == "openldap":
- provision_backend = OpenLDAPBackend(backend_type, paths=paths,
- lp=lp,
- names=names, logger=logger, domainsid=domainsid,
- schema=schema, hostname=hostname, ldapadminpass=ldapadminpass,
- slapd_path=slapd_path, ol_mmr_urls=ol_mmr_urls,
- ldap_backend_extra_port=ldap_backend_extra_port,
- ldap_dryrun_mode=ldap_dryrun_mode, nosync=nosync,
- ldap_backend_forced_uri=ldap_backend_forced_uri)
- else:
- raise ValueError("Unknown LDAP backend type selected")
+ provision_backend = LDBBackend(paths=paths,
+ lp=lp,
+ names=names, logger=logger)
provision_backend.init()
provision_backend.start()
@@ -2480,8 +2455,7 @@ def provision_become_dc(smbconf=None, targetdir=None,
adminpass=None, krbtgtpass=None, domainguid=None, policyguid=None,
policyguid_dc=None, invocationid=None, machinepass=None, dnspass=None,
dns_backend=None, root=None, nobody=None, users=None,
- backup=None, serverrole=None, ldap_backend=None,
- ldap_backend_type=None, sitename=None, debuglevel=1, use_ntvfs=False):
+ backup=None, serverrole=None, sitename=None, debuglevel=1, use_ntvfs=False):
logger = logging.getLogger("provision")
samba.set_debug_level(debuglevel)
diff --git a/python/samba/provision/backend.py b/python/samba/provision/backend.py
index dc06b131ae1..abf79db119d 100644
--- a/python/samba/provision/backend.py
+++ b/python/samba/provision/backend.py
@@ -25,30 +25,7 @@
"""Functions for setting up a Samba configuration (LDB and LDAP backends)."""
-from samba.compat import urllib_quote
-import errno
-import ldb
-import os
-import sys
-import time
import shutil
-import subprocess
-
-from ldb import SCOPE_BASE, SCOPE_ONELEVEL, LdbError
-
-from samba import Ldb, read_and_sub_file, setup_file
-from samba.credentials import Credentials, DONT_USE_KERBEROS
-from samba.schema import Schema
-
-
-class SlapdAlreadyRunning(Exception):
-
- def __init__(self, uri):
- self.ldapi_uri = uri
- super(SlapdAlreadyRunning, self).__init__("Another slapd Instance "
- "seems already running on this host, listening to %s." %
- self.ldapi_uri)
-
class BackendResult(object):
@@ -59,27 +36,9 @@ class BackendResult(object):
raise NotImplementedError(self.report_logger)
-class LDAPBackendResult(BackendResult):
-
- def __init__(self, slapd_command_escaped, ldapdir):
- self.slapd_command_escaped = slapd_command_escaped
- self.ldapdir = ldapdir
-
- def report_logger(self, logger):
- if self.slapd_command_escaped is not None:
- # now display slapd_command_file.txt to show how slapd must be
- # started next time
- logger.info(
- "Use later the following commandline to start slapd, then Samba:")
- logger.info(self.slapd_command_escaped)
- logger.info(
- "This slapd-Commandline is also stored under: %s/ldap_backend_startup.sh",
- self.ldapdir)
-
-
class ProvisionBackend(object):
- def __init__(self, backend_type, paths=None, lp=None,
+ def __init__(self, paths=None, lp=None,
names=None, logger=None):
"""Provision a backend for samba4"""
self.paths = paths
@@ -88,10 +47,7 @@ class ProvisionBackend(object):
self.names = names
self.logger = logger
- self.type = backend_type
-
- # Set a default - the code for "existing" below replaces this
- self.ldap_backend_type = backend_type
+ self.type = "ldb"
def init(self):
"""Initialize the backend."""
@@ -131,692 +87,3 @@ class LDBBackend(ProvisionBackend):
pass
-class LDAPBackend(ProvisionBackend):
-
- def __init__(self, backend_type, paths=None, lp=None,
- names=None, logger=None, domainsid=None,
- schema=None, hostname=None, ldapadminpass=None,
- slapd_path=None, ldap_backend_extra_port=None,
- ldap_backend_forced_uri=None, ldap_dryrun_mode=False):
-
- super(LDAPBackend, self).__init__(backend_type=backend_type,
- paths=paths, lp=lp,
- names=names, logger=logger)
-
- self.domainsid = domainsid
- self.schema = schema
- self.hostname = hostname
-
- self.ldapdir = os.path.join(paths.private_dir, "ldap")
- self.ldapadminpass = ldapadminpass
-
- self.slapd_path = slapd_path
- self.slapd_command = None
- self.slapd_command_escaped = None
- self.slapd_pid = os.path.join(self.ldapdir, "slapd.pid")
-
- self.ldap_backend_extra_port = ldap_backend_extra_port
- self.ldap_dryrun_mode = ldap_dryrun_mode
-
- if ldap_backend_forced_uri is not None:
- self.ldap_uri = ldap_backend_forced_uri
- else:
- self.ldap_uri = "ldapi://%s" % urllib_quote(
- os.path.join(self.ldapdir, "ldapi"), safe="")
-
- if not os.path.exists(self.ldapdir):
- os.mkdir(self.ldapdir)
-
- def init(self):
- from samba.provision import ProvisioningError
- # we will shortly start slapd with ldapi for final provisioning. first
- # check with ldapsearch -> rootDSE via self.ldap_uri if another
- # instance of slapd is already running
- try:
- ldapi_db = Ldb(self.ldap_uri)
- ldapi_db.search(base="", scope=SCOPE_BASE,
- expression="(objectClass=OpenLDAProotDSE)")
- try:
- f = open(self.slapd_pid, "r")
- except IOError as err:
- if err != errno.ENOENT:
- raise
- else:
- try:
- p = f.read()
- finally:
- f.close()
- self.logger.info("Check for slapd process with PID: %s and terminate it manually." % p)
- raise SlapdAlreadyRunning(self.ldap_uri)
- except LdbError:
- # XXX: We should never be catching all Ldb errors
- pass
-
- # Try to print helpful messages when the user has not specified the
- # path to slapd
- if self.slapd_path is None:
- raise ProvisioningError("Warning: LDAP-Backend must be setup with path to slapd, e.g. --slapd-path=\"/usr/local/libexec/slapd\"!")
- if not os.path.exists(self.slapd_path):
- self.logger.warning("Path (%s) to slapd does not exist!",
- self.slapd_path)
-
- if not os.path.isdir(self.ldapdir):
- os.makedirs(self.ldapdir, 0o700)
-
- # Put the LDIF of the schema into a database so we can search on
- # it to generate schema-dependent configurations in Fedora DS and
- # OpenLDAP
- schemadb_path = os.path.join(self.ldapdir, "schema-tmp.ldb")
- try:
- os.unlink(schemadb_path)
- except OSError:
- pass
-
- self.schema.write_to_tmp_ldb(schemadb_path)
-
- self.credentials = Credentials()
- self.credentials.guess(self.lp)
- # Kerberos to an ldapi:// backend makes no sense (we also force EXTERNAL)
- self.credentials.set_kerberos_state(DONT_USE_KERBEROS)
- self.credentials.set_username("samba-admin")
- self.credentials.set_password(self.ldapadminpass)
- self.credentials.set_forced_sasl_mech("EXTERNAL")
-
- self.provision()
-
- def provision(self):
- pass
-
- def start(self):
- from samba.provision import ProvisioningError
- self.slapd_command_escaped = "\'" + "\' \'".join(self.slapd_command) + "\'"
- ldap_backend_script = os.path.join(self.ldapdir, "ldap_backend_startup.sh")
- f = open(ldap_backend_script, 'w')
- try:
- f.write("#!/bin/sh\n" + self.slapd_command_escaped + " $@\n")
- finally:
- f.close()
-
- os.chmod(ldap_backend_script, 0o755)
-
- # Now start the slapd, so we can provision onto it. We keep the
- # subprocess context around, to kill this off at the successful
- # end of the script
- self.slapd = subprocess.Popen(self.slapd_provision_command,
- close_fds=True, shell=False)
-
- count = 0
- while self.slapd.poll() is None:
- # Wait until the socket appears
- try:
- time.sleep(1)
- ldapi_db = Ldb(self.ldap_uri, lp=self.lp, credentials=self.credentials)
- ldapi_db.search(base="", scope=SCOPE_BASE,
- expression="(objectClass=OpenLDAProotDSE)")
- # If we have got here, then we must have a valid connection to
- # the LDAP server!
- return
- except LdbError:
- count = count + 1
-
- if count > 15:
- self.logger.error("Could not connect to slapd started with: %s" % "\'" + "\' \'".join(self.slapd_provision_command) + "\'")
- raise ProvisioningError("slapd never accepted a connection within 15 seconds of starting")
-
- self.logger.error("Could not start slapd with: %s" % "\'" + "\' \'".join(self.slapd_provision_command) + "\'")
- raise ProvisioningError("slapd died before we could make a connection to it")
-
- def shutdown(self):
- # if an LDAP backend is in use, terminate slapd after final provision
- # and check its proper termination
- if self.slapd.poll() is None:
- # Kill the slapd
- if getattr(self.slapd, "terminate", None) is not None:
- self.slapd.terminate()
- else:
- # Older python versions don't have .terminate()
- import signal
- os.kill(self.slapd.pid, signal.SIGTERM)
-
- # and now wait for it to die
- self.slapd.communicate()
-
- def post_setup(self):
- return LDAPBackendResult(self.slapd_command_escaped,
- self.ldapdir)
-
-
-class OpenLDAPBackend(LDAPBackend):
-
- def __init__(self, backend_type, paths=None, lp=None,
- credentials=None, names=None, logger=None, domainsid=None,
- schema=None, hostname=None, ldapadminpass=None, slapd_path=None,
- ldap_backend_extra_port=None, ldap_dryrun_mode=False,
- ol_mmr_urls=None, nosync=False, ldap_backend_forced_uri=None):
- from samba.provision import setup_path
- super(OpenLDAPBackend, self).__init__(backend_type=backend_type,
- paths=paths, lp=lp,
- names=names, logger=logger,
- domainsid=domainsid, schema=schema, hostname=hostname,
- ldapadminpass=ldapadminpass, slapd_path=slapd_path,
- ldap_backend_extra_port=ldap_backend_extra_port,
- ldap_backend_forced_uri=ldap_backend_forced_uri,
- ldap_dryrun_mode=ldap_dryrun_mode)
-
- self.ol_mmr_urls = ol_mmr_urls
- self.nosync = nosync
-
- self.slapdconf = os.path.join(self.ldapdir, "slapd.conf")
- self.modulesconf = os.path.join(self.ldapdir, "modules.conf")
- self.memberofconf = os.path.join(self.ldapdir, "memberof.conf")
- self.olmmrserveridsconf = os.path.join(self.ldapdir, "mmr_serverids.conf")
- self.olmmrsyncreplconf = os.path.join(self.ldapdir, "mmr_syncrepl.conf")
- self.olcdir = os.path.join(self.ldapdir, "slapd.d")
- self.olcseedldif = os.path.join(self.ldapdir, "olc_seed.ldif")
-
- self.schema = Schema(self.domainsid,
- schemadn=self.names.schemadn, files=[
- setup_path("schema_samba4.ldif")])
-
- def setup_db_dir(self, dbdir):
- """Create a database directory.
-
- :param dbdir: Database directory.
- """
- if not os.path.exists(dbdir):
- os.makedirs(dbdir, 0o700)
-
- def provision(self):
- from samba.provision import ProvisioningError, setup_path
- # Wipe the directories so we can start
- shutil.rmtree(os.path.join(self.ldapdir, "db"), True)
-
- # Allow the test scripts to turn off fsync() for OpenLDAP as for TDB
- # and LDB
- nosync_config = ""
- if self.nosync:
- nosync_config = "dbnosync"
-
- lnkattr = self.schema.linked_attributes()
- refint_attributes = ""
- memberof_config = "# Generated from Samba4 schema\n"
- for att in lnkattr.keys():
- if lnkattr[att] is not None:
- refint_attributes = refint_attributes + " " + att
-
- memberof_config += read_and_sub_file(
- setup_path("memberof.conf"), {
- "MEMBER_ATTR": att,
- "MEMBEROF_ATTR": lnkattr[att]})
-
- refint_config = read_and_sub_file(
- setup_path("refint.conf"), {"LINK_ATTRS": refint_attributes})
-
- attrs = ["linkID", "lDAPDisplayName"]
- res = self.schema.ldb.search(
- expression="(&(objectclass=attributeSchema)"
- "(searchFlags:1.2.840.113556.1.4.803:=1))",
- base=self.names.schemadn, scope=SCOPE_ONELEVEL, attrs=attrs)
- index_config = ""
- for i in range(0, len(res)):
- index_attr = str(res[i]["lDAPDisplayName"][0])
- if index_attr == "objectGUID":
- index_attr = "entryUUID"
-
- index_config += "index " + index_attr + " eq\n"
-
- # generate serverids, ldap-urls and syncrepl-blocks for mmr hosts
- mmr_on_config = ""
- mmr_replicator_acl = ""
- mmr_serverids_config = ""
- mmr_syncrepl_schema_config = ""
- mmr_syncrepl_config_config = ""
- mmr_syncrepl_domaindns_config = ""
- mmr_syncrepl_forestdns_config = ""
- mmr_syncrepl_user_config = ""
- mmr_pass = ""
-
- if self.ol_mmr_urls is not None:
- # For now, make these equal
- mmr_pass = self.ldapadminpass
--
Samba Shared Repository
More information about the samba-cvs
mailing list