sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-28 11:42:03 +03:00
Code Activity

Make sure server_role gets initialized in backend provisioning code -

Browse Source 
fixes test.
This commit is contained in:
Jelmer Vernooij
2009-01-19 21:14:37 +01:00
parent 2254efbf5d
commit b876478219
3 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source4/scripting/python/samba/provision.py
View File

@ -1195,6 +1195,9 @@ def provision_backend(setup_dir=None, message=None,
lp = param.LoadParm()
lp.load(smbconf)
if serverrole is None:
serverrole = lp.get("server role")
names = guess_names(lp=lp, hostname=hostname, domain=domain,
dnsdomain=realm, serverrole=serverrole,
rootdn=rootdn, domaindn=domaindn, configdn=configdn,
@ -1405,7 +1408,20 @@ def provision_backend(setup_dir=None, message=None,
message("LDAP admin password: %s" % adminpass)
message(slapdcommand)
message("Run provision with: --ldap-backend=ldapi --ldap-backend-type=" + ldap_backend_type + " --password=" + adminpass + " " + ldapuser + "--realm=" + names.dnsdomain + " --domain=" + names.domain + " --server-role='" + serverrole + "'")
assert isinstance(ldap_backend_type, str)
assert isinstance(ldapuser, str)
assert isinstance(adminpass, str)
assert isinstance(names.dnsdomain, str)
assert isinstance(names.domain, str)
assert isinstance(serverrole, str)
args = ["--ldap-backend=ldapi",
"--ldap-backend-type=" + ldap_backend_type,
"--password=" + adminpass,
ldapuser,
"--realm=" + names.dnsdomain,
"--domain=" + names.domain,
"--server-role='" + serverrole + "'"]
message("Run provision with: " + " ".join(args))
def create_phpldapadmin_config(path, setup_path, ldapi_uri):
"""Create a PHP LDAP admin configuration file.