From 19d606ce180d197dd8e7dec2f92427cd7722b0e3 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 29 Dec 2005 20:35:56 +0000 Subject: r12584: Move NDR tests from rpc/ to local/, add to list of tests to run for 'make all' (This used to be commit e71cd4778b9a872642619452e574f510e2491052) --- source4/torture/config.mk | 3 +- source4/torture/local/config.mk | 3 +- source4/torture/local/ndr.c | 97 +++++++++++++++++++++++++++++++++++++++++ source4/torture/rpc/ndr.c | 97 ----------------------------------------- source4/torture/torture.c | 2 +- 5 files changed, 101 insertions(+), 101 deletions(-) create mode 100644 source4/torture/local/ndr.c delete mode 100644 source4/torture/rpc/ndr.c (limited to 'source4/torture') diff --git a/source4/torture/config.mk b/source4/torture/config.mk index 2d934fa009..ec79675f65 100644 --- a/source4/torture/config.mk +++ b/source4/torture/config.mk @@ -108,8 +108,7 @@ OBJ_FILES = \ rpc/bind.o \ rpc/dssetup.o \ rpc/alter_context.o \ - rpc/bench.o \ - rpc/ndr.o + rpc/bench.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 \ diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk index 1d1112b85a..f45fb2247d 100644 --- a/source4/torture/local/config.mk +++ b/source4/torture/local/config.mk @@ -13,7 +13,8 @@ OBJ_FILES = \ resolve.o \ util_strlist.o \ util_file.o \ - sddl.o + sddl.o \ + ndr.o REQUIRED_SUBSYSTEMS = \ LIBSMB \ MESSAGING \ diff --git a/source4/torture/local/ndr.c b/source4/torture/local/ndr.c new file mode 100644 index 0000000000..5daea96655 --- /dev/null +++ b/source4/torture/local/ndr.c @@ -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_local_ndr(void) +{ + NTSTATUS status; + TALLOC_CTX *mem_ctx; + BOOL ret = True; + + mem_ctx = talloc_init("torture_local_ndr"); + + ret &= test_check_string_terminator(mem_ctx); + + talloc_free(mem_ctx); + + return ret; +} diff --git a/source4/torture/rpc/ndr.c b/source4/torture/rpc/ndr.c deleted file mode 100644 index 6dbcf3e795..0000000000 --- a/source4/torture/rpc/ndr.c +++ /dev/null @@ -1,97 +0,0 @@ -/* - 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; -} diff --git a/source4/torture/torture.c b/source4/torture/torture.c index 1b591c6bb8..f53fca38df 100644 --- a/source4/torture/torture.c +++ b/source4/torture/torture.c @@ -2305,7 +2305,6 @@ static struct { {"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}, @@ -2322,6 +2321,7 @@ static struct { {"LOCAL-REGISTRY", torture_registry, 0}, {"LOCAL-RESOLVE", torture_local_resolve, 0}, {"LOCAL-SDDL", torture_local_sddl, 0}, + {"LOCAL-NDR", torture_local_ndr, 0}, /* COM (Component Object Model) testers */ {"COM-SIMPLE", torture_com_simple, 0 }, -- cgit