svn commit: samba r12558 - in branches/SAMBA_4_0/source: librpc/ndr
torture torture/rpc
jelmer at samba.org
jelmer at samba.org
Thu Dec 29 01:43:12 GMT 2005
Author: jelmer
Date: 2005-12-29 01:43:11 +0000 (Thu, 29 Dec 2005)
New Revision: 12558
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12558
Log:
Support [flag(NULLTERM)] on [charset()] arrays
Added:
branches/SAMBA_4_0/source/torture/rpc/ndr.c
Modified:
branches/SAMBA_4_0/source/librpc/ndr/ndr_string.c
branches/SAMBA_4_0/source/torture/config.mk
branches/SAMBA_4_0/source/torture/torture.c
Changeset:
Modified: branches/SAMBA_4_0/source/librpc/ndr/ndr_string.c
===================================================================
--- branches/SAMBA_4_0/source/librpc/ndr/ndr_string.c 2005-12-28 22:48:57 UTC (rev 12557)
+++ branches/SAMBA_4_0/source/librpc/ndr/ndr_string.c 2005-12-29 01:43:11 UTC (rev 12558)
@@ -623,6 +623,8 @@
for (i = 0; i < element_size; i++) {
if (ndr->data[ndr->offset+i] != 0) {
+ ndr_pull_restore(ndr, &save_offset);
+
return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "String terminator not present or outside string boundaries");
}
}
@@ -639,7 +641,15 @@
*var = talloc_strdup(ndr->current_mem_ctx, "");
return NT_STATUS_OK;
}
+
NDR_PULL_NEED_BYTES(ndr, length*byte_mul);
+
+ if (ndr->flags & LIBNDR_FLAG_STR_NULLTERM) {
+ /* Explicitly ignore the return value here. An array that
+ * is not zero-terminated is considered a warning only, not fatal */
+ ndr_check_string_terminator(ndr, length, byte_mul);
+ }
+
ret = convert_string_talloc(ndr->current_mem_ctx,
chset, CH_UNIX,
ndr->data+ndr->offset,
Modified: branches/SAMBA_4_0/source/torture/config.mk
===================================================================
--- branches/SAMBA_4_0/source/torture/config.mk 2005-12-28 22:48:57 UTC (rev 12557)
+++ branches/SAMBA_4_0/source/torture/config.mk 2005-12-29 01:43:11 UTC (rev 12558)
@@ -108,7 +108,8 @@
rpc/bind.o \
rpc/dssetup.o \
rpc/alter_context.o \
- rpc/bench.o
+ rpc/bench.o \
+ rpc/ndr.o
REQUIRED_SUBSYSTEMS = \
NDR_ALL RPC_NDR_UNIXINFO RPC_NDR_SAMR RPC_NDR_WINREG RPC_NDR_INITSHUTDOWN \
RPC_NDR_OXIDRESOLVER RPC_NDR_EVENTLOG RPC_NDR_ECHO RPC_NDR_SVCCTL \
Added: branches/SAMBA_4_0/source/torture/rpc/ndr.c
===================================================================
--- branches/SAMBA_4_0/source/torture/rpc/ndr.c 2005-12-28 22:48:57 UTC (rev 12557)
+++ branches/SAMBA_4_0/source/torture/rpc/ndr.c 2005-12-29 01:43:11 UTC (rev 12558)
@@ -0,0 +1,97 @@
+/*
+ Unix SMB/CIFS implementation.
+ test suite for basic ndr functions
+
+ Copyright (C) Jelmer Vernooij 2005
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "includes.h"
+
+BOOL test_check_string_terminator(TALLOC_CTX *mem_ctx)
+{
+ struct ndr_pull *ndr;
+ DATA_BLOB blob;
+
+ /* Simple test */
+ blob = strhex_to_data_blob("0000");
+
+ ndr = ndr_pull_init_blob(&blob, mem_ctx);
+
+ if (NT_STATUS_IS_ERR(ndr_check_string_terminator(ndr, 1, 2))) {
+ DEBUG(0, ("simple check_string_terminator test failed\n"));
+ return False;
+ }
+
+ if (ndr->offset != 0) {
+ DEBUG(0, ("check_string_terminator did not reset offset\n"));
+ return False;
+ }
+
+ if (NT_STATUS_IS_OK(ndr_check_string_terminator(ndr, 1, 3))) {
+ DEBUG(0, ("check_string_terminator checked beyond string boundaries\n"));
+ return False;
+ }
+
+ if (ndr->offset != 0) {
+ DEBUG(0, ("check_string_terminator did not reset offset\n"));
+ return False;
+ }
+
+ talloc_free(ndr);
+
+ blob = strhex_to_data_blob("11220000");
+ ndr = ndr_pull_init_blob(&blob, mem_ctx);
+
+ if (NT_STATUS_IS_ERR(ndr_check_string_terminator(ndr, 4, 1))) {
+ DEBUG(0, ("check_string_terminator failed to recognize terminator\n"));
+ return False;
+ }
+
+ if (NT_STATUS_IS_ERR(ndr_check_string_terminator(ndr, 3, 1))) {
+ DEBUG(0, ("check_string_terminator failed to recognize terminator\n"));
+ return False;
+ }
+
+ if (NT_STATUS_IS_OK(ndr_check_string_terminator(ndr, 2, 1))) {
+ DEBUG(0, ("check_string_terminator erroneously reported terminator\n"));
+ return False;
+ }
+
+ if (ndr->offset != 0) {
+ DEBUG(0, ("check_string_terminator did not reset offset\n"));
+ return False;
+ }
+
+ talloc_free(ndr);
+
+ return True;
+}
+
+BOOL torture_rpc_ndr(void)
+{
+ NTSTATUS status;
+ TALLOC_CTX *mem_ctx;
+ BOOL ret = True;
+
+ mem_ctx = talloc_init("torture_rpc_mgmt");
+
+ ret &= test_check_string_terminator(mem_ctx);
+
+ talloc_free(mem_ctx);
+
+ return ret;
+}
Property changes on: branches/SAMBA_4_0/source/torture/rpc/ndr.c
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: branches/SAMBA_4_0/source/torture/torture.c
===================================================================
--- branches/SAMBA_4_0/source/torture/torture.c 2005-12-28 22:48:57 UTC (rev 12557)
+++ branches/SAMBA_4_0/source/torture/torture.c 2005-12-29 01:43:11 UTC (rev 12558)
@@ -2305,6 +2305,7 @@
{"RPC-ALTERCONTEXT", torture_rpc_alter_context, 0},
{"RPC-JOIN", torture_rpc_join, 0},
{"RPC-DSSYNC", torture_rpc_dssync, 0},
+ {"RPC-NDR", torture_rpc_ndr, 0},
/* local (no server) testers */
{"LOCAL-NTLMSSP", torture_ntlmssp_self_check, 0},
More information about the samba-cvs
mailing list