From 3e42ccc6096198458f66841f91234f670ceb59c4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=BCnther=20Deschner?= Date: Mon, 18 Sep 2006 20:00:51 +0000 Subject: [PATCH] r18625: dfs_GetManagerVersion() returns a version number, not just an exist flag. Guenther --- source/librpc/idl/dfs.idl | 8 +++++++- source/torture/rpc/dfs.c | 11 +++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/source/librpc/idl/dfs.idl b/source/librpc/idl/dfs.idl index 62e0fb900a9..9a3d28f1d93 100644 --- a/source/librpc/idl/dfs.idl +++ b/source/librpc/idl/dfs.idl @@ -11,8 +11,14 @@ { /******************/ /* Function: 0x00 */ + typedef [v1_enum] enum { + DFS_MANAGER_VERSION_NT4 = 0, + DFS_MANAGER_VERSION_W2K = 2, + DFS_MANAGER_VERSION_W2K3 = 4 + } dfs_ManagerVersion; + void dfs_GetManagerVersion( - [out] uint32 *exist_flag + [out] dfs_ManagerVersion *version ); diff --git a/source/torture/rpc/dfs.c b/source/torture/rpc/dfs.c index 1813c643416..b4c95e85c52 100644 --- a/source/torture/rpc/dfs.c +++ b/source/torture/rpc/dfs.c @@ -1,6 +1,6 @@ /* Unix SMB/CIFS implementation. - test suite for lsa dfs operations + test suite for rpc dfs operations Copyright (C) Andrew Tridgell 2003 @@ -24,14 +24,12 @@ #include "torture/rpc/rpc.h" #include "librpc/gen_ndr/ndr_dfs_c.h" - -static BOOL test_GetManagerVersion(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx) +static BOOL test_GetManagerVersion(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, enum dfs_ManagerVersion *version) { NTSTATUS status; struct dfs_GetManagerVersion r; - uint32_t exist = 0; - r.out.exist_flag = ∃ + r.out.version = version; status = dcerpc_dfs_GetManagerVersion(p, mem_ctx, &r); if (!NT_STATUS_IS_OK(status)) { @@ -172,6 +170,7 @@ BOOL torture_rpc_dfs(struct torture_context *torture) struct dcerpc_pipe *p; TALLOC_CTX *mem_ctx; BOOL ret = True; + enum dfs_ManagerVersion version; mem_ctx = talloc_init("torture_rpc_dfs"); @@ -182,7 +181,7 @@ BOOL torture_rpc_dfs(struct torture_context *torture) return False; } - if (!test_GetManagerVersion(p, mem_ctx)) { + if (!test_GetManagerVersion(p, mem_ctx, &version)) { ret = False; } -- 2.11.4.GIT