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

diff --combined source/scripting/python/samba/provision.py
index 50d9f8d2ffac4adc27eb9140c3acffda0537ccda,870f64ecc91427de70f6f4f56c1307ed5134beaf..dfeb61e52bb983b4e79fbf92f9aae1db10196586
--- 1/source/scripting/python/samba/provision.py
--- 2/source/scripting/python/samba/provision.py
+++ b/source/scripting/python/samba/provision.py
@@@ -28,7 -28,7 +28,7 @@@ import pw
  import grp
  import time
  import uuid, misc
- from socket import gethostname, gethostbyname
+ import socket
  import param
  import registry
  import samba
@@@ -267,7 -267,7 +267,7 @@@ def guess_names(lp=None, hostname=None
                rootdn=None, domaindn=None, configdn=None, schemadn=None, sitename=None):
  
      if hostname is None:
-         hostname = gethostname().split(".")[0].lower()
+         hostname = socket.gethostname().split(".")[0].lower()
  
      netbiosname = hostname.upper()
      if not valid_netbios_name(netbiosname):
@@@ -348,7 -348,7 +348,7 @@@ def load_or_make_smbconf(smbconf, setup
  
      if not os.path.exists(smbconf):
          if hostname is None:
-             hostname = gethostname().split(".")[0].lower()
+             hostname = socket.gethostname().split(".")[0].lower()
  
          if serverrole is None:
              serverrole = "standalone"
@@@ -695,8 -695,13 +695,8 @@@ def setup_samdb_rootdse(samdb, setup_pa
  def setup_self_join(samdb, names,
                      machinepass, dnspass, 
                      domainsid, invocationid, setup_path,
 -                    policyguid, hostguid=None):
 +                    policyguid):
      """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"), { 
                "CONFIGDN": names.configdn, 
                "SCHEMADN": names.schemadn,
@@@ -709,6 -714,7 +709,6 @@@
                "DNSPASS_B64": b64encode(dnspass),
                "REALM": names.realm,
                "DOMAIN": names.domain,
 -              "HOSTGUID_ADD": hostguid_add,
                "DNSDOMAIN": names.dnsdomain})
      setup_add_ldif(samdb, setup_path("provision_group_policy.ldif"), { 
                "POLICYGUID": policyguid,
@@@ -721,7 -727,7 +721,7 @@@ def setup_samdb(path, setup_path, sessi
                  names, message, 
                  domainsid, aci, domainguid, policyguid, 
                  fill, adminpass, krbtgtpass, 
 -                machinepass, hostguid, invocationid, dnspass,
 +                machinepass, invocationid, dnspass,
                  serverrole, ldap_backend=None, 
                  ldap_backend_type=None):
      """Setup a complete SAM Database.
@@@ -874,6 -880,7 +874,6 @@@
                                  dnspass=dnspass,  
                                  machinepass=machinepass, 
                                  domainsid=domainsid, policyguid=policyguid,
 -                                hostguid=hostguid, 
                                  setup_path=setup_path)
  
      #We want to setup the index last, as adds are faster unindexed
@@@ -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, 
@@@ -948,7 -955,12 +948,12 @@@
      paths = provision_paths_from_lp(lp, names.dnsdomain)
  
      if hostip is None:
-         hostip = gethostbyname(names.hostname)
+         hostip = socket.getaddrinfo(names.hostname, None, socket.AF_INET, socket.AI_CANONNAME, socket.IPPROTO_IP)[0][-1][0]
+ 
+     if hostip6 is None:
+         try:
+             hostip6 = socket.getaddrinfo(names.hostname, None, socket.AF_INET6, socket.AI_CANONNAME, socket.IPPROTO_IP)[0][-1][0]
+         except socket.gaierror: pass
  
      if serverrole is None:
          serverrole = lp.get("server role")
