r25815: Small DFS idl fixes.

Guenther

diff --git a/source/librpc/idl/dfs.idl b/source/librpc/idl/dfs.idl
index 382e2a8bd1e2a4529aadd804dfaaba6e57158610..225436f3aa9d34f0d72388a4f49b32d80a1fc35a 100644 (file)
--- a/source/librpc/idl/dfs.idl
+++ b/source/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;
@@ -264,6 +263,16 @@ import "misc.idl";
                [size_is(count)] dfs_Info4 *s;
        } dfs_EnumArray4;
 
+       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;
@@ -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/source/torture/rpc/dfs.c b/source/torture/rpc/dfs.c
index afa647e71c3858133dbf54b367822a37f22b904b..eb6e0285b29cd026d11fa4a5e18a6f76ea938369 100644 (file)
--- a/source/torture/rpc/dfs.c
+++ b/source/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++) {