summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2009-12-07 12:41:43 +1100
committerAndrew Bartlett <abartlet@samba.org>2009-12-07 13:07:56 +1100
commit354b80b3ae3fd918d65f6425d054630d51ee18e0 (patch)
tree71c825b4a7c3d5db158e87d24986f2d01310b99a /source4
parent45cd4c93fbcabe8e5c66f57f8ded08a860af1bce (diff)
downloadsamba-354b80b3ae3fd918d65f6425d054630d51ee18e0.tar.gz
samba-354b80b3ae3fd918d65f6425d054630d51ee18e0.tar.bz2
samba-354b80b3ae3fd918d65f6425d054630d51ee18e0.zip
s4:dsdb Make primaryGroupToken calculation more efficient and correct
The original code here would do a subtree search under each object, attempting to determine if it was a group. This was incorrect, and inefficient - we just need to ask for the objectClass attribute, and check that value before returning the group's RID. (Much of this patch reworks operational.c to allow a search for 2 attributes for this calculation). Andrew Bartlett
Diffstat (limited to 'source4')
-rw-r--r--source4/dsdb/samdb/ldb_modules/operational.c66
1 files changed, 46 insertions, 20 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/operational.c b/source4/dsdb/samdb/ldb_modules/operational.c
index 671a178e33..161de8449e 100644
--- a/source4/dsdb/samdb/ldb_modules/operational.c
+++ b/source4/dsdb/samdb/ldb_modules/operational.c
@@ -98,19 +98,24 @@ static int construct_canonical_name(struct ldb_module *module,
construct a primary group token for groups from a message
*/
static int construct_primary_group_token(struct ldb_module *module,
- struct ldb_message *msg)
+ struct ldb_message *msg)
{
+ struct ldb_parse_tree objectclass_is_group = {
+ .operation = LDB_OP_EQUALITY,
+ .u.equality.attr = "objectClass",
+ .u.equality.value = data_blob_string_const("group")
+ };
struct ldb_context *ldb;
uint32_t primary_group_token;
-
+
ldb = ldb_module_get_ctx(module);
-
- /* this is horrendously inefficient! we're doing a subtree
- * search for every DN we return. So that's N^2 in the
- * total number of objects! */
- if (samdb_search_count(ldb, msg->dn, "(objectclass=group)") == 1) {
+ if (ldb_match_msg(ldb, msg, &objectclass_is_group, msg->dn, LDB_SCOPE_BASE) == 1) {
primary_group_token
= samdb_result_rid_from_sid(ldb, msg, "objectSid", 0);
+ if (primary_group_token == 0) {
+ return LDB_SUCCESS;
+ }
+
return samdb_msg_add_int(ldb, ldb, msg, "primaryGroupToken",
primary_group_token);
} else {
@@ -193,15 +198,16 @@ static const struct {
static const struct {
const char *attr;
const char *replace;
+ const char *extra_attr;
int (*constructor)(struct ldb_module *, struct ldb_message *);
} search_sub[] = {
- { "createTimestamp", "whenCreated", NULL },
- { "modifyTimestamp", "whenChanged", NULL },
- { "structuralObjectClass", "objectClass", NULL },
- { "canonicalName", "distinguishedName", construct_canonical_name },
- { "primaryGroupToken", "objectSid", construct_primary_group_token },
- { "parentGUID", NULL, construct_parent_guid },
- { "subSchemaSubEntry", NULL, construct_subschema_subentry }
+ { "createTimestamp", "whenCreated", NULL , NULL },
+ { "modifyTimestamp", "whenChanged", NULL , NULL },
+ { "structuralObjectClass", "objectClass", NULL , NULL },
+ { "canonicalName", "distinguishedName", NULL , construct_canonical_name },
+ { "primaryGroupToken", "objectClass", "objectSid", construct_primary_group_token },
+ { "parentGUID", NULL, NULL, construct_parent_guid },
+ { "subSchemaSubEntry", NULL, NULL, construct_subschema_subentry }
};
@@ -282,13 +288,16 @@ static int operational_search_post_process(struct ldb_module *module,
/* remove the added search attribute, unless it was
asked for by the user */
- if (search_sub[i].replace == NULL ||
- ldb_attr_in_list(attrs, search_sub[i].replace) ||
- ldb_attr_in_list(attrs, "*")) {
- continue;
+ if (search_sub[i].replace != NULL &&
+ !ldb_attr_in_list(attrs, search_sub[i].replace) &&
+ !ldb_attr_in_list(attrs, "*")) {
+ ldb_msg_remove_attr(msg, search_sub[i].replace);
+ }
+ if (search_sub[i].extra_attr != NULL &&
+ !ldb_attr_in_list(attrs, search_sub[i].extra_attr) &&
+ !ldb_attr_in_list(attrs, "*")) {
+ ldb_msg_remove_attr(msg, search_sub[i].extra_attr);
}
-
- ldb_msg_remove_attr(msg, search_sub[i].replace);
}
}
@@ -394,12 +403,29 @@ static int operational_search(struct ldb_module *module, struct ldb_request *req
for (i=0;i<ARRAY_SIZE(search_sub);i++) {
if (ldb_attr_cmp(ac->attrs[a], search_sub[i].attr) == 0 &&
search_sub[i].replace) {
+
+ if (search_sub[i].extra_attr) {
+ const char **search_attrs2;
+ /* Only adds to the end of the list */
+ search_attrs2 = ldb_attr_list_copy_add(req, search_attrs
+ ? search_attrs
+ : ac->attrs,
+ search_sub[i].extra_attr);
+ if (search_attrs2 == NULL) {
+ return LDB_ERR_OPERATIONS_ERROR;
+ }
+ /* may be NULL, talloc_free() doesn't mind */
+ talloc_free(search_attrs);
+ search_attrs = search_attrs2;
+ }
+
if (!search_attrs) {
search_attrs = ldb_attr_list_copy(req, ac->attrs);
if (search_attrs == NULL) {
return LDB_ERR_OPERATIONS_ERROR;
}
}
+ /* Despite the ldb_attr_list_copy_add, this is safe as that fn only adds to the end */
search_attrs[a] = search_sub[i].replace;
}
}