summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary Lockyer <gary@catalyst.net.nz>2018-07-02 16:47:16 +1200
committerAndrew Bartlett <abartlet@samba.org>2018-07-12 04:31:56 +0200
commitbc2e645a382d17c9cdf0120751490fa68263f445 (patch)
treea55280fc9b9c68d7d7797b45e487ccbe8cdd202b
parentf0210f5d17f27641bccb651313f30087d53c6ef0 (diff)
downloadsamba-bc2e645a382d17c9cdf0120751490fa68263f445.tar.gz
tests dns: fix rpc null byte test
Fix update_add_null_char_rpc_to_dns so that the test matches the name. It was not passing the embedded null to the rpc call. Signed-off-by: Gary Lockyer <gary@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
-rw-r--r--python/samba/tests/dns.py29
1 files changed, 19 insertions, 10 deletions
diff --git a/python/samba/tests/dns.py b/python/samba/tests/dns.py
index 508d49f47d8..511471145a2 100644
--- a/python/samba/tests/dns.py
+++ b/python/samba/tests/dns.py
@@ -1435,27 +1435,36 @@ class TestRPCRoundtrip(DNSTest):
dnsp.DNS_TYPE_TXT, '"NULL" "NULL"'))
def test_update_add_null_char_rpc_to_dns(self):
- prefix, txt = 'nulltextrec', ['NULL\x00BYTE']
- prefix = 'rpc' + prefix
+ prefix = 'rpcnulltextrec'
name = "%s.%s" % (prefix, self.get_dns_domain())
- rec = data_to_dns_record(dnsp.DNS_TYPE_TXT, '"NULL"')
+ rec = data_to_dns_record(dnsp.DNS_TYPE_TXT, '"NULL\x00BYTE"')
add_rec_buf = dnsserver.DNS_RPC_RECORD_BUF()
add_rec_buf.rec = rec
try:
- self.rpc_conn.DnssrvUpdateRecord2(dnsserver.DNS_CLIENT_VERSION_LONGHORN,
- 0, self.server_ip, self.get_dns_domain(),
- name, add_rec_buf, None)
+ self.rpc_conn.DnssrvUpdateRecord2(
+ dnsserver.DNS_CLIENT_VERSION_LONGHORN,
+ 0,
+ self.server_ip,
+ self.get_dns_domain(),
+ name,
+ add_rec_buf,
+ None)
except WERRORError as e:
self.fail(str(e))
try:
- self.check_query_txt(prefix, ['NULL'])
+ self.check_query_txt(prefix, ['NULL'])
finally:
- self.rpc_conn.DnssrvUpdateRecord2(dnsserver.DNS_CLIENT_VERSION_LONGHORN,
- 0, self.server_ip, self.get_dns_domain(),
- name, None, add_rec_buf)
+ self.rpc_conn.DnssrvUpdateRecord2(
+ dnsserver.DNS_CLIENT_VERSION_LONGHORN,
+ 0,
+ self.server_ip,
+ self.get_dns_domain(),
+ name,
+ None,
+ add_rec_buf)
def test_update_add_hex_char_txt_record(self):
"test adding records works"