summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-12-02 03:21:29 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:46:58 -0500
commit86a6ce529f41556e4146aa1b43e31356286a759b (patch)
tree904c5a45f3d852eeeed5e9fb42be472bc0f115d9
parent3aaa6ff496debf806fdb87d7993061eb5e61af1b (diff)
downloadsamba-86a6ce529f41556e4146aa1b43e31356286a759b.tar.gz
samba-86a6ce529f41556e4146aa1b43e31356286a759b.tar.bz2
samba-86a6ce529f41556e4146aa1b43e31356286a759b.zip
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)
-rwxr-xr-xsource4/script/tests/test_local.sh2
-rw-r--r--source4/torture/local/sddl.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/source4/script/tests/test_local.sh b/source4/script/tests/test_local.sh
index 324cad1118..eda7b44ca5 100755
--- 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 fa7d15f606..d6c0130798 100644
--- 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;
}