diff options
| author | Andrew Kroeger <andrew@sprocks.gotdns.com> | 2008-04-01 19:51:24 -0500 |
|---|---|---|
| committer | Andrew Kroeger <andrew@sprocks.gotdns.com> | 2008-04-01 19:51:24 -0500 |
| commit | 3c0c6acc594fba1f1d28e49cb105c99fa1649a18 (patch) | |
| tree | 6f70beb01eb2043981e3c952483a0f4365244375 /source4/setup | |
| parent | 5a498290b0f48befe35c4a5a60f66713df0c8f18 (diff) | |
| download | samba-3c0c6acc594fba1f1d28e49cb105c99fa1649a18.tar.gz samba-3c0c6acc594fba1f1d28e49cb105c99fa1649a18.tar.bz2 samba-3c0c6acc594fba1f1d28e49cb105c99fa1649a18.zip | |
provision: Add support for IPv6 (bz #4593).
(This used to be commit 8585a3c77d5dfe97bca3f08716fc06ac2819f578)
Diffstat (limited to 'source4/setup')
| -rwxr-xr-x | source4/setup/provision | 6 | ||||
| -rw-r--r-- | source4/setup/provision.zone | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/source4/setup/provision b/source4/setup/provision index e354f4d0bb..f940b30744 100755 --- a/source4/setup/provision +++ b/source4/setup/provision @@ -55,7 +55,9 @@ parser.add_option("--policy-guid", type="string", metavar="GUID", parser.add_option("--host-name", type="string", metavar="HOSTNAME", help="set hostname") parser.add_option("--host-ip", type="string", metavar="IPADDRESS", - help="set ipaddress") + help="set IPv4 ipaddress") +parser.add_option("--host-ip6", type="string", metavar="IP6ADDRESS", + help="set IPv6 ipaddress") parser.add_option("--host-guid", type="string", metavar="GUID", help="set hostguid (otherwise random)") parser.add_option("--invocationid", type="string", metavar="GUID", @@ -141,7 +143,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, hostguid=opts.host_guid, 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} ; |