sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-13 13:18:06 +03:00
Code

Fixed a problem with duplicate values of allowedAttributesEffective.

Browse Source
This commit is contained in:
Nadezhda Ivanova 2009-12-15 12:02:20 +02:00
parent ef5508bc78
commit 4deaa84ce4
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source4/dsdb/samdb/ldb_modules/acl.c
View File

@ -431,7 +431,9 @@ static int acl_allowedAttributes(struct ldb_module *module,
return LDB_ERR_OPERATIONS_ERROR;
}
/* remove constructed attributes */
if (attr->systemFlags & DS_FLAG_ATTR_IS_CONSTRUCTED) {
if (attr->systemFlags & DS_FLAG_ATTR_IS_CONSTRUCTED
|| attr->systemOnly
|| (attr->linkID != 0 && attr->linkID % 2 != 0 )) {
continue;
}
ret = acl_check_access_on_attribute(module,

11
source4/dsdb/schema/schema_query.c
View File

@ -350,6 +350,14 @@ static const char **dsdb_full_attribute_list_internal_el(TALLOC_CTX *mem_ctx,
return attr_list;
}
static int qsort_string(const void *v1,
const void *v2)
{
char * const *s1 = v1;
char * const *s2 = v2;
return strcasecmp(*s1, *s2);
}
/* Helper function to remove duplicates from the attribute list to be returned */
static const char **dedup_attr_list(const char **attr_list)
{
@ -359,13 +367,14 @@ static const char **dedup_attr_list(const char **attr_list)
int i;
qsort(attr_list, new_len,
sizeof(*attr_list),
(comparison_fn_t)strcasecmp);
(comparison_fn_t)qsort_string);
for (i=1 ; i < new_len; i++) {
const char **val1 = &attr_list[i-1];
const char **val2 = &attr_list[i];
if (ldb_attr_cmp(*val1, *val2) == 0) {
memmove(val1, val2, (new_len - i) * sizeof( *attr_list));
attr_list[new_len-1] = NULL;
new_len--;
i--;
}