sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-03 04:22:09 +03:00
Code Activity

Remove references to setting the host GUID, as the repl_meta_data

Browse Source 
module prohibits it anyway.

Andrew Bartlett
(This used to be commit c5b287c056)
This commit is contained in:
Andrew Bartlett
2008-04-02 11:38:58 +11:00
parent 5a498290b0
commit 2ab6dd9ea5
3 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -695,13 +695,8 @@ def setup_samdb_rootdse(samdb, setup_path, schemadn, domaindn, hostname,
def setup_self_join(samdb, names, def setup_self_join(samdb, names,
machinepass, dnspass, machinepass, dnspass,
domainsid, invocationid, setup_path, domainsid, invocationid, setup_path,
policyguid, hostguid=None): policyguid):
"""Join a host to its own domain.""" """Join a host to its own domain."""
if hostguid is not None:
hostguid_add = "objectGUID: %s" % hostguid
else:
hostguid_add = ""
setup_add_ldif(samdb, setup_path("provision_self_join.ldif"), { setup_add_ldif(samdb, setup_path("provision_self_join.ldif"), {
"CONFIGDN": names.configdn, "CONFIGDN": names.configdn,
"SCHEMADN": names.schemadn, "SCHEMADN": names.schemadn,
@ -714,7 +709,6 @@ def setup_self_join(samdb, names,
"DNSPASS_B64": b64encode(dnspass), "DNSPASS_B64": b64encode(dnspass),
"REALM": names.realm, "REALM": names.realm,
"DOMAIN": names.domain, "DOMAIN": names.domain,
"HOSTGUID_ADD": hostguid_add,
"DNSDOMAIN": names.dnsdomain}) "DNSDOMAIN": names.dnsdomain})
setup_add_ldif(samdb, setup_path("provision_group_policy.ldif"), { setup_add_ldif(samdb, setup_path("provision_group_policy.ldif"), {
"POLICYGUID": policyguid, "POLICYGUID": policyguid,
@ -727,7 +721,7 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
names, message, names, message,
domainsid, aci, domainguid, policyguid, domainsid, aci, domainguid, policyguid,
fill, adminpass, krbtgtpass, fill, adminpass, krbtgtpass,
machinepass, hostguid, invocationid, dnspass, machinepass, invocationid, dnspass,
serverrole, ldap_backend=None, serverrole, ldap_backend=None,
ldap_backend_type=None): ldap_backend_type=None):
"""Setup a complete SAM Database. """Setup a complete SAM Database.
@ -880,7 +874,6 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
dnspass=dnspass, dnspass=dnspass,
machinepass=machinepass, machinepass=machinepass,
domainsid=domainsid, policyguid=policyguid, domainsid=domainsid, policyguid=policyguid,
hostguid=hostguid,
setup_path=setup_path) setup_path=setup_path)
#We want to setup the index last, as adds are faster unindexed #We want to setup the index last, as adds are faster unindexed
@ -902,7 +895,7 @@ def provision(setup_dir, message, session_info,
credentials, smbconf=None, targetdir=None, samdb_fill=FILL_FULL, realm=None, credentials, smbconf=None, targetdir=None, samdb_fill=FILL_FULL, realm=None,
rootdn=None, domaindn=None, schemadn=None, configdn=None, rootdn=None, domaindn=None, schemadn=None, configdn=None,
domain=None, hostname=None, hostip=None, domainsid=None, domain=None, hostname=None, hostip=None, domainsid=None,
hostguid=None, adminpass=None, krbtgtpass=None, domainguid=None, adminpass=None, krbtgtpass=None, domainguid=None,
policyguid=None, invocationid=None, machinepass=None, policyguid=None, invocationid=None, machinepass=None,
dnspass=None, root=None, nobody=None, nogroup=None, users=None, dnspass=None, root=None, nobody=None, nogroup=None, users=None,
wheel=None, backup=None, aci=None, serverrole=None, wheel=None, backup=None, aci=None, serverrole=None,
@ -1006,7 +999,7 @@ def provision(setup_dir, message, session_info,
aci=aci, domainguid=domainguid, policyguid=policyguid, aci=aci, domainguid=domainguid, policyguid=policyguid,
fill=samdb_fill, fill=samdb_fill,
adminpass=adminpass, krbtgtpass=krbtgtpass, adminpass=adminpass, krbtgtpass=krbtgtpass,
hostguid=hostguid, invocationid=invocationid, invocationid=invocationid,
machinepass=machinepass, dnspass=dnspass, machinepass=machinepass, dnspass=dnspass,
serverrole=serverrole, ldap_backend=ldap_backend, serverrole=serverrole, ldap_backend=ldap_backend,
ldap_backend_type=ldap_backend_type) ldap_backend_type=ldap_backend_type)
@ -1077,7 +1070,7 @@ def provision_become_dc(setup_dir=None,
smbconf=None, targetdir=None, realm=None, smbconf=None, targetdir=None, realm=None,
rootdn=None, domaindn=None, schemadn=None, configdn=None, rootdn=None, domaindn=None, schemadn=None, configdn=None,
domain=None, hostname=None, domainsid=None, domain=None, hostname=None, domainsid=None,
hostguid=None, adminpass=None, krbtgtpass=None, domainguid=None, adminpass=None, krbtgtpass=None, domainguid=None,
policyguid=None, invocationid=None, machinepass=None, policyguid=None, invocationid=None, machinepass=None,
dnspass=None, root=None, nobody=None, nogroup=None, users=None, dnspass=None, root=None, nobody=None, nogroup=None, users=None,
wheel=None, backup=None, aci=None, serverrole=None, wheel=None, backup=None, aci=None, serverrole=None,

8
source4/setup/provision
View File

@ -52,14 +52,12 @@ parser.add_option("--domain-sid", type="string", metavar="SID",
help="set domainsid (otherwise random)") help="set domainsid (otherwise random)")
parser.add_option("--policy-guid", type="string", metavar="GUID", parser.add_option("--policy-guid", type="string", metavar="GUID",
help="set policy guid") help="set policy guid")
parser.add_option("--invocationid", type="string", metavar="GUID",
help="set invocationid (otherwise random)")
parser.add_option("--host-name", type="string", metavar="HOSTNAME", parser.add_option("--host-name", type="string", metavar="HOSTNAME",
help="set hostname") help="set hostname")
parser.add_option("--host-ip", type="string", metavar="IPADDRESS", parser.add_option("--host-ip", type="string", metavar="IPADDRESS",
help="set ipaddress") help="set ipaddress")
parser.add_option("--host-guid", type="string", metavar="GUID",
help="set hostguid (otherwise random)")
parser.add_option("--invocationid", type="string", metavar="GUID",
help="set invocationid (otherwise random)")
parser.add_option("--adminpass", type="string", metavar="PASSWORD", parser.add_option("--adminpass", type="string", metavar="PASSWORD",
help="choose admin password (otherwise random)") help="choose admin password (otherwise random)")
parser.add_option("--krbtgtpass", type="string", metavar="PASSWORD", parser.add_option("--krbtgtpass", type="string", metavar="PASSWORD",
@ -141,7 +139,7 @@ provision(setup_dir, message,
samdb_fill=samdb_fill, realm=opts.realm, domain=opts.domain, samdb_fill=samdb_fill, realm=opts.realm, domain=opts.domain,
domainguid=opts.domain_guid, domainsid=opts.domain_sid, domainguid=opts.domain_guid, domainsid=opts.domain_sid,
policyguid=opts.policy_guid, hostname=opts.host_name, policyguid=opts.policy_guid, hostname=opts.host_name,
hostip=opts.host_ip, hostguid=opts.host_guid, hostip=opts.host_ip,
invocationid=opts.invocationid, adminpass=opts.adminpass, invocationid=opts.invocationid, adminpass=opts.adminpass,
krbtgtpass=opts.krbtgtpass, machinepass=opts.machinepass, krbtgtpass=opts.krbtgtpass, machinepass=opts.machinepass,
dnspass=opts.dnspass, root=opts.root, nobody=opts.nobody, dnspass=opts.dnspass, root=opts.root, nobody=opts.nobody,

1
source4/setup/provision_self_join.ldif
View File

@ -19,7 +19,6 @@ servicePrincipalName: HOST/${DNSNAME}/${REALM}
servicePrincipalName: HOST/${NETBIOSNAME}/${REALM} servicePrincipalName: HOST/${NETBIOSNAME}/${REALM}
servicePrincipalName: HOST/${DNSNAME}/${DOMAIN} servicePrincipalName: HOST/${DNSNAME}/${DOMAIN}
servicePrincipalName: HOST/${NETBIOSNAME}/${DOMAIN} servicePrincipalName: HOST/${NETBIOSNAME}/${DOMAIN}
${HOSTGUID_ADD}
#Provide a account for DNS keytab export #Provide a account for DNS keytab export
dn: CN=dns,CN=Users,${DOMAINDN} dn: CN=dns,CN=Users,${DOMAINDN}