diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-04-02 11:38:58 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-04-02 11:38:58 +1100 |
| commit | 2ab6dd9ea58c7f09791f45077df084447fc7de69 (patch) | |
| tree | 1f468e46e99503aa54427cc7cced7990c90cb216 /source4/setup | |
| parent | 5a498290b0f48befe35c4a5a60f66713df0c8f18 (diff) | |
| download | samba-2ab6dd9ea58c7f09791f45077df084447fc7de69.tar.gz samba-2ab6dd9ea58c7f09791f45077df084447fc7de69.tar.bz2 samba-2ab6dd9ea58c7f09791f45077df084447fc7de69.zip | |
Remove references to setting the host GUID, as the repl_meta_data
module prohibits it anyway.
Andrew Bartlett
(This used to be commit c5b287c056855892f30fbbf32efe7d65da31ce91)
Diffstat (limited to 'source4/setup')
| -rwxr-xr-x | source4/setup/provision | 8 | ||||
| -rw-r--r-- | source4/setup/provision_self_join.ldif | 1 |
2 files changed, 3 insertions, 6 deletions
diff --git a/source4/setup/provision b/source4/setup/provision index e354f4d0bb..30067f5592 100755 --- a/source4/setup/provision +++ b/source4/setup/provision @@ -52,14 +52,12 @@ parser.add_option("--domain-sid", type="string", metavar="SID", help="set domainsid (otherwise random)") parser.add_option("--policy-guid", type="string", metavar="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", help="set hostname") parser.add_option("--host-ip", type="string", metavar="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", help="choose admin password (otherwise random)") 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, domainguid=opts.domain_guid, domainsid=opts.domain_sid, 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, krbtgtpass=opts.krbtgtpass, machinepass=opts.machinepass, dnspass=opts.dnspass, root=opts.root, nobody=opts.nobody, diff --git a/source4/setup/provision_self_join.ldif b/source4/setup/provision_self_join.ldif index 503656a9bf..a0cfa7eb23 100644 --- a/source4/setup/provision_self_join.ldif +++ b/source4/setup/provision_self_join.ldif @@ -19,7 +19,6 @@ servicePrincipalName: HOST/${DNSNAME}/${REALM} servicePrincipalName: HOST/${NETBIOSNAME}/${REALM} servicePrincipalName: HOST/${DNSNAME}/${DOMAIN} servicePrincipalName: HOST/${NETBIOSNAME}/${DOMAIN} -${HOSTGUID_ADD} #Provide a account for DNS keytab export dn: CN=dns,CN=Users,${DOMAINDN} |