[SCM] Samba Shared Repository - branch master updated
Michael Adam
obnox at samba.org
Wed Jun 18 08:36:04 MDT 2014
The branch, master has been updated
via 32b45bf lib: Apply const to nt_time_to_unix_timespec
via fe14a3f samba-tool domain: remove duplicate check if site is set
via 4ca1d69 samba-tool: add --site parameter to provision command
via 4ebd725 provision/sambadns: remove redundant site parameter
from 937d35b s4: torture : Add test case to show that a bad impersonation level causes an error on a regular file open.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 32b45bfa9856801b5f5518392fed65ddcaa5e053
Author: Volker Lendecke <vl at samba.org>
Date: Wed Jun 18 10:55:10 2014 +0000
lib: Apply const to nt_time_to_unix_timespec
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
Autobuild-User(master): Michael Adam <obnox at samba.org>
Autobuild-Date(master): Wed Jun 18 16:35:26 CEST 2014 on sn-devel-104
commit fe14a3f7582e499a9f632d31937dae9bf61fd342
Author: Björn Baumbach <bb at sernet.de>
Date: Wed May 28 17:56:48 2014 +0200
samba-tool domain: remove duplicate check if site is set
Signed-off-by: Björn Baumbach <bb at sernet.de>
Reviewed-by: Michael Adam <obnox at samba.org>
Reviewed-by: Kamen Mazdrashki <kamenim at samba.org>
commit 4ca1d69d7daa8f4f92d44cd505aa0983f2ab56bf
Author: Björn Baumbach <bb at sernet.de>
Date: Mon May 26 16:17:50 2014 +0200
samba-tool: add --site parameter to provision command
This new parameter offers the option to specify a default initial site name.
Otherwise it will be "Default-First-Site-Name".
Signed-off-by: Björn Baumbach <bb at sernet.de>
Reviewed-by: Michael Adam <obnox at samba.org>
Reviewed-by: Kamen Mazdrashki <kamenim at samba.org>
commit 4ebd7250ef18811e58d812670e96e61836e4770b
Author: Björn Baumbach <bb at sernet.de>
Date: Tue Jun 10 15:35:47 2014 +0200
provision/sambadns: remove redundant site parameter
The sitename is already included in "names" parameter.
Signed-off-by: Björn Baumbach <bb at sernet.de>
Reviewed-by: Michael Adam <obnox at samba.org>
Reviewed-by: Kamen Mazdrashki <kamenim at samba.org>
-----------------------------------------------------------------------
Summary of changes:
lib/util/time.c | 2 +-
lib/util/time.h | 2 +-
python/samba/netcmd/domain.py | 8 ++++----
python/samba/provision/__init__.py | 2 +-
python/samba/provision/sambadns.py | 5 +++--
5 files changed, 10 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/time.c b/lib/util/time.c
index a09490a..993a55a 100644
--- a/lib/util/time.c
+++ b/lib/util/time.c
@@ -784,7 +784,7 @@ _PUBLIC_ int get_time_zone(time_t t)
return tm_diff(&tm_utc,tm);
}
-struct timespec nt_time_to_unix_timespec(NTTIME *nt)
+struct timespec nt_time_to_unix_timespec(const NTTIME *nt)
{
int64_t d;
struct timespec ret;
diff --git a/lib/util/time.h b/lib/util/time.h
index b5302f8..bab8281 100644
--- a/lib/util/time.h
+++ b/lib/util/time.h
@@ -298,7 +298,7 @@ bool nt_time_equal(NTTIME *t1, NTTIME *t2);
void interpret_dos_date(uint32_t date,int *year,int *month,int *day,int *hour,int *minute,int *second);
-struct timespec nt_time_to_unix_timespec(NTTIME *nt);
+struct timespec nt_time_to_unix_timespec(const NTTIME *nt);
time_t convert_timespec_to_time_t(struct timespec ts);
diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py
index 0e00bd5..2e7a9c7 100644
--- a/python/samba/netcmd/domain.py
+++ b/python/samba/netcmd/domain.py
@@ -167,6 +167,8 @@ class cmd_domain_provision(Command):
help="set IPv4 ipaddress"),
Option("--host-ip6", type="string", metavar="IP6ADDRESS",
help="set IPv6 ipaddress"),
+ Option("--site", type="string", metavar="SITENAME",
+ help="set site name"),
Option("--adminpass", type="string", metavar="PASSWORD",
help="choose admin password (otherwise random)"),
Option("--krbtgtpass", type="string", metavar="PASSWORD",
@@ -244,6 +246,7 @@ class cmd_domain_provision(Command):
host_ip=None,
host_ip6=None,
adminpass=None,
+ site=None,
krbtgtpass=None,
machinepass=None,
dns_backend=None,
@@ -411,7 +414,7 @@ class cmd_domain_provision(Command):
domainguid=domain_guid, domainsid=domain_sid,
hostname=host_name,
hostip=host_ip, hostip6=host_ip6,
- ntdsguid=ntds_guid,
+ sitename=site, ntdsguid=ntds_guid,
invocationid=invocationid, adminpass=adminpass,
krbtgtpass=krbtgtpass, machinepass=machinepass,
dns_backend=dns_backend, dns_forwarder=dns_forwarder,
@@ -509,9 +512,6 @@ class cmd_domain_dcpromo(Command):
else:
logger.setLevel(logging.INFO)
- if site is None:
- site = "Default-First-Site-Name"
-
netbios_name = lp.get("netbios name")
if not role is None:
diff --git a/python/samba/provision/__init__.py b/python/samba/provision/__init__.py
index 0acd6f4..477c5dd 100644
--- a/python/samba/provision/__init__.py
+++ b/python/samba/provision/__init__.py
@@ -1826,7 +1826,7 @@ def provision_fill(samdb, secrets_ldb, logger, names, paths,
setup_ad_dns(samdb, secrets_ldb, domainsid, names, paths, lp, logger,
hostip=hostip, hostip6=hostip6, dns_backend=dns_backend,
dnspass=dnspass, os_level=dom_for_fun_level,
- targetdir=targetdir, site=DEFAULTSITE, fill_level=samdb_fill)
+ targetdir=targetdir, fill_level=samdb_fill)
domainguid = samdb.searchone(basedn=samdb.get_default_basedn(),
attribute="objectGUID")
diff --git a/python/samba/provision/sambadns.py b/python/samba/provision/sambadns.py
index f1cb1e2..87fb486 100644
--- a/python/samba/provision/sambadns.py
+++ b/python/samba/provision/sambadns.py
@@ -1035,7 +1035,7 @@ def fill_dns_data_partitions(samdb, domainsid, site, domaindn, forestdn,
def setup_ad_dns(samdb, secretsdb, domainsid, names, paths, lp, logger,
- dns_backend, os_level, site, dnspass=None, hostip=None, hostip6=None,
+ dns_backend, os_level, dnspass=None, hostip=None, hostip6=None,
targetdir=None, fill_level=FILL_FULL):
"""Provision DNS information (assuming GC role)
@@ -1048,7 +1048,6 @@ def setup_ad_dns(samdb, secretsdb, domainsid, names, paths, lp, logger,
:param logger: Logger object
:param dns_backend: Type of DNS backend
:param os_level: Functional level (treated as os level)
- :param site: Site to create hostnames in
:param dnspass: Password for bind's DNS account
:param hostip: IPv4 address
:param hostip6: IPv6 address
@@ -1090,6 +1089,8 @@ def setup_ad_dns(samdb, secretsdb, domainsid, names, paths, lp, logger,
dnsdomain = names.dnsdomain.lower()
dnsforest = dnsdomain
+ site = names.sitename
+
hostname = names.netbiosname.lower()
dnsadmins_sid = get_dnsadmins_sid(samdb, domaindn)
--
Samba Shared Repository
More information about the samba-cvs
mailing list