summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source4/librpc/idl/dfs.idl17
-rw-r--r--source4/torture/rpc/dfs.c4
2 files changed, 16 insertions, 5 deletions
diff --git a/source4/librpc/idl/dfs.idl b/source4/librpc/idl/dfs.idl
index 382e2a8bd1..225436f3aa 100644
--- a/source4/librpc/idl/dfs.idl
+++ b/source4/librpc/idl/dfs.idl
@@ -52,12 +52,11 @@ import "misc.idl";
[string,charset(UTF16)] uint16 *path;
} dfs_Info1;
- /* first 4 bits unverified yet */
typedef [public,bitmap32bit] bitmap {
DFS_VOLUME_STATE_OK = 0x1,
DFS_VOLUME_STATE_INCONSISTENT = 0x2,
- DFS_VOLUME_STATE_OFFLINE = 0x4,
- DFS_VOLUME_STATE_ONLINE = 0x8,
+ DFS_VOLUME_STATE_OFFLINE = 0x3,
+ DFS_VOLUME_STATE_ONLINE = 0x4,
DFS_VOLUME_STATE_STANDALONE = DFS_VOLUME_FLAVOR_STANDALONE,
DFS_VOLUME_STATE_AD_BLOB = DFS_VOLUME_FLAVOR_AD_BLOB
} dfs_VolumeState;
@@ -266,6 +265,16 @@ import "misc.idl";
typedef struct {
uint32 count;
+ [size_is(count)] dfs_Info5 *s;
+ } dfs_EnumArray5;
+
+ typedef struct {
+ uint32 count;
+ [size_is(count)] dfs_Info6 *s;
+ } dfs_EnumArray6;
+
+ typedef struct {
+ uint32 count;
[size_is(count)] dfs_Info200 *s;
} dfs_EnumArray200;
@@ -280,6 +289,8 @@ import "misc.idl";
[case(2)] dfs_EnumArray2 *info2;
[case(3)] dfs_EnumArray3 *info3;
[case(4)] dfs_EnumArray4 *info4;
+ [case(5)] dfs_EnumArray5 *info5;
+ [case(6)] dfs_EnumArray6 *info6;
[case(200)] dfs_EnumArray200 *info200;
[case(300)] dfs_EnumArray300 *info300;
} dfs_EnumInfo;
diff --git a/source4/torture/rpc/dfs.c b/source4/torture/rpc/dfs.c
index afa647e71c..eb6e0285b2 100644
--- a/source4/torture/rpc/dfs.c
+++ b/source4/torture/rpc/dfs.c
@@ -335,7 +335,7 @@ static bool test_EnumLevel(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uint16_t
static bool test_Enum(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
{
bool ret = true;
- uint16_t levels[] = {1, 2, 3, 4, 200, 300};
+ uint16_t levels[] = {1, 2, 3, 4, 5, 6, 200, 300};
int i;
for (i=0;i<ARRAY_SIZE(levels);i++) {
@@ -350,7 +350,7 @@ static bool test_Enum(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
static bool test_EnumEx(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, const char *host)
{
bool ret = true;
- uint16_t levels[] = {1, 2, 3, 4, 200, 300};
+ uint16_t levels[] = {1, 2, 3, 4, 5, 6, 200, 300};
int i;
for (i=0;i<ARRAY_SIZE(levels);i++) {