diff options
author | Graham Leggett <minfrin@apache.org> | 2014-04-21 12:57:43 +0000 |
---|---|---|
committer | Graham Leggett <minfrin@apache.org> | 2014-04-21 12:57:43 +0000 |
commit | d81ecb2730b3545f544016f1d9411cc4568b7bef (patch) | |
tree | 6ac87903705986c2295a0c18b2ce65af4fa27d43 /tools | |
parent | a7219fda36e13f1399b8d413ebf961dccadcdd67 (diff) | |
download | apr-d81ecb2730b3545f544016f1d9411cc4568b7bef.tar.gz |
Add apr_escape_ldap() and apr_pescape_ldap(), escaping characters
as described by RFC4514 and RFC4515 respectively.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1588878 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'tools')
-rw-r--r-- | tools/gen_test_char.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/tools/gen_test_char.c b/tools/gen_test_char.c index 811c802f2..156b33145 100644 --- a/tools/gen_test_char.c +++ b/tools/gen_test_char.c @@ -32,6 +32,7 @@ #define T_ESCAPE_ECHO (0x08) #define T_ESCAPE_URLENCODED (0x10) #define T_ESCAPE_XML (0x20) +#define T_ESCAPE_LDAP (0x40) int main(int argc, char *argv[]) { @@ -46,6 +47,7 @@ int main(int argc, char *argv[]) "#define T_ESCAPE_ECHO (%u)\n" "#define T_ESCAPE_URLENCODED (%u)\n" "#define T_ESCAPE_XML (%u)\n" + "#define T_ESCAPE_LDAP (%u)\n" "\n" "static const unsigned char test_char_table[256] = {", T_ESCAPE_SHELL_CMD, @@ -53,7 +55,8 @@ int main(int argc, char *argv[]) T_OS_ESCAPE_PATH, T_ESCAPE_ECHO, T_ESCAPE_URLENCODED, - T_ESCAPE_XML); + T_ESCAPE_XML, + T_ESCAPE_LDAP); for (c = 0; c < 256; ++c) { flags = 0; @@ -106,6 +109,11 @@ int main(int argc, char *argv[]) flags |= T_ESCAPE_XML; } + /* LDAP DN escaping (RFC4514) and LDAP filter escaping (RFC4515) */ + if (!isprint(c) || strchr("\"+,;<>\\", c) || strchr("*()\\", c)) { + flags |= T_ESCAPE_LDAP; + } + printf("%u%c", flags, (c < 255) ? ',' : ' '); } |