diff options
author | Jeremy Allison <jra@samba.org> | 2009-10-17 10:36:33 -0700 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2009-10-17 10:36:33 -0700 |
commit | 7c51fa6d699a653cafa90df8e44911b576118ebd (patch) | |
tree | 543bf9ca698e03eff81104898b33e77f1abed319 /source4/torture/rpc/drsuapi.h | |
parent | cc3a6770c77ec8fe1cd63bf4c682853c56201f0c (diff) | |
parent | 3e3214fd91471bca5b6c4d3782e922d252d588fb (diff) | |
download | samba-7c51fa6d699a653cafa90df8e44911b576118ebd.tar.gz samba-7c51fa6d699a653cafa90df8e44911b576118ebd.tar.bz2 samba-7c51fa6d699a653cafa90df8e44911b576118ebd.zip |
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
Diffstat (limited to 'source4/torture/rpc/drsuapi.h')
-rw-r--r-- | source4/torture/rpc/drsuapi.h | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/source4/torture/rpc/drsuapi.h b/source4/torture/rpc/drsuapi.h index d32a35ee2c..a10ea5068e 100644 --- a/source4/torture/rpc/drsuapi.h +++ b/source4/torture/rpc/drsuapi.h @@ -30,6 +30,8 @@ struct DsPrivate { struct dcerpc_pipe *pipe; struct policy_handle bind_handle; struct GUID bind_guid; + struct drsuapi_DsBindInfo28 srv_bind_info; + const char *domain_obj_dn; const char *domain_guid_str; const char *domain_dns_name; @@ -45,10 +47,11 @@ struct DsPrivate { * \param _tctx torture context * \param _p DCERPC pipe handle * \param _ntstatus NTSTATUS for dcerpc_drsuapi_ call - * \param _pr in/out DCEPRC request structure + * \param _werr_expected Expected windows error to be returned + * \param _pr in/out DCEPRC request structure - pointer * \param _msg error message prefix */ -#define torture_drsuapi_assert_call(_tctx, _p, _ntstat, _pr, _msg) \ +#define torture_drsuapi_assert_call_werr(_tctx, _p, _ntstat, _werr_expected, _pr, _msg) \ do { \ NTSTATUS __nt = _ntstat; \ if (!NT_STATUS_IS_OK(__nt)) { \ @@ -58,6 +61,18 @@ struct DsPrivate { } \ torture_fail(tctx, talloc_asprintf(_tctx, "%s failed - %s", _msg, errstr)); \ } \ - torture_assert_werr_ok(_tctx, (_pr)->out.result, _msg); \ + torture_assert_werr_equal(_tctx, (_pr)->out.result, _werr_expected, _msg); \ } while(0) +/** + * Custom torture macro to check dcerpc_drsuapi_ call + * return values printing more friendly messages + * \param _tctx torture context + * \param _p DCERPC pipe handle + * \param _ntstatus NTSTATUS for dcerpc_drsuapi_ call + * \param _pr in/out DCEPRC request structure + * \param _msg error message prefix + */ +#define torture_drsuapi_assert_call(_tctx, _p, _ntstat, _pr, _msg) \ + torture_drsuapi_assert_call_werr(_tctx, _p, _ntstat, WERR_OK, _pr, _msg) + |