r12009: made the LOCAL-SDDL test less verbose by default, and add it to the

standard tests for the build farm
(This used to be commit 9d6d9b6e50dfe5513f332668b860e6a55af3a39c)

diff --git a/source4/script/tests/test_local.sh b/source4/script/tests/test_local.sh
index 324cad1118987e670da3f57b48052fd515d0cedb..eda7b44ca511d5d496300f08a9536869ca4a7f45 100755 (executable)
--- a/source4/script/tests/test_local.sh
+++ b/source4/script/tests/test_local.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-local_tests="LOCAL-NTLMSSP LOCAL-TALLOC LOCAL-MESSAGING LOCAL-IRPC LOCAL-BINDING LOCAL-IDTREE LOCAL-SOCKET LOCAL-PAC LOCAL-STRLIST"
+local_tests="LOCAL-NTLMSSP LOCAL-TALLOC LOCAL-MESSAGING LOCAL-IRPC LOCAL-BINDING LOCAL-IDTREE LOCAL-SOCKET LOCAL-PAC LOCAL-STRLIST LOCAL-SDDL"
 
 if [ $# -lt 0 ]; then
 cat <<EOF

diff --git a/source4/torture/local/sddl.c b/source4/torture/local/sddl.c
index fa7d15f6064039bfba67bb1c65640351c6a7280e..d6c01307981beb5b167e24428ade83150c6ef618 100644 (file)
--- a/source4/torture/local/sddl.c
+++ b/source4/torture/local/sddl.c
@@ -35,7 +35,9 @@ static BOOL test_sddl(TALLOC_CTX *mem_ctx, const char *sddl)
                printf("Failed to decode '%s'\n", sddl);
                return False;
        }
-       NDR_PRINT_DEBUG(security_descriptor, sd);
+       if (DEBUGLVL(2)) {
+               NDR_PRINT_DEBUG(security_descriptor, sd);
+       }
        talloc_free(sd);
        return True;
 }