Attachment 10057 Details for Bug 10674 – proposed patch for 4.1, cherry-picked from master

[patch] proposed patch for 4.1, cherry-picked from master

fix-bug-10674.patches (text/plain), 5.03 KB, created by Björn Baumbach on 2014-06-27 09:01:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Björn Baumbach

Created: 2014-06-27 09:01:58 UTC

Size: 5.03 KB

patch

obsolete

>From 0aa96c07840f579cab8dfdd8a0da1b9f9b588672 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Bj=C3=B6rn=20Baumbach?= <bb@sernet.de>
>Date: Tue, 10 Jun 2014 15:35:47 +0200
>Subject: [PATCH 1/2] provision/sambadns: remove redundant site parameter
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>The sitename is already included in "names" parameter.
>
>Part of fix for bug #10674
>
>Signed-off-by: BjÃ¶rn Baumbach <bb@sernet.de>
>Reviewed-by: Michael Adam <obnox@samba.org>
>Reviewed-by: Kamen Mazdrashki <kamenim@samba.org>
>(cherry picked from commit 4ebd7250ef18811e58d812670e96e61836e4770b)
>
>Conflicts:
>	python/samba/provision/__init__.py
>	python/samba/provision/sambadns.py
>---
> python/samba/provision/__init__.py | 2 +-
> python/samba/provision/sambadns.py | 5 +++--
> 2 files changed, 4 insertions(+), 3 deletions(-)
>
>diff --git a/python/samba/provision/__init__.py b/python/samba/provision/__init__.py
>index 46d2cbc..515f92d 100644
>--- a/python/samba/provision/__init__.py
>+++ b/python/samba/provision/__init__.py
>@@ -1795,7 +1795,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)
>+                     targetdir=targetdir)
> 
>         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 4acc24b..53f1082 100644
>--- a/python/samba/provision/sambadns.py
>+++ b/python/samba/provision/sambadns.py
>@@ -986,7 +986,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):
>     """Provision DNS information (assuming GC role)
> 
>@@ -999,7 +999,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
>@@ -1041,6 +1040,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)
>-- 
>1.8.5.5
>
>
>From a52b0e4d6481c2aa3c5b62ccc9e41062a95d859d Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Bj=C3=B6rn=20Baumbach?= <bb@sernet.de>
>Date: Mon, 26 May 2014 16:17:50 +0200
>Subject: [PATCH 2/2] samba-tool: add --site parameter to provision command
> (bug #10674)
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>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@sernet.de>
>Reviewed-by: Michael Adam <obnox@samba.org>
>Reviewed-by: Kamen Mazdrashki <kamenim@samba.org>
>(cherry picked from commit 4ca1d69d7daa8f4f92d44cd505aa0983f2ab56bf)
>---
> python/samba/netcmd/domain.py | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
>diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py
>index 4ba305c..fbb6c0f 100644
>--- a/python/samba/netcmd/domain.py
>+++ b/python/samba/netcmd/domain.py
>@@ -165,6 +165,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",
>@@ -227,6 +229,7 @@ class cmd_domain_provision(Command):
>             host_ip=None,
>             host_ip6=None,
>             adminpass=None,
>+            site=None,
>             krbtgtpass=None,
>             machinepass=None,
>             dns_backend=None,
>@@ -385,7 +388,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,
>-- 
>1.8.5.5
>

Flags:

obnox: review+
metze: review+

Actions: View

Attachments on bug 10674: 10057