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

r26489: Merge fixed ranged results module to release branch.

Browse Source 
This is the last blocker for the release that I know of.

Andrew Bartlett
This commit is contained in:
Andrew Bartlett 2007-12-17 06:02:54 +01:00 committed by Stefan Metzmacher
parent 913ba60939
commit d1020d4497
1 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
source/dsdb/samdb/ldb_modules/ranged_results.c
View File

@ -60,9 +60,10 @@ static int rr_search_callback(struct ldb_context *ldb, void *context, struct ldb
if (strncasecmp(p, ";range=", strlen(";range=")) != 0) {
continue;
}
if (sscanf(p, ";range=%u-*", &start) == 1) {
if (sscanf(p, ";range=%u-%u", &start, &end) == 2) {
} else if (sscanf(p, ";range=%u-*", &start) == 1) {
end = (unsigned int)-1;
} else if (sscanf(p, ";range=%u-%u", &start, &end) != 2) {
} else {
continue;
}
new_attr = talloc_strndup(orig_req,
@ -82,19 +83,23 @@ static int rr_search_callback(struct ldb_context *ldb, void *context, struct ldb
ldb_asprintf_errstring(ldb, "range request error: start must not be greater than end");
return LDB_ERR_UNWILLING_TO_PERFORM;
}
if (end >= el->num_values) {
if (end >= (el->num_values - 1)) {
/* Need to leave the requested attribute in
* there (so add an empty one to match) */
end_str = "*";
end = el->num_values;
ret = ldb_msg_add_empty(ares->message, orig_req->op.search.attrs[i],
0, NULL);
if (ret != LDB_SUCCESS) {
return ret;
}
end = el->num_values - 1;
} else {
end_str = talloc_asprintf(el, "%u", end);
if (!end_str) {
ldb_oom(ldb);
return LDB_ERR_OPERATIONS_ERROR;
}
}
/* If start is greater then where we noe find the end to be */
if (start > end) {
el->num_values = 0;
el->values = NULL;
} else {
orig_values = el->values;
orig_num_values = el->num_values;
@ -103,18 +108,19 @@ static int rr_search_callback(struct ldb_context *ldb, void *context, struct ldb
return LDB_ERR_UNWILLING_TO_PERFORM;
}
el->values = talloc_array(el, struct ldb_val, end - start);
el->num_values = 0;
el->values = talloc_array(el, struct ldb_val, (end - start) + 1);
if (!el->values) {
ldb_oom(ldb);
return LDB_ERR_OPERATIONS_ERROR;
}
for (j=start; j < end; j++) {
for (j=start; j <= end; j++) {
el->values[el->num_values] = orig_values[j];
el->num_values++;
}
el->name = talloc_asprintf(el, "%s;Range=%u-%s", el->name, start, end_str);
}
el->name = talloc_asprintf(el, "%s;range=%u-%s", el->name, start, end_str);
if (!el->name) {
ldb_oom(ldb);
return LDB_ERR_OPERATIONS_ERROR;