@@@ -999,7 -1011,7 +1004,7 @@@
                          aci=aci, domainguid=domainguid, policyguid=policyguid, 
                          fill=samdb_fill, 
                          adminpass=adminpass, krbtgtpass=krbtgtpass,
 -                        hostguid=hostguid, invocationid=invocationid, 
 +                        invocationid=invocationid, 
                          machinepass=machinepass, dnspass=dnspass,
                          serverrole=serverrole, ldap_backend=ldap_backend, 
                          ldap_backend_type=ldap_backend_type)
@@@ -1041,7 -1053,8 +1046,8 @@@
              assert isinstance(hostguid, str)
              
              create_zone_file(paths.dns, setup_path, samdb, 
-                              hostname=names.hostname, hostip=hostip, dnsdomain=names.dnsdomain,
+                              hostname=names.hostname, hostip=hostip,
+                              hostip6=hostip6, dnsdomain=names.dnsdomain,
                               domaindn=names.domaindn, dnspass=dnspass, realm=names.realm, 
                               domainguid=domainguid, hostguid=hostguid)
              message("Please install the zone located in %s into your DNS server" % paths.dns)
@@@ -1070,7 -1083,7 +1076,7 @@@ def provision_become_dc(setup_dir=None
                          smbconf=None, targetdir=None, realm=None, 
                          rootdn=None, domaindn=None, schemadn=None, configdn=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, 
                          dnspass=None, root=None, nobody=None, nogroup=None, users=None, 
                          wheel=None, backup=None, aci=None, serverrole=None, 
@@@ -1107,7 -1120,7 +1113,7 @@@ def provision_backend(setup_dir=None, m
          return os.path.join(setup_dir, file)
  
      if hostname is None:
-         hostname = gethostname().split(".")[0].lower()
+         hostname = socket.gethostname().split(".")[0].lower()
  
      if root is None:
          root = findnss(pwd.getpwnam, ["root"])[0]
@@@ -1240,7 -1253,7 +1246,7 @@@ def create_phpldapadmin_config(path, se
  
  
  def create_zone_file(path, setup_path, samdb, dnsdomain, domaindn, 
-                   hostip, hostname, dnspass, realm, domainguid, hostguid):
+                   hostip, hostip6, hostname, dnspass, realm, domainguid, hostguid):
      """Write out a DNS zone file, from the info in the current database.
      
      :param path: Path of the new file.
@@@ -1248,7 -1261,8 +1254,8 @@@
      :param samdb: SamDB object
      :param dnsdomain: DNS Domain name
      :param domaindn: DN of the Domain
-     :param hostip: Local IP
+     :param hostip: Local IPv4 IP
+     :param hostip6: Local IPv6 IP
      :param hostname: Local hostname
      :param dnspass: Password for DNS
      :param realm: Realm name
@@@ -1257,6 -1271,13 +1264,13 @@@
      """
      assert isinstance(domainguid, str)
  
+     hostip6_base_line = ""
+     hostip6_host_line = ""
+ 
+     if hostip6 is not None:
+         hostip6_base_line = "                 IN AAAA " + hostip6
+         hostip6_host_line = hostname + "              IN AAAA " + hostip6
+ 
      setup_file(setup_path("provision.zone"), path, {
              "DNSPASS_B64": b64encode(dnspass),
              "HOSTNAME": hostname,
@@@ -1267,6 -1288,8 +1281,8 @@@
              "DATESTRING": time.strftime("%Y%m%d%H"),
              "DEFAULTSITE": DEFAULTSITE,
              "HOSTGUID": hostguid,
+             "HOSTIP6_BASE_LINE": hostip6_base_line,
+             "HOSTIP6_HOST_LINE": hostip6_host_line,
          })
  
  def load_schema(setup_path, samdb, schemadn, netbiosname, configdn, sitename):

diff --combined source/setup/provision
index 30067f559230f6a5af75de1e2a556d7fcdafa066,f940b30744e9fb4dfd279be708a4df8e303825d2..afda9eeaded3307902c52183820f350c2524d862
--- 1/source/setup/provision
--- 2/source/setup/provision
+++ b/source/setup/provision
@@@ -52,12 -52,16 +52,22 @@@ parser.add_option("--domain-sid", type=
                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", 
++<<<<<<< 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,