The Samba-Bugzilla – Attachment 10157 Details for
Bug 10742
samba-tool dns add 172.31.9.161 s4xdom.base . NS mydns.org. => NO_MEMORY
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Patches for v4-1-test
tmp41.diff (text/plain), 4.49 KB, created by
Stefan Metzmacher
on 2014-07-29 18:03:26 UTC
(
hide
)
Description:
Patches for v4-1-test
Filename:
MIME Type:
Creator:
Stefan Metzmacher
Created:
2014-07-29 18:03:26 UTC
Size:
4.49 KB
patch
obsolete
>From 9dc09225db6ee2233e2aaa6e171f269761f8fb0e Mon Sep 17 00:00:00 2001 >From: Amitay Isaacs <amitay@gmail.com> >Date: Mon, 28 Jul 2014 13:07:58 +1000 >Subject: [PATCH 1/2] s4-rpc: dnsserver: Allow . to be specified for @ record > >Windows allow both . and @ to be specified with modifying @ record. > >Bug: https://bugzilla.samba.org/show_bug.cgi?id=10742 > >Signed-off-by: Amitay Isaacs <amitay@gmail.com> >Reviewed-by: Stefan Metzmacher <metze@samba.org> >(cherry picked from commit 4b4e30b780345c74f9983ba77f04c616b3d034b7) >--- > source4/rpc_server/dnsserver/dcerpc_dnsserver.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > >diff --git a/source4/rpc_server/dnsserver/dcerpc_dnsserver.c b/source4/rpc_server/dnsserver/dcerpc_dnsserver.c >index 5733a51..d54940a 100644 >--- a/source4/rpc_server/dnsserver/dcerpc_dnsserver.c >+++ b/source4/rpc_server/dnsserver/dcerpc_dnsserver.c >@@ -1853,7 +1853,9 @@ static WERROR dnsserver_update_record(struct dnsserver_state *dsstate, > W_ERROR_HAVE_NO_MEMORY(tmp_ctx); > > /* If node_name is @ or zone name, dns record is @ */ >- if (strcmp(node_name, "@") == 0 || strcasecmp(node_name, z->name) == 0) { >+ if (strcmp(node_name, "@") == 0 || >+ strcmp(node_name, ".") == 0 || >+ strcasecmp(node_name, z->name) == 0) { > name = talloc_strdup(tmp_ctx, "@"); > } else { > name = dns_split_node_name(tmp_ctx, node_name, z->name); >-- >1.9.1 > > >From 6d9fb6a66ad19070958477c115d4589d46ae7b4a Mon Sep 17 00:00:00 2001 >From: Amitay Isaacs <amitay@gmail.com> >Date: Mon, 28 Jul 2014 18:09:37 +1000 >Subject: [PATCH 2/2] tests: dnsserver: Add a update test with name set to '.' > >Signed-off-by: Amitay Isaacs <amitay@gmail.com> >Reviewed-by: Stefan Metzmacher <metze@samba.org> > >Autobuild-User(master): Stefan Metzmacher <metze@samba.org> >Autobuild-Date(master): Tue Jul 29 19:33:19 CEST 2014 on sn-devel-104 > >(cherry picked from commit 6d104182d9667e4f996439d24cfa052f34098ce4) >--- > python/samba/tests/dcerpc/dnsserver.py | 41 +++++++++++++++++++++++++++++++++- > 1 file changed, 40 insertions(+), 1 deletion(-) > >diff --git a/python/samba/tests/dcerpc/dnsserver.py b/python/samba/tests/dcerpc/dnsserver.py >index 59d6eee..e2c6667 100644 >--- a/python/samba/tests/dcerpc/dnsserver.py >+++ b/python/samba/tests/dcerpc/dnsserver.py >@@ -19,7 +19,7 @@ > > from samba.dcerpc import dnsp, dnsserver > from samba.tests import RpcInterfaceTestCase, env_get_var_value >-from samba.netcmd.dns import ARecord >+from samba.netcmd.dns import ARecord, NSRecord > > class DnsserverTests(RpcInterfaceTestCase): > >@@ -239,3 +239,42 @@ class DnsserverTests(RpcInterfaceTestCase): > select_flags, > None, > None) >+ >+ def test_updaterecords2_soa(self): >+ client_version = dnsserver.DNS_CLIENT_VERSION_LONGHORN >+ record_type = dnsp.DNS_TYPE_NS >+ select_flags = (dnsserver.DNS_RPC_VIEW_AUTHORITY_DATA | >+ dnsserver.DNS_RPC_VIEW_NO_CHILDREN) >+ >+ nameserver = 'ns.example.local' >+ rec = NSRecord(nameserver) >+ >+ # Add record >+ add_rec_buf = dnsserver.DNS_RPC_RECORD_BUF() >+ add_rec_buf.rec = rec >+ self.conn.DnssrvUpdateRecord2(client_version, >+ 0, >+ self.server, >+ self.zone, >+ '.', >+ add_rec_buf, >+ None) >+ >+ buflen, result = self.conn.DnssrvEnumRecords2(client_version, >+ 0, >+ self.server, >+ self.zone, >+ '@', >+ None, >+ record_type, >+ select_flags, >+ None, >+ None) >+ self.assertEquals(1, result.count) >+ self.assertEquals(2, result.rec[0].wRecordCount) >+ match = False >+ for i in range(2): >+ self.assertEquals(dnsp.DNS_TYPE_NS, result.rec[0].records[i].wType) >+ if result.rec[0].records[i].data.str.rstrip('.') == nameserver: >+ match = True >+ self.assertEquals(match, True) >-- >1.9.1 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Raw
Flags:
amitay
:
review+
Actions:
View
Attachments on
bug 10742
:
10155
|
10156
| 10157 |
10158