Fix merge of my host GUID removal and the IPv6 addition to provision

Merge branch 'v4-0-ipv6' of git://git.id10ts.net/samba into 4-0-abartlet

Andrew Bartlett
(This used to be commit d3336684f084f984500dd0893dd01bcfc5be0ab1)

diff --cc source4/scripting/python/samba/provision.py
index 50d9f8d2ffac4adc27eb9140c3acffda0537ccda,870f64ecc91427de70f6f4f56c1307ed5134beaf..dfeb61e52bb983b4e79fbf92f9aae1db10196586
--- 1/source4/scripting/python/samba/provision.py
--- 2/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@@ -894,8 -901,8 +894,8 @@@ FILL_DRS = "DRS
  def provision(setup_dir, message, session_info, 
                credentials, smbconf=None, targetdir=None, samdb_fill=FILL_FULL, realm=None, 
                rootdn=None, domaindn=None, schemadn=None, configdn=None,
-               domain=None, hostname=None, hostip=None, domainsid=None, 
-               adminpass=None, krbtgtpass=None, domainguid=None, 
 -              domain=None, hostname=None, hostip=None, hostip6=None, domainsid=None, 
 -              hostguid=None, adminpass=None, krbtgtpass=None, domainguid=None, 
++              domain=None, hostname=None, hostip=None, hostip6=None, 
++              domainsid=None, adminpass=None, krbtgtpass=None, domainguid=None, 
                policyguid=None, invocationid=None, machinepass=None, 
                dnspass=None, root=None, nobody=None, nogroup=None, users=None, 
                wheel=None, backup=None, aci=None, serverrole=None, 

diff --cc source4/setup/provision
index 30067f559230f6a5af75de1e2a556d7fcdafa066,f940b30744e9fb4dfd279be708a4df8e303825d2..afda9eeaded3307902c52183820f350c2524d862
--- 1/source4/setup/provision
--- 2/source4/setup/provision
+++ b/source4/setup/provision
@@@ -57,7 -55,13 +57,17 @@@ parser.add_option("--invocationid", typ
  parser.add_option("--host-name", type="string", metavar="HOSTNAME", 
                help="set hostname")
  parser.add_option("--host-ip", type="string", metavar="IPADDRESS", 
++<<<<<<< HEAD:source/setup/provision
 +              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", 
+               help="set invocationid (otherwise random)")
++>>>>>>> 8585a3c77d5dfe97bca3f08716fc06ac2819f578:source/setup/provision
  parser.add_option("--adminpass", type="string", metavar="PASSWORD", 
                help="choose admin password (otherwise random)")
  parser.add_option("--krbtgtpass", type="string", metavar="PASSWORD", 
@@@ -139,7 -143,7 +149,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, 
 -          hostip=opts.host_ip, hostip6=opts.host_ip6, 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,