diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-03 23:33:22 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:47:55 +0100 |
| commit | 509e82e402d64c79f27c9a10d75b100a1ac5fefa (patch) | |
| tree | a7770d609512848c17f413764e9dc0bd43acce5d /source4/torture/rpc | |
| parent | da0f222f432c4fc8bf5da80baf849ca32b315ca0 (diff) | |
| download | samba-509e82e402d64c79f27c9a10d75b100a1ac5fefa.tar.gz samba-509e82e402d64c79f27c9a10d75b100a1ac5fefa.tar.bz2 samba-509e82e402d64c79f27c9a10d75b100a1ac5fefa.zip | |
r26272: Remove global_loadparm in some more places.
(This used to be commit 1ab76ecc5311fa863e5d04899b6f110899818f55)
Diffstat (limited to 'source4/torture/rpc')
| -rw-r--r-- | source4/torture/rpc/drsuapi.c | 4 | ||||
| -rw-r--r-- | source4/torture/rpc/drsuapi_cracknames.c | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/source4/torture/rpc/drsuapi.c b/source4/torture/rpc/drsuapi.c index 7fc2406bbf..5e01c2050c 100644 --- a/source4/torture/rpc/drsuapi.c +++ b/source4/torture/rpc/drsuapi.c @@ -719,7 +719,7 @@ bool torture_rpc_drsuapi(struct torture_context *torture) #endif ret &= test_DsGetDomainControllerInfo(p, torture, &priv); - ret &= test_DsCrackNames(p, torture, &priv); + ret &= test_DsCrackNames(torture, p, torture, &priv); ret &= test_DsWriteAccountSpn(p, torture, &priv); @@ -771,7 +771,7 @@ bool torture_rpc_drsuapi_cracknames(struct torture_context *torture) /* We don't care if this fails, we just need some info from it */ test_DsGetDomainControllerInfo(p, torture, &priv); - ret &= test_DsCrackNames(p, torture, &priv); + ret &= test_DsCrackNames(torture, p, torture, &priv); ret &= test_DsUnbind(p, torture, &priv); } diff --git a/source4/torture/rpc/drsuapi_cracknames.c b/source4/torture/rpc/drsuapi_cracknames.c index ac3eebfa68..89d9b7bd34 100644 --- a/source4/torture/rpc/drsuapi_cracknames.c +++ b/source4/torture/rpc/drsuapi_cracknames.c @@ -204,8 +204,9 @@ static bool test_DsCrackNamesMatrix(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, return ret; } -bool test_DsCrackNames(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, - struct DsPrivate *priv) +bool test_DsCrackNames(struct torture_context *tctx, + struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, + struct DsPrivate *priv) { NTSTATUS status; struct drsuapi_DsCrackNames r; @@ -589,7 +590,7 @@ bool test_DsCrackNames(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, .comment = "display name for Microsoft Support Account", .status = DRSUAPI_DS_NAME_STATUS_OK, .alternate_status = DRSUAPI_DS_NAME_STATUS_NOT_UNIQUE, - .skip = lp_parm_bool(global_loadparm, NULL, "torture", "samba4", false) + .skip = torture_setting_bool(tctx, "samba4", false) }, { .format_offered = DRSUAPI_DS_NAME_FORMAT_GUID, |