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

Remove --ldap-base from the python provision script

Browse Source 
(This is a merge from the ejs script)

Andrew Bartlett
(This used to be commit d822dfa017)
This commit is contained in:
Andrew Bartlett
2008-01-18 13:25:01 +11:00
parent 564e021ed9
commit 064eb82870
2 changed files with 2 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -180,12 +180,6 @@ def provision_paths_from_lp(lp, dnsdomain):
paths.dns_keytab = os.path.join(private_dir, "dns.keytab")
paths.dns = os.path.join(private_dir, dnsdomain + ".zone")
paths.winsdb = os.path.join(private_dir, "wins.ldb")
paths.ldap_basedn_ldif = os.path.join(private_dir,
dnsdomain + ".ldif")
paths.ldap_config_basedn_ldif = os.path.join(private_dir,
dnsdomain + "-config.ldif")
paths.ldap_schema_basedn_ldif = os.path.join(private_dir,
dnsdomain + "-schema.ldif")
paths.s4_ldapi_path = os.path.join(private_dir, "ldapi")
paths.phpldapadminconfig = os.path.join(private_dir,
"phpldapadmin-config.php")
@ -465,7 +459,6 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
setup_add_ldif(samdb, setup_path("provision_basedn.ldif"), {
"DOMAINDN": domaindn,
"ACI": aci,
"EXTENSIBLEOBJECT": "# no objectClass: extensibleObject for local ldb",
"RDN_DC": rdn_dc,
})
@ -823,31 +816,6 @@ def create_zone_file(path, setup_path, samdb, dnsdomain, domaindn,
})
def provision_ldapbase(setup_dir, message, paths):
"""Write out a DNS zone file, from the info in the current database."""
message("Setting up LDAP base entry: %s" % domaindn)
rdns = domaindn.split(",")
rdn_dc = rdns[0][len("DC="):]
def setup_path(file):
return os.path.join(setup_dir, file)
setup_file(setup_path("provision_basedn.ldif"),
paths.ldap_basedn_ldif)
setup_file(setup_path("provision_configuration_basedn.ldif"),
paths.ldap_config_basedn_ldif)
setup_file(setup_path("provision_schema_basedn.ldif"),
paths.ldap_schema_basedn_ldif, {
"SCHEMADN": schemadn,
"ACI": "# no aci for local ldb",
"EXTENSIBLEOBJECT": "objectClass: extensibleObject"})
message("Please install the LDIF located in " + paths.ldap_basedn_ldif + ", " + paths.ldap_config_basedn_ldif + " and " + paths.ldap_schema_basedn_ldif + " into your LDAP server, and re-run with --ldap-backend=ldap://my.ldap.server")
def load_schema(setup_path, samdb, schemadn, netbiosname, configdn):
"""Load schema.