diff options
| author | Andrew Tridgell <tridge@samba.org> | 2003-11-14 13:16:34 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2003-11-14 13:16:34 +0000 |
| commit | f147a707955d3c57ecd0ecc7e19307adb2aed02b (patch) | |
| tree | c65c118bf33227cd2d81bd7fcda758cca1a6263a /source4/librpc/ndr/ndr_echo.c | |
| parent | 492282316795af676b249fcdee51759866cc8129 (diff) | |
| download | samba-f147a707955d3c57ecd0ecc7e19307adb2aed02b.tar.gz samba-f147a707955d3c57ecd0ecc7e19307adb2aed02b.tar.bz2 samba-f147a707955d3c57ecd0ecc7e19307adb2aed02b.zip | |
added the dfs_GetInfo all - all levels
(This used to be commit 638eae6bae76eba5494e75fb7f3da8b1c205f892)
Diffstat (limited to 'source4/librpc/ndr/ndr_echo.c')
| -rw-r--r-- | source4/librpc/ndr/ndr_echo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/librpc/ndr/ndr_echo.c b/source4/librpc/ndr/ndr_echo.c index 49f93dcdea..909c06cd18 100644 --- a/source4/librpc/ndr/ndr_echo.c +++ b/source4/librpc/ndr/ndr_echo.c @@ -171,13 +171,13 @@ static NTSTATUS ndr_pull_Struct1(struct ndr_pull *ndr, int ndr_flags, struct Str NDR_CHECK(ndr_pull_uint32(ndr, &r->level)); { uint16 _level; NDR_CHECK(ndr_pull_echo_EnumInfo(ndr, NDR_SCALARS, &_level, &r->e)); - if (_level != r->level) return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u in e"); + if (((NDR_SCALARS) & NDR_SCALARS) && (_level != r->level)) return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u in e"); } buffers: if (!(ndr_flags & NDR_BUFFERS)) goto done; { uint16 _level; NDR_CHECK(ndr_pull_echo_EnumInfo(ndr, NDR_BUFFERS, &_level, &r->e)); - if (_level != r->level) return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u in e"); + if (((NDR_BUFFERS) & NDR_SCALARS) && (_level != r->level)) return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u in e"); } done: return NT_STATUS_OK; |