The branch, v4-0-test has been updated via dab5a79 samba-tool/dns: Pass on additional flags when creating zones via e4e9464 samba-tool/dns: Set secure zone update flag after creating new zone from f9c157c Optimization. Don't do the retry logic if sitename_fetch() returned NULL, we already did a NULL query.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test - Log ----------------------------------------------------------------- commit dab5a79433da31e77723518cb8f324773f2219ad Author: Amitay Isaacs <ami...@gmail.com> Date: Mon May 27 12:26:36 2013 +1000 samba-tool/dns: Pass on additional flags when creating zones Windows DCs require additional flags to be set when creating zones. This fixes bug #9599. Signed-off-by: Amitay Isaacs <ami...@gmail.com> (cherry picked from commit c22eb103d865ed50a6c3ca89750245b92e17b493) Autobuild-User(v4-0-test): Karolin Seeger <ksee...@samba.org> Autobuild-Date(v4-0-test): Mon Sep 9 12:04:57 CEST 2013 on sn-devel-104 commit e4e9464a58c52abc275e0457a676198d329be1f2 Author: Amitay Isaacs <ami...@gmail.com> Date: Mon May 27 12:37:20 2013 +1000 samba-tool/dns: Set secure zone update flag after creating new zone Windows DC ignores the secure update flag while creating new zone. Windows performs another operation to set the secure update flag. Signed-off-by: Amitay Isaacs <ami...@gmail.com> (cherry picked from commit 05578dcdbfa1734ae7bafb70859a76f4cd2a023d) ----------------------------------------------------------------------- Summary of changes: python/samba/netcmd/dns.py | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/python/samba/netcmd/dns.py b/python/samba/netcmd/dns.py index c00d17a..6cfaa68 100644 --- a/python/samba/netcmd/dns.py +++ b/python/samba/netcmd/dns.py @@ -852,28 +852,40 @@ class cmd_zonecreate(Command): zone_create_info = dnsserver.DNS_RPC_ZONE_CREATE_INFO_W2K() zone_create_info.pszZoneName = zone zone_create_info.dwZoneType = dnsp.DNS_ZONE_TYPE_PRIMARY - zone_create_info.fAllowUpdate = dnsp.DNS_ZONE_UPDATE_SECURE zone_create_info.fAging = 0 + zone_create_info.fDsIntegrated = 1 + zone_create_info.fLoadExisting = 1 elif client_version == dnsserver.DNS_CLIENT_VERSION_DOTNET: typeid = dnsserver.DNSSRV_TYPEID_ZONE_CREATE_DOTNET zone_create_info = dnsserver.DNS_RPC_ZONE_CREATE_INFO_DOTNET() zone_create_info.pszZoneName = zone zone_create_info.dwZoneType = dnsp.DNS_ZONE_TYPE_PRIMARY - zone_create_info.fAllowUpdate = dnsp.DNS_ZONE_UPDATE_SECURE zone_create_info.fAging = 0 + zone_create_info.fDsIntegrated = 1 + zone_create_info.fLoadExisting = 1 zone_create_info.dwDpFlags = dnsserver.DNS_DP_DOMAIN_DEFAULT else: typeid = dnsserver.DNSSRV_TYPEID_ZONE_CREATE zone_create_info = dnsserver.DNS_RPC_ZONE_CREATE_INFO_LONGHORN() zone_create_info.pszZoneName = zone zone_create_info.dwZoneType = dnsp.DNS_ZONE_TYPE_PRIMARY - zone_create_info.fAllowUpdate = dnsp.DNS_ZONE_UPDATE_SECURE zone_create_info.fAging = 0 + zone_create_info.fDsIntegrated = 1 + zone_create_info.fLoadExisting = 1 zone_create_info.dwDpFlags = dnsserver.DNS_DP_DOMAIN_DEFAULT res = dns_conn.DnssrvOperation2(client_version, 0, server, None, 0, 'ZoneCreate', typeid, zone_create_info) + + typeid = dnsserver.DNSSRV_TYPEID_NAME_AND_PARAM + name_and_param = dnsserver.DNS_RPC_NAME_AND_PARAM() + name_and_param.pszNodeName = 'AllowUpdate' + name_and_param.dwParam = dnsp.DNS_ZONE_UPDATE_SECURE + + res = dns_conn.DnssrvOperation2(client_version, 0, server, zone, + 0, 'ResetDwordProperty', typeid, + name_and_param) self.outf.write('Zone %s created successfully\n' % zone) -- Samba Shared Repository