Attachment 7961 Details for Bug 9225 – Patch for v4-0-test

[patch] Patch for v4-0-test

0001-s4-dns-Fix-return-code-for-deleted-records.patch (text/plain), 3.59 KB, created by Kai Blin on 2012-09-30 09:31:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kai Blin

Created: 2012-09-30 09:31:34 UTC

Size: 3.59 KB

patch

obsolete

>From 25c27bf88c91401755793f7f52c71abe525d373c Mon Sep 17 00:00:00 2001
>From: Kai Blin <kai@samba.org>
>Date: Sun, 30 Sep 2012 11:26:24 +0200
>Subject: [PATCH] s4 dns: Fix return code for deleted records
>
>This fixes bug #9225. We already had a test for this scenario, but the test wasn't
>correct. This patch fixes the test, and also fixes the bug.
>
>Signed-off-by: Kai Blin <kai@samba.org>
>---
> source4/dns_server/dns_utils.c              |    2 +-
> source4/scripting/python/samba/tests/dns.py |   46 +++++++++++++++++++++++++--
> 2 files changed, 44 insertions(+), 4 deletions(-)
>
>diff --git a/source4/dns_server/dns_utils.c b/source4/dns_server/dns_utils.c
>index 11ded68..cb2c6f4 100644
>--- a/source4/dns_server/dns_utils.c
>+++ b/source4/dns_server/dns_utils.c
>@@ -201,7 +201,7 @@ WERROR dns_lookup_records(struct dns_server *dns,
> 	if (el == NULL) {
> 		*records = NULL;
> 		*rec_count = 0;
>-		return WERR_OK;
>+		return DNS_ERR(NAME_ERROR);
> 	}
> 
> 	recs = talloc_zero_array(mem_ctx, struct dnsp_DnssrvRpcRecord, el->num_values);
>diff --git a/source4/scripting/python/samba/tests/dns.py b/source4/scripting/python/samba/tests/dns.py
>index be952c4..79d8736 100644
>--- a/source4/scripting/python/samba/tests/dns.py
>+++ b/source4/scripting/python/samba/tests/dns.py
>@@ -432,6 +432,10 @@ class TestDNSUpdates(DNSTest):
> 
>     def test_delete_record(self):
>         "Test if deleting records works"
>+
>+        NAME = "deleterec.%s" % self.get_dns_domain()
>+
>+        # First, create a record to make sure we have a record to delete.
>         p = self.make_name_packet(dns.DNS_OPCODE_UPDATE)
>         updates = []
> 
>@@ -443,7 +447,43 @@ class TestDNSUpdates(DNSTest):
> 
>         updates = []
>         r = dns.res_rec()
>-        r.name = "textrec.%s" % self.get_dns_domain()
>+        r.name = NAME
>+        r.rr_type = dns.DNS_QTYPE_TXT
>+        r.rr_class = dns.DNS_QCLASS_IN
>+        r.ttl = 900
>+        r.length = 0xffff
>+        r.rdata = dns.txt_record()
>+        r.rdata.txt = '"This is a test"'
>+        updates.append(r)
>+        p.nscount = len(updates)
>+        p.nsrecs = updates
>+
>+        response = self.dns_transaction_udp(p)
>+        self.assert_dns_rcode_equals(response, dns.DNS_RCODE_OK)
>+
>+        # Now check the record is around
>+        p = self.make_name_packet(dns.DNS_OPCODE_QUERY)
>+        questions = []
>+        q = self.make_name_question(NAME, dns.DNS_QTYPE_TXT, dns.DNS_QCLASS_IN)
>+        questions.append(q)
>+
>+        self.finish_name_packet(p, questions)
>+        response = self.dns_transaction_udp(p)
>+        self.assert_dns_rcode_equals(response, dns.DNS_RCODE_OK)
>+
>+        # Now delete the record
>+        p = self.make_name_packet(dns.DNS_OPCODE_UPDATE)
>+        updates = []
>+
>+        name = self.get_dns_domain()
>+
>+        u = self.make_name_question(name, dns.DNS_QTYPE_SOA, dns.DNS_QCLASS_IN)
>+        updates.append(u)
>+        self.finish_name_packet(p, updates)
>+
>+        updates = []
>+        r = dns.res_rec()
>+        r.name = NAME
>         r.rr_type = dns.DNS_QTYPE_TXT
>         r.rr_class = dns.DNS_QCLASS_NONE
>         r.ttl = 0
>@@ -457,11 +497,11 @@ class TestDNSUpdates(DNSTest):
>         response = self.dns_transaction_udp(p)
>         self.assert_dns_rcode_equals(response, dns.DNS_RCODE_OK)
> 
>+        # And finally check it's gone
>         p = self.make_name_packet(dns.DNS_OPCODE_QUERY)
>         questions = []
> 
>-        name = "textrec.%s" % self.get_dns_domain()
>-        q = self.make_name_question(name, dns.DNS_QTYPE_TXT, dns.DNS_QCLASS_IN)
>+        q = self.make_name_question(NAME, dns.DNS_QTYPE_TXT, dns.DNS_QCLASS_IN)
>         questions.append(q)
> 
>         self.finish_name_packet(p, questions)
>-- 
>1.7.1
>

Flags:

mat: review+
abartlet: review+

Actions: View

Attachments on bug 9225: 7960 | 7961