From 60b675dcc4070fa7664f52ba1ad1153b9ffb48d7 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 31 Aug 2015 12:51:14 +1200 Subject: [PATCH 1/6] torture: Add better debug message when tsocket_address_inet_from_strings fails Signed-off-by: Andrew Bartlett --- source4/torture/rpc/lsa.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/source4/torture/rpc/lsa.c b/source4/torture/rpc/lsa.c index 44cdbdc..4ba246f 100644 --- a/source4/torture/rpc/lsa.c +++ b/source4/torture/rpc/lsa.c @@ -4186,7 +4186,10 @@ static bool check_dom_trust_pw(struct dcerpc_pipe *p, host, lpcfg_cldap_port(tctx->lp_ctx), &dest_addr); - torture_assert_int_equal(tctx, rc, 0, "tsocket_address_inet_from_strings"); + torture_assert_int_equal(tctx, rc, 0, + talloc_asprintf(tctx, + "tsocket_address_inet_from_strings failed parsing %s:%d", + host, lpcfg_cldap_port(tctx->lp_ctx))); /* cldap_socket_init should now know about the dest. address */ status = cldap_socket_init(tctx, NULL, dest_addr, &cldap); From c35816aa0a6650e313f8531f15547ff0ef53ca74 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 7 Aug 2015 12:53:08 +1200 Subject: [PATCH 2/6] selftest: Correct comment about MAX_WRAPPED_INTERFACES Signed-off-by: Andrew Bartlett --- selftest/target/Samba.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/selftest/target/Samba.pm b/selftest/target/Samba.pm index 9937203..9f3e6ec 100644 --- a/selftest/target/Samba.pm +++ b/selftest/target/Samba.pm @@ -180,8 +180,8 @@ sub get_interface($) $interfaces{"fileserver"} = 35; # update lib/socket_wrapper/socket_wrapper.c - # #define MAX_WRAPPED_INTERFACES 32 - # if you wish to have more than 32 interfaces + # #define MAX_WRAPPED_INTERFACES 40 + # if you wish to have more than 40 interfaces if (not defined($interfaces{$netbiosname})) { die(); From 4619bf111ceb56dfbc5ba34657a791e85b7998e1 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 7 Aug 2015 16:27:23 +1200 Subject: [PATCH 3/6] samba-tool dns: Trap on conneciton errors and give useful info Signed-off-by: Andrew Bartlett --- python/samba/netcmd/dns.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/python/samba/netcmd/dns.py b/python/samba/netcmd/dns.py index 2cf9a1f..7cedffc 100644 --- a/python/samba/netcmd/dns.py +++ b/python/samba/netcmd/dns.py @@ -37,7 +37,11 @@ def dns_connect(server, lp, creds): if server.lower() == 'localhost': server = '127.0.0.1' binding_str = "ncacn_ip_tcp:%s[sign]" % server - dns_conn = dnsserver.dnsserver(binding_str, lp, creds) + try: + dns_conn = dnsserver.dnsserver(binding_str, lp, creds) + except RuntimeError, e: + raise CommandError('Connecting to DNS RPC server %s failed with %s' % (server, e)) + return dns_conn From 0fc106e60fe347f3f4f4d0a8470c77479d9318f3 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 11 Aug 2015 14:03:55 +1200 Subject: [PATCH 4/6] samba_upgradedns: Remove unused variable dnssecret is not used at any point later in the script Signed-off-by: Andrew Bartlett --- source4/scripting/bin/samba_upgradedns | 1 - 1 file changed, 1 deletion(-) diff --git a/source4/scripting/bin/samba_upgradedns b/source4/scripting/bin/samba_upgradedns index 689c9a4..53e05a6 100755 --- a/source4/scripting/bin/samba_upgradedns +++ b/source4/scripting/bin/samba_upgradedns @@ -415,7 +415,6 @@ if __name__ == '__main__': try: dn = 'samAccountName=dns-%s,CN=Principals' % hostname msg = ldbs.secrets.search(expression='(dn=%s)' % dn, attrs=['secret']) - dnssecret = msg[0]['secret'][0] except IndexError: logger.info("Adding dns-%s account" % hostname) From 59a7a92c2faf0679bd2351eddb2e5e74c8687f6e Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 17 Mar 2015 16:02:52 +1300 Subject: [PATCH 5/6] dsdb: Add functional levels for 2012 and 2012R2 Signed-off-by: Andrew Bartlett --- libds/common/flags.h | 2 ++ source4/dsdb/pydsdb.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/libds/common/flags.h b/libds/common/flags.h index f821e17..de3d675 100644 --- a/libds/common/flags.h +++ b/libds/common/flags.h @@ -188,6 +188,8 @@ #define DS_DOMAIN_FUNCTION_2003 2 #define DS_DOMAIN_FUNCTION_2008 3 #define DS_DOMAIN_FUNCTION_2008_R2 4 +#define DS_DOMAIN_FUNCTION_2012 5 +#define DS_DOMAIN_FUNCTION_2012_R2 6 /* sa->systemFlags on attributes */ #define DS_FLAG_ATTR_NOT_REPLICATED 0x00000001 diff --git a/source4/dsdb/pydsdb.c b/source4/dsdb/pydsdb.c index 9a3b509..8836d85 100644 --- a/source4/dsdb/pydsdb.c +++ b/source4/dsdb/pydsdb.c @@ -1180,6 +1180,8 @@ void initdsdb(void) ADD_DSDB_FLAG(DS_DOMAIN_FUNCTION_2003); ADD_DSDB_FLAG(DS_DOMAIN_FUNCTION_2008); ADD_DSDB_FLAG(DS_DOMAIN_FUNCTION_2008_R2); + ADD_DSDB_FLAG(DS_DOMAIN_FUNCTION_2012); + ADD_DSDB_FLAG(DS_DOMAIN_FUNCTION_2012_R2); /* nc replica flags */ ADD_DSDB_FLAG(INSTANCE_TYPE_IS_NC_HEAD); From 4db54c84862414cd282d455ce643df660e926994 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 17 Mar 2015 16:05:37 +1300 Subject: [PATCH 6/6] provision: Allow more OS levels in sambadns While we do not support these yet, they make no difference to DNS, so permit up to 2012R2 Signed-off-by: Andrew Bartlett --- python/samba/provision/sambadns.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/python/samba/provision/sambadns.py b/python/samba/provision/sambadns.py index b563932..f3cdb32 100644 --- a/python/samba/provision/sambadns.py +++ b/python/samba/provision/sambadns.py @@ -35,7 +35,8 @@ from samba.dsdb import ( DS_DOMAIN_FUNCTION_2000, DS_DOMAIN_FUNCTION_2003, - DS_DOMAIN_FUNCTION_2008_R2 + DS_DOMAIN_FUNCTION_2008_R2, + DS_DOMAIN_FUNCTION_2012_R2 ) from samba.descriptor import ( get_domain_descriptor, @@ -967,7 +968,7 @@ def is_valid_dns_backend(dns_backend): def is_valid_os_level(os_level): - return DS_DOMAIN_FUNCTION_2000 <= os_level <= DS_DOMAIN_FUNCTION_2008_R2 + return DS_DOMAIN_FUNCTION_2000 <= os_level <= DS_DOMAIN_FUNCTION_2012_R2 def create_dns_legacy(samdb, domainsid, forestdn, dnsadmins_sid):