diff options
| author | Nadezhda Ivanova <nivanova@symas.com> | 2013-09-24 10:26:05 -0700 |
|---|---|---|
| committer | Nadezhda Ivanova <nivanova@samba.org> | 2013-09-26 07:31:05 +0200 |
| commit | fc486d861c4c616407725b7adfa7cec712526c9a (patch) | |
| tree | 5b7c2d757eee4a52b444d63b1a73c8fcc9c53616 /python/samba/provision/__init__.py | |
| parent | 58cb40d50ba7d0eb70ee1bcdae8c3bf6d9b17f8a (diff) | |
| download | samba-fc486d861c4c616407725b7adfa7cec712526c9a.tar.gz samba-fc486d861c4c616407725b7adfa7cec712526c9a.tar.bz2 samba-fc486d861c4c616407725b7adfa7cec712526c9a.zip | |
s4-openldap: Restored openldap-related options to the provision script
At the moment they are only available if TEST_LDAP=yes to avoid accidental use
as the openldap backend is still failing some tests
Signed-off-by: Nadezhda Ivanova <nivanova@symas.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Nadezhda Ivanova <nivanova@samba.org>
Autobuild-Date(master): Thu Sep 26 07:31:05 CEST 2013 on sn-devel-104
Diffstat (limited to 'python/samba/provision/__init__.py')
| -rw-r--r-- | python/samba/provision/__init__.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/python/samba/provision/__init__.py b/python/samba/provision/__init__.py index 89f029a2af..631fff6abf 100644 --- a/python/samba/provision/__init__.py +++ b/python/samba/provision/__init__.py @@ -1898,9 +1898,10 @@ def provision(logger, session_info, credentials, smbconf=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="/bin/false", + sitename=None, ol_mmr_urls=None, ol_olc=None, slapd_path=None, useeadb=False, am_rodc=False, lp=None, use_ntvfs=False, - use_rfc2307=False, maxuid=None, maxgid=None, skip_sysvolacl=True): + 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): """Provision samba4 :note: caution, this wipes all existing data! @@ -2072,7 +2073,7 @@ def provision(logger, session_info, credentials, smbconf=None, provision_backend = ExistingBackend(backend_type, paths=paths, lp=lp, credentials=credentials, names=names, logger=logger, - ldap_backend_forced_uri=None) + ldap_backend_forced_uri=ldap_backend_forced_uri) elif backend_type == "fedora-ds": provision_backend = FDSBackend(backend_type, paths=paths, lp=lp, credentials=credentials, @@ -2085,7 +2086,10 @@ def provision(logger, session_info, credentials, smbconf=None, lp=lp, credentials=credentials, names=names, logger=logger, domainsid=domainsid, schema=schema, hostname=hostname, ldapadminpass=ldapadminpass, - slapd_path=slapd_path, ol_mmr_urls=ol_mmr_urls) + 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") |