diff options
| author | Noel Power <noel.power@suse.com> | 2014-03-24 11:52:48 +0000 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2014-04-02 20:25:07 +0200 |
| commit | 57a4319baaee011f2604eadeac655ff1c84d4312 (patch) | |
| tree | 63dc75cf299e010e334214a6adcbc60a720ae227 /source4/torture | |
| parent | 027afd11ca404f24726013d0f9805f42b14e59d7 (diff) | |
| download | samba-57a4319baaee011f2604eadeac655ff1c84d4312.tar.gz samba-57a4319baaee011f2604eadeac655ff1c84d4312.tar.xz samba-57a4319baaee011f2604eadeac655ff1c84d4312.zip | |
Allow FSRVP access generic HRESULT error message descriptions
FSRVP can possibly return any HRESULT error in addition to it's own
specific errors. This change searches the HRESULT errors for a description
if the error doesn't match any of the known FSRVP ones.
Also removed some errors defined in fsrvp.idl (now that they are defined
in hresult.h)
Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source4/torture')
| -rw-r--r-- | source4/torture/rpc/fsrvp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/torture/rpc/fsrvp.c b/source4/torture/rpc/fsrvp.c index 3a98837db25..4a55d289631 100644 --- a/source4/torture/rpc/fsrvp.c +++ b/source4/torture/rpc/fsrvp.c @@ -36,6 +36,7 @@ #include "libcli/smb2/smb2_calls.h" #include "libcli/smb_composite/smb_composite.h" #include "libcli/resolve/resolve.h" +#include "libcli/util/hresult.h" #include "torture/torture.h" #include "torture/smb2/proto.h" #include "torture/rpc/torture_rpc.h" @@ -384,7 +385,7 @@ static bool test_fsrvp_sc_set_abort(struct torture_context *tctx, "following abort"); /* * XXX Windows 8 server beta returns FSRVP_E_BAD_STATE here rather than - * FSRVP_E_BAD_ID / E_INVALIDARG. + * FSRVP_E_BAD_ID / HRES_E_INVALIDARG. */ torture_assert(tctx, (r_scset_add.out.result != 0), "incorrect AddToShadowCopySet response following abort"); @@ -425,7 +426,7 @@ static bool test_fsrvp_bad_id(struct torture_context *tctx, torture_assert_ntstatus_ok(tctx, status, "DeleteShareMapping failed"); torture_assert_int_equal(tctx, r_sharemap_del.out.result, - E_INVALIDARG, + HRES_ERROR_V(HRES_E_INVALIDARG), "incorrect DeleteShareMapping response"); torture_assert(tctx, test_fsrvp_sc_delete(tctx, p, sc_map), "sc del"); |