diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-04-02 14:33:56 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-04-02 14:33:56 +0200 |
| commit | b17484a70f50d3cc2b1031e86dfe080b9f48181d (patch) | |
| tree | 092468b7c2ad20071f409ae79dca4972d707578a /source4/setup | |
| parent | caaa8f5b93b12111d04b7ebc82b65cb0cfe404c6 (diff) | |
| parent | 67bf4bab3ddaf8d1dfaee92007700d8f05a1c191 (diff) | |
| download | samba-b17484a70f50d3cc2b1031e86dfe080b9f48181d.tar.gz samba-b17484a70f50d3cc2b1031e86dfe080b9f48181d.tar.bz2 samba-b17484a70f50d3cc2b1031e86dfe080b9f48181d.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into openchange
(This used to be commit 8c3591d98f42a75d68d698f7b4be8f2e0284522f)
Diffstat (limited to 'source4/setup')
| -rwxr-xr-x | source4/setup/provision | 12 | ||||
| -rw-r--r-- | source4/setup/provision.zone | 2 | ||||
| -rw-r--r-- | source4/setup/provision_self_join.ldif | 1 |
3 files changed, 8 insertions, 7 deletions
diff --git a/source4/setup/provision b/source4/setup/provision index e354f4d0bb..259bd814a4 100755 --- a/source4/setup/provision +++ b/source4/setup/provision @@ -52,14 +52,14 @@ 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)") + help="set IPv4 ipaddress") +parser.add_option("--host-ip6", type="string", metavar="IP6ADDRESS", + help="set IPv6 ipaddress") parser.add_option("--adminpass", type="string", metavar="PASSWORD", help="choose admin password (otherwise random)") parser.add_option("--krbtgtpass", type="string", metavar="PASSWORD", @@ -141,7 +141,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, hostip6=opts.host_ip6, 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.zone b/source4/setup/provision.zone index 371dfd9e72..28c1c29762 100644 --- a/source4/setup/provision.zone +++ b/source4/setup/provision.zone @@ -9,8 +9,10 @@ $TTL 1W 6W ; expiry 1W ) ; minimum IN NS ${HOSTNAME} +${HOSTIP6_BASE_LINE} IN A ${HOSTIP} ; +${HOSTIP6_HOST_LINE} ${HOSTNAME} IN A ${HOSTIP} ${HOSTGUID}._msdcs IN CNAME ${HOSTNAME} ; 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} |