sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

ldb_controls: add base64 option to VLV

Browse Source 
The Samba control syntax limits the range of valid search terms for
VLV's gt_eq mode. To get around that, we allow base64 encoded strings
using the syntax 'base64>=Zm9vCg==' rather than '>=foo'.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
This commit is contained in:
Douglas Bagnall 2016-01-29 17:47:45 +13:00 committed by Andrew Bartlett
parent 9bbd7d1c77
commit 577f972f45
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/ldb/common/ldb_controls.c
View File

@ -462,13 +462,25 @@ struct ldb_control *ldb_parse_control_from_string(struct ldb_context *ldb, TALLO
ctxid[0] = '\0'; ctxid[0] = '\0';
p = &(control_strings[sizeof(LDB_CONTROL_VLV_REQ_NAME)]); p = &(control_strings[sizeof(LDB_CONTROL_VLV_REQ_NAME)]);
ret = sscanf(p, "%d:%d:%d:%d:%d:%1023[^$]", &crit, &bc, &ac, &os, &cc, ctxid); ret = sscanf(p, "%d:%d:%d:%d:%d:%1023[^$]", &crit, &bc, &ac, &os, &cc, ctxid);
if (ret < 5) { /* We allow 2 ways to encode the GT_EQ case, because the
comparison string might contain null bytes or colons, which
would break sscanf (or indeed any parsing mechanism). */
if (ret == 3) {
ret = sscanf(p, "%d:%d:%d:>=%1023[^:]:%1023[^$]", &crit, &bc, &ac, attr, ctxid); ret = sscanf(p, "%d:%d:%d:>=%1023[^:]:%1023[^$]", &crit, &bc, &ac, attr, ctxid);
} }
if (ret == 3) {
int len;
ret = sscanf(p, "%d:%d:%d:base64>=%1023[^:]:%1023[^$]", &crit, &bc, &ac, attr, ctxid);
len = ldb_base64_decode(attr);
if (len < 0) {
ret = -1;
}
}
if ((ret < 4) || (crit < 0) || (crit > 1)) { if ((ret < 4) || (crit < 0) || (crit > 1)) {
error_string = talloc_asprintf(mem_ctx, "invalid VLV control syntax\n"); error_string = talloc_asprintf(mem_ctx, "invalid VLV control syntax\n");
error_string = talloc_asprintf_append(error_string, " syntax: crit(b):bc(n):ac(n):<os(n):cc(n)|attr(s)>[:ctxid(o)]\n"); error_string = talloc_asprintf_append(error_string, " syntax: crit(b):bc(n):ac(n):"
"{os(n):cc(n)|>=val(s)|base64>=val(o)}[:ctxid(o)]\n");
error_string = talloc_asprintf_append(error_string, " note: b = boolean, n = number, s = string, o = b64 binary blob"); error_string = talloc_asprintf_append(error_string, " note: b = boolean, n = number, s = string, o = b64 binary blob");
ldb_set_errstring(ldb, error_string); ldb_set_errstring(ldb, error_string);
talloc_free(error_string); talloc_free(error_string);