Author: gd Date: 2006-09-18 20:00:51 +0000 (Mon, 18 Sep 2006) New Revision: 18625
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18625 Log: dfs_GetManagerVersion() returns a version number, not just an exist flag. Guenther Modified: branches/SAMBA_4_0/source/librpc/idl/dfs.idl branches/SAMBA_4_0/source/torture/rpc/dfs.c Changeset: Modified: branches/SAMBA_4_0/source/librpc/idl/dfs.idl =================================================================== --- branches/SAMBA_4_0/source/librpc/idl/dfs.idl 2006-09-18 19:51:27 UTC (rev 18624) +++ branches/SAMBA_4_0/source/librpc/idl/dfs.idl 2006-09-18 20:00:51 UTC (rev 18625) @@ -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 ); Modified: branches/SAMBA_4_0/source/torture/rpc/dfs.c =================================================================== --- branches/SAMBA_4_0/source/torture/rpc/dfs.c 2006-09-18 19:51:27 UTC (rev 18624) +++ branches/SAMBA_4_0/source/torture/rpc/dfs.c 2006-09-18 20:00:51 UTC (rev 18625) @@ -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 @@ 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 @@ return False; } - if (!test_GetManagerVersion(p, mem_ctx)) { + if (!test_GetManagerVersion(p, mem_ctx, &version)) { ret = False; }