sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-31 17:18:04 +03:00
Code

replmd: check whether list is already sorted in get_parsed_dns()

Browse Source 
If they are we can avoid the sort.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Douglas Bagnall 2016-12-17 22:04:59 +13:00 committed by Douglas Bagnall
parent a9e0e7a9ef
commit 996aafdbff
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source4/dsdb/samdb/ldb_modules/repl_meta_data.c
View File

@ -1827,6 +1827,7 @@ static int get_parsed_dns(struct ldb_module *module, TALLOC_CTX *mem_ctx,
const char *ldap_oid, struct ldb_request *parent) const char *ldap_oid, struct ldb_request *parent)
{ {
unsigned int i; unsigned int i;
bool values_are_sorted = true;
struct ldb_context *ldb = ldb_module_get_ctx(module); struct ldb_context *ldb = ldb_module_get_ctx(module);
if (el == NULL) { if (el == NULL) {
@ -1876,13 +1877,18 @@ static int get_parsed_dns(struct ldb_module *module, TALLOC_CTX *mem_ctx,
} else if (!NT_STATUS_IS_OK(status)) { } else if (!NT_STATUS_IS_OK(status)) {
return LDB_ERR_OPERATIONS_ERROR; return LDB_ERR_OPERATIONS_ERROR;
} }
if (i > 0 && values_are_sorted) {
int cmp = parsed_dn_compare(p, &(*pdn)[i - 1]);
if (cmp < 0) {
values_are_sorted = false;
}
}
/* keep a pointer to the original ldb_val */ /* keep a pointer to the original ldb_val */
p->v = v; p->v = v;
} }
if (! values_are_sorted) {
TYPESAFE_QSORT(*pdn, el->num_values, parsed_dn_compare); TYPESAFE_QSORT(*pdn, el->num_values, parsed_dn_compare);
}
return LDB_SUCCESS; return LDB_SUCCESS;
} }