:param sysvolpath: Physical path for the sysvol folder
:param dnsdomain: DNS domain name of the AD domain
:param policyguid: GUID of the default domain policy
- :param policyguid_dc: GUID of the default domain controler policy
+ :param policyguid_dc: GUID of the default domain controller policy
"""
policy_path = getpolicypath(sysvolpath, dnsdomain, policyguid)
create_gpo_struct(policy_path)
:param netlogon: Physical path for the netlogon folder
:param sysvol: Physical path for the sysvol folder
:param uid: The UID of the "Administrator" user
- :param gid: The GID of the "Domain adminstrators" group
+ :param gid: The GID of the "Domain administrators" group
:param domainsid: The SID of the domain
:param dnsdomain: The DNS name of the domain
:param domaindn: The DN of the domain (ie. DC=...)
# marked in secrets.tdb
s4_passdb = passdb.PDB(s3conf.get("passdb backend"))
- # now ensure everything matches correctly, to avoid wierd issues
+ # now ensure everything matches correctly, to avoid weird issues
if passdb.get_global_sam_sid() != domainsid:
raise ProvisioningError('SID as seen by smbd [%s] does not match SID as seen by the provision script [%s]!' % (passdb.get_global_sam_sid(), domainsid))
:param netlogon: Physical path for the netlogon folder
:param sysvol: Physical path for the sysvol folder
:param uid: The UID of the "Administrator" user
- :param gid: The GID of the "Domain adminstrators" group
+ :param gid: The GID of the "Domain administrators" group
:param domainsid: The SID of the domain
:param dnsdomain: The DNS name of the domain
:param domaindn: The DN of the domain (ie. DC=...)
# ensure that we init the samba_dsdb backend, so the domain sid is marked in secrets.tdb
s4_passdb = passdb.PDB(s3conf.get("passdb backend"))
- # now ensure everything matches correctly, to avoid wierd issues
+ # now ensure everything matches correctly, to avoid weird issues
if passdb.get_global_sam_sid() != domainsid:
raise ProvisioningError('SID as seen by smbd [%s] does not match SID as seen by the provision script [%s]!' % (passdb.get_global_sam_sid(), domainsid))
def setup_path(file):
- """Return an absolute path to the provision tempate file specified by file"""
+ """Return an absolute path to the provision template file specified by file"""
return os.path.join(setup_dir(), file)
:param ldb: LDB file to import data into
:param ldif_path: Path of the LDIF file to load
- :param subst_vars: Optional variables to subsitute in LDIF.
+ :param subst_vars: Optional variables to substitute in LDIF.
:param nocontrols: Optional list of controls, can be None for no controls
"""
if controls is None:
return dnsadmins_sid
-# Note: these classses are not quite the same as similar looking ones
+# Note: these classes are not quite the same as similar looking ones
# in ../dnsserver.py -- those ones are based on
# dnsserver.DNS_RPC_RECORD ([MS-DNSP]2.2.2.2.5 "DNS_RPC_RECORD"),
# these are based on dnsp.DnssrvRpcRecord ([MS-DNSP] 2.3.2.2
key_version_number = 1
# This will create the dns.keytab file in the private_dir when it is
- # commited!
+ # committed!
setup_ldb(secretsdb, setup_path("secrets_dns.ldif"), {
"REALM": realm,
"DNSDOMAIN": dnsdomain,
"""
# TODO: This really should have been done as a top level import.
- # It is done here to avoid a depencency loop. That is, we move
+ # It is done here to avoid a dependency loop. That is, we move
# ProvisioningError to another file, and have all the provision
# scripts import it from there.