diff options
| -rw-r--r-- | source4/torture/raw/setfileinfo.c | 2 | ||||
| -rw-r--r-- | source4/torture/rpc/drsuapi.c | 4 | ||||
| -rw-r--r-- | source4/torture/rpc/samr.c | 6 | ||||
| -rw-r--r-- | source4/torture/rpc/winreg.c | 2 | ||||
| -rw-r--r-- | source4/torture/torture.c | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/source4/torture/raw/setfileinfo.c b/source4/torture/raw/setfileinfo.c index 298ccf674b..53fbf5a0f3 100644 --- a/source4/torture/raw/setfileinfo.c +++ b/source4/torture/raw/setfileinfo.c @@ -527,7 +527,7 @@ BOOL torture_raw_sfileinfo_bug(void) NTSTATUS status; int fnum; - if (lp_parm_int(-1, "torture", "dangerous") != 1) { + if (!lp_parm_bool(-1, "torture", "dangerous", False)) { printf("torture_raw_sfileinfo_bug disabled - enable dangerous tests to use\n"); return True; } diff --git a/source4/torture/rpc/drsuapi.c b/source4/torture/rpc/drsuapi.c index f44bf97568..2e3fe87bb4 100644 --- a/source4/torture/rpc/drsuapi.c +++ b/source4/torture/rpc/drsuapi.c @@ -772,7 +772,7 @@ static BOOL test_DsReplicaSync(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, } }; - if (lp_parm_int(-1, "torture", "dangerous") != 1) { + if (!lp_parm_bool(-1, "torture", "dangerous", False)) { printf("DsReplicaSync disabled - enable dangerous tests to use\n"); return True; } @@ -791,7 +791,7 @@ static BOOL test_DsReplicaSync(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, r.in.req.req1.info->unknown2 = 120; ZERO_STRUCT(r.in.req.req1.info->guid1); ZERO_ARRAY(r.in.req.req1.info->unknown3); - r.in.req.req1.info->nc_dn = priv->domain_obj_dn; + r.in.req.req1.info->nc_dn = priv->domain_obj_dn?priv->domain_obj_dn:""; r.in.req.req1.guid1 = priv->dcinfo.ntds_guid; r.in.req.req1.string1 = NULL; r.in.req.req1.unknown1 = 16; diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c index 66cc8a5d26..a599dabe15 100644 --- a/source4/torture/rpc/samr.c +++ b/source4/torture/rpc/samr.c @@ -70,7 +70,7 @@ static BOOL test_Shutdown(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, NTSTATUS status; struct samr_Shutdown r; - if (lp_parm_int(-1, "torture", "dangerous") != 1) { + if (!lp_parm_bool(-1, "torture", "dangerous", False)) { printf("samr_Shutdown disabled - enable dangerous tests to use\n"); return True; } @@ -96,7 +96,7 @@ static BOOL test_SetDsrmPassword(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct samr_String string; struct samr_Password hash; - if (lp_parm_int(-1, "torture", "dangerous") != 1) { + if (!lp_parm_bool(-1, "torture", "dangerous", False)) { printf("samr_SetDsrmPassword disabled - enable dangerous tests to use\n"); return True; } @@ -2176,7 +2176,7 @@ static BOOL test_EnumDomainUsers_async(struct dcerpc_pipe *p, TALLOC_CTX *mem_ct #define ASYNC_COUNT 100 struct rpc_request *req[ASYNC_COUNT]; - if (lp_parm_int(-1, "torture", "dangerous") != 1) { + if (!lp_parm_bool(-1, "torture", "dangerous", False)) { printf("samr async test disabled - enable dangerous tests to use\n"); return True; } diff --git a/source4/torture/rpc/winreg.c b/source4/torture/rpc/winreg.c index e15ee23c37..14c18df370 100644 --- a/source4/torture/rpc/winreg.c +++ b/source4/torture/rpc/winreg.c @@ -770,7 +770,7 @@ BOOL torture_rpc_winreg(void) return False; } - if (lp_parm_int(-1, "torture", "dangerous") != 1) { + if (!lp_parm_bool(-1, "torture", "dangerous", False)) { printf("winreg_InitiateShutdown disabled - enable dangerous tests to use\n"); } else { ret &= test_InitiateSystemShutdown(p, mem_ctx, "spottyfood", 30); diff --git a/source4/torture/torture.c b/source4/torture/torture.c index c4dde45847..c5b91f3680 100644 --- a/source4/torture/torture.c +++ b/source4/torture/torture.c @@ -2697,7 +2697,7 @@ static BOOL is_binding_string(const char *binding_string) parse_dns(poptGetOptArg(pc)); break; case OPT_DANGEROUS: - lp_set_cmdline("torture:dangerous", "1"); + lp_set_cmdline("torture:dangerous", "Yes"); break; default: d_printf("Invalid option %s: %s\n", |