From 0f210749a779249b8f323c2eb2aec38137ae4317 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 11 Mar 2010 12:51:46 +0100 Subject: s4:torture/rpc/dfs.c: make use of dcerpc_binding_handle stubs metze --- source4/torture/rpc/dfs.c | 114 +++++++++++++++++++++++----------------------- 1 file changed, 58 insertions(+), 56 deletions(-) (limited to 'source4/torture/rpc/dfs.c') diff --git a/source4/torture/rpc/dfs.c b/source4/torture/rpc/dfs.c index fca1c54fdb..a778e68354 100644 --- a/source4/torture/rpc/dfs.c +++ b/source4/torture/rpc/dfs.c @@ -146,7 +146,7 @@ static bool test_DeleteDir(struct smbcli_state *cli, return true; } -static bool test_GetManagerVersion(struct dcerpc_pipe *p, +static bool test_GetManagerVersion(struct dcerpc_binding_handle *b, TALLOC_CTX *mem_ctx, enum dfs_ManagerVersion *version) { @@ -155,7 +155,7 @@ static bool test_GetManagerVersion(struct dcerpc_pipe *p, r.out.version = version; - status = dcerpc_dfs_GetManagerVersion(p, mem_ctx, &r); + status = dcerpc_dfs_GetManagerVersion_r(b, mem_ctx, &r); if (!NT_STATUS_IS_OK(status)) { printf("GetManagerVersion failed - %s\n", nt_errstr(status)); return false; @@ -164,7 +164,7 @@ static bool test_GetManagerVersion(struct dcerpc_pipe *p, return true; } -static bool test_ManagerInitialize(struct dcerpc_pipe *p, +static bool test_ManagerInitialize(struct dcerpc_binding_handle *b, TALLOC_CTX *mem_ctx, const char *host) { @@ -174,14 +174,14 @@ static bool test_ManagerInitialize(struct dcerpc_pipe *p, printf("Testing ManagerInitialize\n"); - if (!test_GetManagerVersion(p, mem_ctx, &version)) { + if (!test_GetManagerVersion(b, mem_ctx, &version)) { return false; } r.in.servername = host; r.in.flags = 0; - status = dcerpc_dfs_ManagerInitialize(p, mem_ctx, &r); + status = dcerpc_dfs_ManagerInitialize_r(b, mem_ctx, &r); if (!NT_STATUS_IS_OK(status)) { printf("ManagerInitialize failed - %s\n", nt_errstr(status)); return false; @@ -195,7 +195,7 @@ static bool test_ManagerInitialize(struct dcerpc_pipe *p, return true; } -static bool test_GetInfoLevel(struct dcerpc_pipe *p, +static bool test_GetInfoLevel(struct dcerpc_binding_handle *b, TALLOC_CTX *mem_ctx, uint16_t level, const char *root) @@ -212,7 +212,7 @@ static bool test_GetInfoLevel(struct dcerpc_pipe *p, r.in.level = level; r.out.info = &info; - status = dcerpc_dfs_GetInfo(p, mem_ctx, &r); + status = dcerpc_dfs_GetInfo_r(b, mem_ctx, &r); if (!NT_STATUS_IS_OK(status)) { printf("GetInfo failed - %s\n", nt_errstr(status)); return false; @@ -225,7 +225,7 @@ static bool test_GetInfoLevel(struct dcerpc_pipe *p, return true; } -static bool test_GetInfo(struct dcerpc_pipe *p, +static bool test_GetInfo(struct dcerpc_binding_handle *b, TALLOC_CTX *mem_ctx, const char *root) { @@ -235,14 +235,14 @@ static bool test_GetInfo(struct dcerpc_pipe *p, int i; for (i=0;ie.info1->s[i].path); - if (!test_GetInfo(p, mem_ctx, root)) { + if (!test_GetInfo(b, mem_ctx, root)) { ret = false; } } @@ -293,13 +293,13 @@ static bool test_EnumLevelEx(struct dcerpc_pipe *p, const char *root = talloc_strdup(mem_ctx, rex.out.info->e.info300->s[i].dom_root); for (k=0;ke.info1->s[i].path; - if (!test_GetInfo(p, mem_ctx, root)) { + if (!test_GetInfo(b, mem_ctx, root)) { ret = false; } } @@ -359,14 +359,14 @@ static bool test_EnumLevel(struct dcerpc_pipe *p, } -static bool test_Enum(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx) +static bool test_Enum(struct dcerpc_binding_handle *b, TALLOC_CTX *mem_ctx) { bool ret = true; uint16_t levels[] = {1, 2, 3, 4, 5, 6, 200, 300}; int i; for (i=0;iev); test_DeleteDir(cli, dir); torture_close_connection(cli); } -static bool test_StdRoot(struct dcerpc_pipe *p, +static bool test_StdRoot(struct dcerpc_binding_handle *b, TALLOC_CTX *mem_ctx, struct torture_context *tctx, const char *host) @@ -511,13 +511,13 @@ static bool test_StdRoot(struct dcerpc_pipe *p, printf("Testing StdRoot\n"); - test_cleanup_stdroot(p, mem_ctx, tctx, host, sharename, dir); + test_cleanup_stdroot(b, mem_ctx, tctx, host, sharename, dir); ret &= test_CreateDir(mem_ctx, &cli, tctx, host, "C$", dir); ret &= test_NetShareAdd(mem_ctx, tctx, host, sharename, path); - ret &= test_AddStdRoot(p, mem_ctx, host, sharename); - ret &= test_RemoveStdRoot(p, mem_ctx, host, sharename); - ret &= test_AddStdRootForced(p, mem_ctx, host, sharename); + ret &= test_AddStdRoot(b, mem_ctx, host, sharename); + ret &= test_RemoveStdRoot(b, mem_ctx, host, sharename); + ret &= test_AddStdRootForced(b, mem_ctx, host, sharename); ret &= test_NetShareDel(mem_ctx, tctx, host, sharename); ret &= test_DeleteDir(cli, dir); @@ -526,7 +526,7 @@ static bool test_StdRoot(struct dcerpc_pipe *p, return ret; } -static bool test_GetDcAddress(struct dcerpc_pipe *p, +static bool test_GetDcAddress(struct dcerpc_binding_handle *b, TALLOC_CTX *mem_ctx, const char *host) { @@ -545,7 +545,7 @@ static bool test_GetDcAddress(struct dcerpc_pipe *p, r.in.is_root = r.out.is_root = &is_root; r.in.ttl = r.out.ttl = &ttl; - status = dcerpc_dfs_GetDcAddress(p, mem_ctx, &r); + status = dcerpc_dfs_GetDcAddress_r(b, mem_ctx, &r); if (!NT_STATUS_IS_OK(status)) { printf("GetDcAddress failed - %s\n", nt_errstr(status)); return false; @@ -558,7 +558,7 @@ static bool test_GetDcAddress(struct dcerpc_pipe *p, return true; } -static bool test_SetDcAddress(struct dcerpc_pipe *p, +static bool test_SetDcAddress(struct dcerpc_binding_handle *b, TALLOC_CTX *mem_ctx, const char *host) { @@ -572,7 +572,7 @@ static bool test_SetDcAddress(struct dcerpc_pipe *p, r.in.flags = 0; r.in.ttl = 1000; - status = dcerpc_dfs_SetDcAddress(p, mem_ctx, &r); + status = dcerpc_dfs_SetDcAddress_r(b, mem_ctx, &r); if (!NT_STATUS_IS_OK(status)) { printf("SetDcAddress failed - %s\n", nt_errstr(status)); return false; @@ -585,22 +585,22 @@ static bool test_SetDcAddress(struct dcerpc_pipe *p, return true; } -static bool test_DcAddress(struct dcerpc_pipe *p, +static bool test_DcAddress(struct dcerpc_binding_handle *b, TALLOC_CTX *mem_ctx, const char *host) { - if (!test_GetDcAddress(p, mem_ctx, host)) { + if (!test_GetDcAddress(b, mem_ctx, host)) { return false; } - if (!test_SetDcAddress(p, mem_ctx, host)) { + if (!test_SetDcAddress(b, mem_ctx, host)) { return false; } return true; } -static bool test_FlushFtTable(struct dcerpc_pipe *p, +static bool test_FlushFtTable(struct dcerpc_binding_handle *b, TALLOC_CTX *mem_ctx, const char *host, const char *sharename) @@ -611,14 +611,14 @@ static bool test_FlushFtTable(struct dcerpc_pipe *p, printf("Testing FlushFtTable\n"); - if (!test_GetManagerVersion(p, mem_ctx, &version)) { + if (!test_GetManagerVersion(b, mem_ctx, &version)) { return false; } r.in.servername = host; r.in.rootshare = sharename; - status = dcerpc_dfs_FlushFtTable(p, mem_ctx, &r); + status = dcerpc_dfs_FlushFtTable_r(b, mem_ctx, &r); if (!NT_STATUS_IS_OK(status)) { printf("FlushFtTable failed - %s\n", nt_errstr(status)); return false; @@ -632,13 +632,13 @@ static bool test_FlushFtTable(struct dcerpc_pipe *p, return true; } -static bool test_FtRoot(struct dcerpc_pipe *p, +static bool test_FtRoot(struct dcerpc_binding_handle *b, TALLOC_CTX *mem_ctx, const char *host) { const char *sharename = SMBTORTURE_DFS_SHARENAME; - return test_FlushFtTable(p, mem_ctx, host, sharename); + return test_FlushFtTable(b, mem_ctx, host, sharename); } bool torture_rpc_dfs(struct torture_context *torture) @@ -648,17 +648,19 @@ bool torture_rpc_dfs(struct torture_context *torture) bool ret = true; enum dfs_ManagerVersion version; const char *host = torture_setting_string(torture, "host", NULL); + struct dcerpc_binding_handle *b; status = torture_rpc_connection(torture, &p, &ndr_table_netdfs); torture_assert_ntstatus_ok(torture, status, "Unable to connect"); - - ret &= test_GetManagerVersion(p, torture, &version); - ret &= test_ManagerInitialize(p, torture, host); - ret &= test_Enum(p, torture); - ret &= test_EnumEx(p, torture, host); - ret &= test_StdRoot(p, torture, torture, host); - ret &= test_FtRoot(p, torture, host); - ret &= test_DcAddress(p, torture, host); + b = p->binding_handle; + + ret &= test_GetManagerVersion(b, torture, &version); + ret &= test_ManagerInitialize(b, torture, host); + ret &= test_Enum(b, torture); + ret &= test_EnumEx(b, torture, host); + ret &= test_StdRoot(b, torture, torture, host); + ret &= test_FtRoot(b, torture, host); + ret &= test_DcAddress(b, torture, host); return ret; } -- cgit