summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-06-13 05:33:55 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:18:02 -0500
commit9cb3b2d49bf4093f9eff8cd26a0c9c994da5d096 (patch)
tree93ae2284560436efb83264ec3a65670a106b7d8a
parent87acba39f9e45eb6849cfd945ce6255bac5564c9 (diff)
downloadsamba-9cb3b2d49bf4093f9eff8cd26a0c9c994da5d096.tar.gz
samba-9cb3b2d49bf4093f9eff8cd26a0c9c994da5d096.tar.bz2
samba-9cb3b2d49bf4093f9eff8cd26a0c9c994da5d096.zip
r7515: merge in the binary encode/decode enhancements from the libcli/ldap/
code into the ldb parse code (This used to be commit 12647e37223847da810c2d4e5f83328b1fcf88cb)
-rw-r--r--source4/lib/ldb/common/ldb_parse.c70
-rw-r--r--source4/lib/ldb/include/ldb_parse.h1
2 files changed, 69 insertions, 2 deletions
diff --git a/source4/lib/ldb/common/ldb_parse.c b/source4/lib/ldb/common/ldb_parse.c
index e64e6d82d3..80841054c6 100644
--- a/source4/lib/ldb/common/ldb_parse.c
+++ b/source4/lib/ldb/common/ldb_parse.c
@@ -126,6 +126,73 @@ static const char *match_brace(const char *s)
return s;
}
+/*
+ decode a RFC2254 binary string representation of a buffer.
+ Used in LDAP filters.
+*/
+struct ldb_val ldb_binary_decode(TALLOC_CTX *ctx, const char *str)
+{
+ int i, j;
+ struct ldb_val ret;
+ int slen = strlen(str);
+
+ ret.data = talloc_size(ctx, slen);
+ ret.length = 0;
+ if (ret.data == NULL) return ret;
+
+ for (i=j=0;i<slen;i++) {
+ if (str[i] == '\\') {
+ unsigned c;
+ if (sscanf(&str[i+1], "%02X", &c) != 1) {
+ talloc_free(ret.data);
+ memset(&ret, 0, sizeof(ret));
+ return ret;
+ }
+ ((uint8_t *)ret.data)[j++] = c;
+ i += 2;
+ } else {
+ ((uint8_t *)ret.data)[j++] = str[i];
+ }
+ }
+ ret.length = j;
+
+ return ret;
+}
+
+
+/*
+ encode a blob as a RFC2254 binary string, escaping any
+ non-printable or '\' characters
+*/
+const char *ldb_binary_encode(TALLOC_CTX *ctx, struct ldb_val val)
+{
+ int i;
+ char *ret;
+ int len = val.length;
+ unsigned char *buf = val.data;
+
+ for (i=0;i<val.length;i++) {
+ if (!isprint(buf[i]) || strchr(" *()\\&|!", buf[i])) {
+ len += 2;
+ }
+ }
+ ret = talloc_array(ctx, char, len+1);
+ if (ret == NULL) return NULL;
+
+ len = 0;
+ for (i=0;i<val.length;i++) {
+ if (!isprint(buf[i]) || strchr(" *()\\&|!", buf[i])) {
+ snprintf(ret+len, 4, "\\%02X", buf[i]);
+ len += 3;
+ } else {
+ ret[len++] = buf[i];
+ }
+ }
+
+ ret[len] = 0;
+
+ return ret;
+}
static struct ldb_parse_tree *ldb_parse_filter(TALLOC_CTX *ctx, const char **s);
@@ -169,8 +236,7 @@ static struct ldb_parse_tree *ldb_parse_simple(TALLOC_CTX *ctx, const char *s)
ret->operation = LDB_OP_SIMPLE;
ret->u.simple.attr = l;
- ret->u.simple.value.data = val?val:discard_const_p(char, "");
- ret->u.simple.value.length = val?strlen(val):0;
+ ret->u.simple.value = ldb_binary_decode(ret, val);
return ret;
}
diff --git a/source4/lib/ldb/include/ldb_parse.h b/source4/lib/ldb/include/ldb_parse.h
index 50a9382534..741a8af618 100644
--- a/source4/lib/ldb/include/ldb_parse.h
+++ b/source4/lib/ldb/include/ldb_parse.h
@@ -55,5 +55,6 @@ struct ldb_parse_tree {
};
struct ldb_parse_tree *ldb_parse_tree(TALLOC_CTX *mem_ctx, const char *s);
+const char *ldb_binary_encode(TALLOC_CTX *ctx, struct ldb_val val);
#endif