summaryrefslogtreecommitdiff
path: root/source4/torture/local
diff options
context:
space:
mode:
authorGary Lockyer <gary@catalyst.net.nz>2017-03-01 11:10:29 +1300
committerAndrew Bartlett <abartlet@samba.org>2017-03-29 02:37:26 +0200
commiteacb5aead71299b6bebbddbaf7c9a3d545f9151b (patch)
tree20daf5094bcf9ff3beb89cf8301e58c44c3ce6dd /source4/torture/local
parent6adcaf16482fbca1ca8eeb80a2a7029d415c423f (diff)
downloadsamba-eacb5aead71299b6bebbddbaf7c9a3d545f9151b.tar.gz
lib/util: Add functions to escape log lines but not break all non-ascii
We do not want to turn every non-ascii username into a pile of hex, so we instead focus on avoding newline insertion attacks and other low control chars Pair-programmed-by: Andrew Bartlett <abartlet@samba.org> Signed-off-by: Gary Lockyer <gary@catalyst.net.nz> Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4/torture/local')
-rw-r--r--source4/torture/local/local.c1
-rw-r--r--source4/torture/local/wscript_build3
2 files changed, 3 insertions, 1 deletions
diff --git a/source4/torture/local/local.c b/source4/torture/local/local.c
index 6641f211cff..89066c5f52f 100644
--- a/source4/torture/local/local.c
+++ b/source4/torture/local/local.c
@@ -74,6 +74,7 @@
torture_local_verif_trailer,
torture_local_nss,
torture_local_fsrvp,
+ torture_local_util_str_escape,
NULL
};
diff --git a/source4/torture/local/wscript_build b/source4/torture/local/wscript_build
index 087b842141d..2f1a7c8415e 100644
--- a/source4/torture/local/wscript_build
+++ b/source4/torture/local/wscript_build
@@ -20,11 +20,12 @@ TORTURE_LOCAL_SOURCE = '''../../../lib/util/charset/tests/iconv.c
../../../lib/util/tests/strv.c
../../../lib/util/tests/strv_util.c
../../../lib/util/tests/util.c
+ ../../../lib/util/tests/util_str_escape.c
verif_trailer.c
nss_tests.c
fsrvp_state.c'''
-TORTURE_LOCAL_DEPS = 'RPC_NDR_ECHO TDR LIBCLI_SMB MESSAGING iconv POPT_CREDENTIALS TORTURE_AUTH TORTURE_UTIL TORTURE_NDR TORTURE_LIBCRYPTO share torture_registry PROVISION ldb samdb replace-test RPC_FSS_STATE'
+TORTURE_LOCAL_DEPS = 'RPC_NDR_ECHO TDR LIBCLI_SMB MESSAGING iconv POPT_CREDENTIALS TORTURE_AUTH TORTURE_UTIL TORTURE_NDR TORTURE_LIBCRYPTO share torture_registry PROVISION ldb samdb replace-test RPC_FSS_STATE util_str_escape'
bld.SAMBA_MODULE('TORTURE_LOCAL',
source=TORTURE_LOCAL_SOURCE,