r4179: - nicer code layout

- and disable DsReplicaSync by default it kill lsass.exe
  on my w2k box

metze

diff --git a/source/torture/rpc/drsuapi.c b/source/torture/rpc/drsuapi.c
index 7bef1e53609d2d66cfdfd7201df13a9f4b9ecc2f..bce1bbf9ac81409be7ac1529b704954f69402b6f 100644 (file)
--- a/source/torture/rpc/drsuapi.c
+++ b/source/torture/rpc/drsuapi.c
@@ -860,33 +860,23 @@ BOOL torture_rpc_drsuapi(void)
 
        ZERO_STRUCT(priv);
 
-       if (!test_DsBind(p, mem_ctx, &priv)) {
-               ret = False;
-       }
+       ret &= test_DsBind(p, mem_ctx, &priv);
 
-       if (!test_DsGetDCInfo(p, mem_ctx, &priv)) {
-               ret = False;
-       }
+       ret &= test_DsGetDCInfo(p, mem_ctx, &priv);
 
-       if (!test_DsCrackNames(p, mem_ctx, &priv)) {
-               ret = False;
-       }
+       ret &= test_DsCrackNames(p, mem_ctx, &priv);
 
-       if (!test_DsWriteAccountSpn(p, mem_ctx, &priv)) {
-               ret = False;
-       }
+       ret &= test_DsWriteAccountSpn(p, mem_ctx, &priv);
 
-       if (!test_DsReplicaGetInfo(p, mem_ctx, &priv)) {
-               ret = False;
-       }
+       ret &= test_DsReplicaGetInfo(p, mem_ctx, &priv);
 
-       if (!test_DsReplicaSync(p, mem_ctx, &priv)) {
-               ret = False;
+       if (lp_parm_int(-1, "torture", "dangerous") == 1) {
+               ret &= test_DsReplicaSync(p, mem_ctx, &priv);
+       } else {
+               printf("DsReplicaSync disabled - enable dangerous tests to use\n");
        }
 
-       if (!test_DsUnbind(p, mem_ctx, &priv)) {
-               ret = False;
-       }
+       ret &= test_DsUnbind(p, mem_ctx, &priv);
 
        talloc_destroy(mem_ctx);