Attachment 3229 Details for Bug 4593 – Add provision support for IPv6

[patch] Add provision support for IPv6

0001-provision-Add-support-for-IPv6-bz-4593.patch (text/plain), 9.50 KB, created by Andrew Kroeger on 2008-04-01 18:05:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Kroeger

Created: 2008-04-01 18:05:17 UTC

Size: 9.50 KB

patch

obsolete

>From c7328502338284c822d0c2f6b4089bc22b77edc6 Mon Sep 17 00:00:00 2001
>From: Andrew Kroeger <andrew@sprocks.gotdns.com>
>Date: Tue, 1 Apr 2008 16:52:26 -0500
>Subject: [PATCH] provision: Add support for IPv6 (bz #4593).
>
>---
> source/scripting/python/samba/provision.py |   61 +++++++++++++++++++---------
> source/setup/provision                     |    6 ++-
> source/setup/provision.zone.ipv6           |   45 ++++++++++++++++++++
> 3 files changed, 90 insertions(+), 22 deletions(-)
> create mode 100644 source/setup/provision.zone.ipv6
>
>diff --git a/source/scripting/python/samba/provision.py b/source/scripting/python/samba/provision.py
>index b03457e..5c92c93 100644
>--- a/source/scripting/python/samba/provision.py
>+++ b/source/scripting/python/samba/provision.py
>@@ -28,7 +28,7 @@ import pwd
> import grp
> import time
> import uuid, misc
>-from socket import gethostname, gethostbyname
>+import socket
> import param
> import registry
> import samba
>@@ -267,7 +267,7 @@ def guess_names(lp=None, hostname=None, domain=None, dnsdomain=None, serverrole=
>               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 @@ def load_or_make_smbconf(smbconf, setup_path, hostname, domain, realm, serverrol
> 
>     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"
>@@ -901,7 +901,7 @@ 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, 
>+              domain=None, hostname=None, hostip=None, hostip6=None, domainsid=None, 
>               hostguid=None, adminpass=None, krbtgtpass=None, domainguid=None, 
>               policyguid=None, invocationid=None, machinepass=None, 
>               dnspass=None, root=None, nobody=None, nogroup=None, users=None, 
>@@ -955,7 +955,12 @@ def provision(setup_dir, message, session_info,
>     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")
>@@ -1048,7 +1053,8 @@ def provision(setup_dir, message, session_info,
>             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)
>@@ -1114,7 +1120,7 @@ def provision_backend(setup_dir=None, message=None,
>         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]
>@@ -1247,7 +1253,7 @@ def create_phpldapadmin_config(path, setup_path, ldapi_uri):
> 
> 
> 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.
>@@ -1255,7 +1261,8 @@ def create_zone_file(path, setup_path, samdb, dnsdomain, domaindn,
>     :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
>@@ -1264,17 +1271,31 @@ def create_zone_file(path, setup_path, samdb, dnsdomain, domaindn,
>     """
>     assert isinstance(domainguid, str)
> 
>-    setup_file(setup_path("provision.zone"), path, {
>-            "DNSPASS_B64": b64encode(dnspass),
>-            "HOSTNAME": hostname,
>-            "DNSDOMAIN": dnsdomain,
>-            "REALM": realm,
>-            "HOSTIP": hostip,
>-            "DOMAINGUID": domainguid,
>-            "DATESTRING": time.strftime("%Y%m%d%H"),
>-            "DEFAULTSITE": DEFAULTSITE,
>-            "HOSTGUID": hostguid,
>-        })
>+    if hostip6 is None:
>+        setup_file(setup_path("provision.zone"), path, {
>+                "DNSPASS_B64": b64encode(dnspass),
>+                "HOSTNAME": hostname,
>+                "DNSDOMAIN": dnsdomain,
>+                "REALM": realm,
>+                "HOSTIP": hostip,
>+                "DOMAINGUID": domainguid,
>+                "DATESTRING": time.strftime("%Y%m%d%H"),
>+                "DEFAULTSITE": DEFAULTSITE,
>+                "HOSTGUID": hostguid,
>+            })
>+    else:
>+        setup_file(setup_path("provision.zone.ipv6"), path, {
>+                "DNSPASS_B64": b64encode(dnspass),
>+                "HOSTNAME": hostname,
>+                "DNSDOMAIN": dnsdomain,
>+                "REALM": realm,
>+                "HOSTIP": hostip,
>+                "HOSTIP6": hostip6,
>+                "DOMAINGUID": domainguid,
>+                "DATESTRING": time.strftime("%Y%m%d%H"),
>+                "DEFAULTSITE": DEFAULTSITE,
>+                "HOSTGUID": hostguid,
>+            })
> 
> def load_schema(setup_path, samdb, schemadn, netbiosname, configdn, sitename):
>     """Load schema for the SamDB.
>diff --git a/source/setup/provision b/source/setup/provision
>index e354f4d..f940b30 100755
>--- a/source/setup/provision
>+++ b/source/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/source/setup/provision.zone.ipv6 b/source/setup/provision.zone.ipv6
>new file mode 100644
>index 0000000..02b1c3e
>--- /dev/null
>+++ b/source/setup/provision.zone.ipv6
>@@ -0,0 +1,45 @@
>+; -*- zone -*-
>+; generated by provision.pl
>+$ORIGIN ${DNSDOMAIN}.
>+$TTL 1W
>+@               IN SOA  @   hostmaster (
>+                                ${DATESTRING}   ; serial
>+                                2D              ; refresh
>+                                4H              ; retry
>+                                6W              ; expiry
>+                                1W )            ; minimum
>+			IN NS	${HOSTNAME}
>+			IN A	${HOSTIP6}
>+			IN A	${HOSTIP}
>+;
>+${HOSTNAME}		IN A	${HOSTIP6}
>+${HOSTNAME}		IN A	${HOSTIP}
>+${HOSTGUID}._msdcs	IN CNAME ${HOSTNAME}
>+;
>+; global catalog servers
>+_gc._tcp		IN SRV 0 100 3268	${HOSTNAME}
>+_ldap._tcp.gc._msdcs	IN SRV 0 100 389	${HOSTNAME}
>+_ldap._tcp.${DEFAULTSITE}._sites.gc._msdcs	IN SRV 0 100 389 ${HOSTNAME}
>+;
>+; ldap servers
>+_ldap._tcp		IN SRV 0 100 389	${HOSTNAME}
>+_ldap._tcp.dc._msdcs	IN SRV 0 100 389	${HOSTNAME}
>+_ldap._tcp.pdc._msdcs	IN SRV 0 100 389	${HOSTNAME}
>+_ldap._tcp.${DOMAINGUID}.domains._msdcs		IN SRV 0 100 389 ${HOSTNAME}
>+_ldap._tcp.${DEFAULTSITE}._sites.dc._msdcs	IN SRV 0 100 389 ${HOSTNAME}
>+;
>+; krb5 servers
>+_kerberos._tcp		IN SRV 0 100 88		${HOSTNAME}
>+_kerberos._tcp.dc._msdcs	IN SRV 0 100 88	${HOSTNAME}
>+_kerberos._tcp.${DEFAULTSITE}._sites.dc._msdcs	IN SRV 0 100 88 ${HOSTNAME}
>+_kerberos._udp		IN SRV 0 100 88		${HOSTNAME}
>+; MIT kpasswd likes to lookup this name on password change
>+_kerberos-master._tcp		IN SRV 0 100 88		${HOSTNAME}
>+_kerberos-master._udp		IN SRV 0 100 88		${HOSTNAME}
>+;
>+; kpasswd
>+_kpasswd._tcp		IN SRV 0 100 464	${HOSTNAME}
>+_kpasswd._udp		IN SRV 0 100 464 	${HOSTNAME}
>+;
>+; heimdal 'find realm for host' hack
>+_kerberos		IN TXT	${REALM}
>-- 
>1.5.4
>

Actions: View

Attachments on bug 4593: 3229 | 3230 | 3231