diff options
| author | Günther Deschner <gd@samba.org> | 2006-09-18 20:00:51 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:18:57 -0500 |
| commit | afa7c10fe8d7305cd147ee5fce491aba3e12a421 (patch) | |
| tree | 1372c90bcf80d5993e43b634389269550ce9d811 /source4 | |
| parent | 18dcabaae040d963e5b92621dc59d3e01253665d (diff) | |
| download | samba-afa7c10fe8d7305cd147ee5fce491aba3e12a421.tar.gz samba-afa7c10fe8d7305cd147ee5fce491aba3e12a421.tar.bz2 samba-afa7c10fe8d7305cd147ee5fce491aba3e12a421.zip | |
r18625: dfs_GetManagerVersion() returns a version number, not just an exist
flag.
Guenther
(This used to be commit 3e42ccc6096198458f66841f91234f670ceb59c4)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/librpc/idl/dfs.idl | 8 | ||||
| -rw-r--r-- | source4/torture/rpc/dfs.c | 11 |
2 files changed, 12 insertions, 7 deletions
diff --git a/source4/librpc/idl/dfs.idl b/source4/librpc/idl/dfs.idl index 62e0fb900a..9a3d28f1d9 100644 --- a/source4/librpc/idl/dfs.idl +++ b/source4/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/source4/torture/rpc/dfs.c b/source4/torture/rpc/dfs.c index 1813c64341..b4c95e85c5 100644 --- a/source4/torture/rpc/dfs.c +++ b/source4/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; } |