summaryrefslogtreecommitdiff
path: root/source4/scripting/python
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-04-02 14:33:56 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-04-02 14:33:56 +0200
commitb17484a70f50d3cc2b1031e86dfe080b9f48181d (patch)
tree092468b7c2ad20071f409ae79dca4972d707578a /source4/scripting/python
parentcaaa8f5b93b12111d04b7ebc82b65cb0cfe404c6 (diff)
parent67bf4bab3ddaf8d1dfaee92007700d8f05a1c191 (diff)
downloadsamba-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/scripting/python')
-rw-r--r--source4/scripting/python/samba/provision.py51
1 files changed, 30 insertions, 21 deletions
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index b03457e57b..dfeb61e52b 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/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"
@@ -695,13 +695,8 @@ def setup_samdb_rootdse(samdb, setup_path, schemadn, domaindn, hostname,
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,
@@ -714,7 +709,6 @@ def setup_self_join(samdb, names,
"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,
@@ -727,7 +721,7 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
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.
@@ -880,7 +874,6 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
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
@@ -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,
- 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,
@@ -955,7 +948,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")
@@ -1006,7 +1004,7 @@ def provision(setup_dir, message, session_info,
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)
@@ -1048,7 +1046,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)
@@ -1077,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,
@@ -1114,7 +1113,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 +1246,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 +1254,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,6 +1264,13 @@ def create_zone_file(path, setup_path, samdb, dnsdomain, domaindn,
"""
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,
@@ -1274,6 +1281,8 @@ def create_zone_file(path, setup_path, samdb, dnsdomain, domaindn,
"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):