[SCM] Samba Shared Repository - branch master updated
Matthias Dieter Wallnöfer
mdw at samba.org
Wed Oct 13 08:18:01 MDT 2010
The branch, master has been updated
via 36c1ed2 s4:sam.py - add a test for the group type changing behaviour
via 826496c s4:samldb LDB module - support the group type changing properly
via 09ce56d s4:ldap.py - test the "isCriticalSystemObject" behaviour
via 5cb99aa s4:setup/provision_self_join.ldif - let the samldb LDB module fill in "isCriticalSystemObject"
via 9bcb656 s4:samldb LDB module - deny also the direct modification of "isCriticalSystemObject" on modify operations
via 4638bd1 s4:objectclass LDB module - deny the creation of "isCriticalSystemObject" entries
via 8806008 s4:samldb LDB module - first implementation of the samldb primary group trigger
via 635996e s4:samldb LDB module - use the new "objectclass_trigger" for add operations
via 2b6cbf2 s4:samldb LDB module - first implementation of the samldb objectclass trigger
via 9bdea1b ldb:ldb_match.c - fix a counter type
from beb5afe s3:gpfs: Add support for the gpfs_ftruncate call
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 36c1ed215d60ddb0fb41ffd471fc3aa6e53266de
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Thu Oct 7 09:59:29 2010 +0200
s4:sam.py - add a test for the group type changing behaviour
Autobuild-User: Matthias Dieter Wallnöfer <mdw at samba.org>
Autobuild-Date: Wed Oct 13 14:17:31 UTC 2010 on sn-devel-104
commit 826496ce553546b9f7ca3dc60471d6344d8bf930
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Thu Oct 7 09:23:04 2010 +0200
s4:samldb LDB module - support the group type changing properly
This is exactly that what Windows allows. It was proven by a blackbox test.
And we also need to deny add operations of builtin groups.
commit 09ce56d957193188c4200d9765876f9b78a3928a
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Wed Oct 6 19:40:42 2010 +0200
s4:ldap.py - test the "isCriticalSystemObject" behaviour
commit 5cb99aa81aa235a42a7ec32776fdf42785aefdf9
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Thu Oct 7 08:24:29 2010 +0200
s4:setup/provision_self_join.ldif - let the samldb LDB module fill in "isCriticalSystemObject"
It recognizes it now automatically.
commit 9bcb656bba21eb1a27befe642051bf761ede6278
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Wed Oct 6 19:30:56 2010 +0200
s4:samldb LDB module - deny also the direct modification of "isCriticalSystemObject" on modify operations
commit 4638bd11b59de1d771a34d328e3c287549cde54c
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Mon Oct 11 18:41:05 2010 +0200
s4:objectclass LDB module - deny the creation of "isCriticalSystemObject" entries
They're only allowed to be created with the RELAX control specified.
commit 8806008024e353ede2a276937880cc9cd732d9dc
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Sun Sep 12 18:19:56 2010 +0200
s4:samldb LDB module - first implementation of the samldb primary group trigger
This was done according to MS-SAMR 3.1.1.8.2
But do use it only for add operations at the moment.
commit 635996e97cbd401fee344c8d6e2ffd8b3cb47522
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Wed Oct 6 14:16:17 2010 +0200
s4:samldb LDB module - use the new "objectclass_trigger" for add operations
Additionally clean up "samldb_fill_object" which is now much easier to
comprehend.
commit 2b6cbf2eb00f589a97f5d9a2b0bda5b596c1c676
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Sun Sep 12 18:19:56 2010 +0200
s4:samldb LDB module - first implementation of the samldb objectclass trigger
This was done according to MS-SAMR 3.1.1.8.1
I need to perform some RELAX checks since otherwise the provision wouldn't work
anymore.
commit 9bdea1b384794cd93d728810f916aea3fd055605
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date: Wed Oct 13 14:03:09 2010 +0200
ldb:ldb_match.c - fix a counter type
-----------------------------------------------------------------------
Summary of changes:
source4/dsdb/samdb/ldb_modules/objectclass.c | 9 +
source4/dsdb/samdb/ldb_modules/samldb.c | 531 +++++++++++++++---------
source4/dsdb/tests/python/ldap.py | 39 ++
source4/dsdb/tests/python/sam.py | 595 ++++++++++++++++++++++++++
source4/lib/ldb/common/ldb_match.c | 2 +-
source4/setup/provision_self_join.ldif | 2 +-
6 files changed, 982 insertions(+), 196 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/dsdb/samdb/ldb_modules/objectclass.c b/source4/dsdb/samdb/ldb_modules/objectclass.c
index 940290b..86708eb 100644
--- a/source4/dsdb/samdb/ldb_modules/objectclass.c
+++ b/source4/dsdb/samdb/ldb_modules/objectclass.c
@@ -734,6 +734,15 @@ static int objectclass_do_add(struct oc_context *ac)
return ret;
}
}
+
+ /* make sure that "isCriticalSystemObject" is not specified! */
+ el = ldb_msg_find_element(msg, "isCriticalSystemObject");
+ if ((el != NULL) &&
+ !ldb_request_get_control(ac->req, LDB_CONTROL_RELAX_OID)) {
+ ldb_set_errstring(ldb,
+ "objectclass: 'isCriticalSystemObject' must not be specified!");
+ return LDB_ERR_UNWILLING_TO_PERFORM;
+ }
}
ret = ldb_msg_sanity_check(ldb, msg);
diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c
index bf804fd..f35a56a 100644
--- a/source4/dsdb/samdb/ldb_modules/samldb.c
+++ b/source4/dsdb/samdb/ldb_modules/samldb.c
@@ -192,107 +192,6 @@ static int samldb_check_sAMAccountName(struct samldb_ctx *ac)
return samldb_next_step(ac);
}
-/* sAMAccountType handling */
-
-static int samldb_check_sAMAccountType(struct samldb_ctx *ac)
-{
- struct ldb_context *ldb;
- unsigned int account_type;
- unsigned int group_type;
- unsigned int uac;
- int ret;
-
- ldb = ldb_module_get_ctx(ac->module);
-
- /* make sure sAMAccountType is not specified */
- if (ldb_msg_find_element(ac->msg, "sAMAccountType") != NULL) {
- ldb_asprintf_errstring(ldb,
- "sAMAccountType must not be specified!");
- return LDB_ERR_UNWILLING_TO_PERFORM;
- }
-
- if (strcmp("user", ac->type) == 0) {
- uac = samdb_result_uint(ac->msg, "userAccountControl", 0);
- if (uac == 0) {
- ldb_asprintf_errstring(ldb,
- "userAccountControl invalid!");
- return LDB_ERR_UNWILLING_TO_PERFORM;
- } else {
- account_type = ds_uf2atype(uac);
- ret = samdb_msg_add_uint(ldb,
- ac->msg, ac->msg,
- "sAMAccountType",
- account_type);
- if (ret != LDB_SUCCESS) {
- return ret;
- }
- }
- } else if (strcmp("group", ac->type) == 0) {
- group_type = samdb_result_uint(ac->msg, "groupType", 0);
- if (group_type == 0) {
- ldb_asprintf_errstring(ldb,
- "groupType invalid!\n");
- return LDB_ERR_UNWILLING_TO_PERFORM;
- } else {
- account_type = ds_gtype2atype(group_type);
- ret = samdb_msg_add_uint(ldb,
- ac->msg, ac->msg,
- "sAMAccountType",
- account_type);
- if (ret != LDB_SUCCESS) {
- return ret;
- }
- }
- }
-
- return samldb_next_step(ac);
-}
-
-/* primaryGroupID handling */
-
-static int samldb_check_primaryGroupID(struct samldb_ctx *ac)
-{
- struct ldb_context *ldb = ldb_module_get_ctx(ac->module);
- struct ldb_dn *prim_group_dn;
- uint32_t rid;
- struct dom_sid *sid;
- int ret;
-
- rid = samdb_result_uint(ac->msg, "primaryGroupID", (uint32_t) -1);
- if (rid == (uint32_t) -1) {
- uint32_t uac = samdb_result_uint(ac->msg, "userAccountControl",
- 0);
-
- rid = ds_uf2prim_group_rid(uac);
-
- ret = samdb_msg_add_uint(ldb, ac->msg, ac->msg,
- "primaryGroupID", rid);
- if (ret != LDB_SUCCESS) {
- return ret;
- }
- } else if (!ldb_request_get_control(ac->req, LDB_CONTROL_RELAX_OID)) {
- ldb_set_errstring(ldb,
- "The primary group isn't settable on add operations!");
- return LDB_ERR_UNWILLING_TO_PERFORM;
- }
-
- sid = dom_sid_add_rid(ac, samdb_domain_sid(ldb), rid);
- if (sid == NULL) {
- return ldb_operr(ldb);
- }
-
- prim_group_dn = samdb_search_dn(ldb, ac, NULL, "(objectSid=%s)",
- ldap_encode_ndr_dom_sid(ac, sid));
- if (prim_group_dn == NULL) {
- ldb_asprintf_errstring(ldb,
- "Failed to find primary group with RID %u!",
- rid);
- return LDB_ERR_UNWILLING_TO_PERFORM;
- }
-
- return samldb_next_step(ac);
-}
-
static bool samldb_msg_add_sid(struct ldb_message *msg,
const char *name,
@@ -615,51 +514,35 @@ static bool check_rodc_critical_attribute(struct ldb_message *msg)
static int samldb_fill_object(struct samldb_ctx *ac)
{
- struct ldb_context *ldb;
- struct loadparm_context *lp_ctx;
- enum sid_generator sid_generator;
+ struct ldb_context *ldb = ldb_module_get_ctx(ac->module);
int ret;
- struct ldb_control *rodc_control;
- struct dom_sid *sid;
-
- ldb = ldb_module_get_ctx(ac->module);
/* Add informations for the different account types */
if (strcmp(ac->type, "user") == 0) {
- ret = samdb_find_or_add_attribute(ldb, ac->msg,
- "userAccountControl", "546");
- if (ret != LDB_SUCCESS) return ret;
- ret = samdb_find_or_add_attribute(ldb, ac->msg,
- "badPwdCount", "0");
- if (ret != LDB_SUCCESS) return ret;
- ret = samdb_find_or_add_attribute(ldb, ac->msg,
- "codePage", "0");
- if (ret != LDB_SUCCESS) return ret;
- ret = samdb_find_or_add_attribute(ldb, ac->msg,
- "countryCode", "0");
- if (ret != LDB_SUCCESS) return ret;
- ret = samdb_find_or_add_attribute(ldb, ac->msg,
- "badPasswordTime", "0");
- if (ret != LDB_SUCCESS) return ret;
- ret = samdb_find_or_add_attribute(ldb, ac->msg,
- "lastLogoff", "0");
- if (ret != LDB_SUCCESS) return ret;
- ret = samdb_find_or_add_attribute(ldb, ac->msg,
- "lastLogon", "0");
- if (ret != LDB_SUCCESS) return ret;
- ret = samdb_find_or_add_attribute(ldb, ac->msg,
- "pwdLastSet", "0");
- if (ret != LDB_SUCCESS) return ret;
- ret = samdb_find_or_add_attribute(ldb, ac->msg,
- "accountExpires", "9223372036854775807");
+ struct ldb_control *rodc_control = ldb_request_get_control(ac->req,
+ LDB_CONTROL_RODC_DCPROMO_OID);
+ if (rodc_control != NULL) {
+ /* see [MS-ADTS] 3.1.1.3.4.1.23 LDAP_SERVER_RODC_DCPROMO_OID */
+ rodc_control->critical = false;
+ ret = samldb_add_step(ac, samldb_rodc_add);
+ if (ret != LDB_SUCCESS) return ret;
+ }
+
+ /* check if we have a valid sAMAccountName */
+ ret = samldb_add_step(ac, samldb_check_sAMAccountName);
if (ret != LDB_SUCCESS) return ret;
- ret = samdb_find_or_add_attribute(ldb, ac->msg,
- "logonCount", "0");
+
+ ret = samldb_add_step(ac, samldb_add_entry);
if (ret != LDB_SUCCESS) return ret;
+
} else if (strcmp(ac->type, "group") == 0) {
- ret = samdb_find_or_add_attribute(ldb, ac->msg,
- "groupType", "-2147483646");
+ /* check if we have a valid sAMAccountName */
+ ret = samldb_add_step(ac, samldb_check_sAMAccountName);
+ if (ret != LDB_SUCCESS) return ret;
+
+ ret = samldb_add_step(ac, samldb_add_entry);
if (ret != LDB_SUCCESS) return ret;
+
} else if (strcmp(ac->type, "classSchema") == 0) {
const struct ldb_val *rdn_value, *def_obj_cat_val;
@@ -675,7 +558,6 @@ static int samldb_fill_object(struct samldb_ctx *ac)
return LDB_ERR_UNWILLING_TO_PERFORM;
}
-
rdn_value = ldb_dn_get_rdn_val(ac->msg->dn);
if (!ldb_msg_find_element(ac->msg, "lDAPDisplayName")) {
/* the RDN has prefix "CN" */
@@ -738,7 +620,6 @@ static int samldb_fill_object(struct samldb_ctx *ac)
ret = samldb_add_step(ac, samldb_find_for_defaultObjectCategory);
if (ret != LDB_SUCCESS) return ret;
- return samldb_first_step(ac);
} else if (strcmp(ac->type, "attributeSchema") == 0) {
const struct ldb_val *rdn_value;
rdn_value = ldb_dn_get_rdn_val(ac->msg->dn);
@@ -783,59 +664,12 @@ static int samldb_fill_object(struct samldb_ctx *ac)
ret = samldb_add_step(ac, samldb_add_entry);
if (ret != LDB_SUCCESS) return ret;
- return samldb_first_step(ac);
} else {
ldb_asprintf_errstring(ldb,
"Invalid entry type!");
return LDB_ERR_OPERATIONS_ERROR;
}
- rodc_control = ldb_request_get_control(ac->req, LDB_CONTROL_RODC_DCPROMO_OID);
- if (rodc_control) {
- /* see [MS-ADTS] 3.1.1.3.4.1.23 LDAP_SERVER_RODC_DCPROMO_OID */
- rodc_control->critical = false;
- ret = samldb_add_step(ac, samldb_rodc_add);
- if (ret != LDB_SUCCESS) return ret;
- }
-
- /* check if we have a valid sAMAccountName */
- ret = samldb_add_step(ac, samldb_check_sAMAccountName);
- if (ret != LDB_SUCCESS) return ret;
-
- /* check account_type/group_type */
- ret = samldb_add_step(ac, samldb_check_sAMAccountType);
- if (ret != LDB_SUCCESS) return ret;
-
- /* check if we have a valid primary group ID */
- if (strcmp(ac->type, "user") == 0) {
- ret = samldb_add_step(ac, samldb_check_primaryGroupID);
- if (ret != LDB_SUCCESS) return ret;
- }
-
- lp_ctx = talloc_get_type(ldb_get_opaque(ldb, "loadparm"),
- struct loadparm_context);
-
- /* don't allow objectSid to be specified without the RELAX control */
- sid = samdb_result_dom_sid(ac, ac->msg, "objectSid");
- if (sid && !ldb_request_get_control(ac->req, LDB_CONTROL_RELAX_OID) &&
- !dsdb_module_am_system(ac->module)) {
- ldb_asprintf_errstring(ldb, "No SID may be specified in user/group creation for %s",
- ldb_dn_get_linearized(ac->msg->dn));
- return LDB_ERR_UNWILLING_TO_PERFORM;
- }
-
- if (sid == NULL) {
- sid_generator = lpcfg_sid_generator(lp_ctx);
- if (sid_generator == SID_GENERATOR_INTERNAL) {
- ret = samldb_add_step(ac, samldb_allocate_sid);
- if (ret != LDB_SUCCESS) return ret;
- }
- }
-
- /* finally proceed with adding the entry */
- ret = samldb_add_step(ac, samldb_add_entry);
- if (ret != LDB_SUCCESS) return ret;
-
return samldb_first_step(ac);
}
@@ -907,10 +741,239 @@ static int samldb_schema_info_update(struct samldb_ctx *ac)
return LDB_SUCCESS;
}
+/*
+ * "Objectclass" trigger (MS-SAMR 3.1.1.8.1)
+ *
+ * Has to be invoked on "add" and "modify" operations on "user", "computer" and
+ * "group" objects.
+ * ac->msg contains the "add"/"modify" message
+ * ac->type contains the object type (main objectclass)
+ */
+static int samldb_objectclass_trigger(struct samldb_ctx *ac)
+{
+ struct ldb_context *ldb = ldb_module_get_ctx(ac->module);
+ struct loadparm_context *lp_ctx = talloc_get_type(ldb_get_opaque(ldb,
+ "loadparm"), struct loadparm_context);
+ struct ldb_message_element *el, *el2;
+ enum sid_generator sid_generator;
+ struct dom_sid *sid;
+ int ret;
+
+ /* make sure that "sAMAccountType" is not specified */
+ el = ldb_msg_find_element(ac->msg, "sAMAccountType");
+ if (el != NULL) {
+ ldb_set_errstring(ldb,
+ "samldb: sAMAccountType must not be specified!");
+ return LDB_ERR_UNWILLING_TO_PERFORM;
+ }
+
+ /* Step 1: objectSid assignment */
+
+ /* Don't allow the objectSid to be changed. But beside the RELAX
+ * control we have also to guarantee that it can always be set with
+ * SYSTEM permissions. This is needed for the "samba3sam" backend. */
+ sid = samdb_result_dom_sid(ac, ac->msg, "objectSid");
+ if ((sid != NULL) && (!dsdb_module_am_system(ac->module)) &&
+ (ldb_request_get_control(ac->req, LDB_CONTROL_RELAX_OID) == NULL)) {
+ ldb_asprintf_errstring(ldb, "No SID may be specified in user/group modifications for %s",
+ ldb_dn_get_linearized(ac->msg->dn));
+ return LDB_ERR_UNWILLING_TO_PERFORM;
+ }
+
+ /* but generate a new SID when we do have an add operations */
+ if ((sid == NULL) && (ac->req->operation == LDB_ADD)) {
+ sid_generator = lpcfg_sid_generator(lp_ctx);
+ if (sid_generator == SID_GENERATOR_INTERNAL) {
+ ret = samldb_add_step(ac, samldb_allocate_sid);
+ if (ret != LDB_SUCCESS) return ret;
+ }
+ }
+
+ if (strcmp(ac->type, "user") == 0) {
+ /* Step 1.2: Default values */
+ ret = samdb_find_or_add_attribute(ldb, ac->msg,
+ "userAccountControl",
+ talloc_asprintf(ac->msg, "%u", UF_NORMAL_ACCOUNT));
+ if (ret != LDB_SUCCESS) return ret;
+ ret = samdb_find_or_add_attribute(ldb, ac->msg,
+ "badPwdCount", "0");
+ if (ret != LDB_SUCCESS) return ret;
+ ret = samdb_find_or_add_attribute(ldb, ac->msg,
+ "codePage", "0");
+ if (ret != LDB_SUCCESS) return ret;
+ ret = samdb_find_or_add_attribute(ldb, ac->msg,
+ "countryCode", "0");
+ if (ret != LDB_SUCCESS) return ret;
+ ret = samdb_find_or_add_attribute(ldb, ac->msg,
+ "badPasswordTime", "0");
+ if (ret != LDB_SUCCESS) return ret;
+ ret = samdb_find_or_add_attribute(ldb, ac->msg,
+ "lastLogoff", "0");
+ if (ret != LDB_SUCCESS) return ret;
+ ret = samdb_find_or_add_attribute(ldb, ac->msg,
+ "lastLogon", "0");
+ if (ret != LDB_SUCCESS) return ret;
+ ret = samdb_find_or_add_attribute(ldb, ac->msg,
+ "pwdLastSet", "0");
+ if (ret != LDB_SUCCESS) return ret;
+ ret = samdb_find_or_add_attribute(ldb, ac->msg,
+ "accountExpires", "9223372036854775807");
+ if (ret != LDB_SUCCESS) return ret;
+ ret = samdb_find_or_add_attribute(ldb, ac->msg,
+ "logonCount", "0");
+ if (ret != LDB_SUCCESS) return ret;
+
+ el = ldb_msg_find_element(ac->msg, "userAccountControl");
+ if (el != NULL) {
+ uint32_t user_account_control, account_type;
+
+ /* Step 1.3: "userAccountControl" -> "sAMAccountType" mapping */
+ user_account_control = strtoul((const char *)el->values[0].data,
+ NULL, 0);
+ account_type = ds_uf2atype(user_account_control);
+ if (account_type == 0) {
+ ldb_set_errstring(ldb, "samldb: Unrecognized account type!");
+ return LDB_ERR_UNWILLING_TO_PERFORM;
+ }
+ ret = samdb_msg_add_uint(ldb, ac->msg, ac->msg,
+ "sAMAccountType",
+ account_type);
+ if (ret != LDB_SUCCESS) {
+ return ret;
+ }
+ el2 = ldb_msg_find_element(ac->msg, "sAMAccountType");
+ el2->flags = LDB_FLAG_MOD_REPLACE;
+
+ if (user_account_control &
+ (UF_SERVER_TRUST_ACCOUNT | UF_PARTIAL_SECRETS_ACCOUNT)) {
+ ret = samdb_msg_set_string(ldb, ac->msg, ac->msg,
+ "isCriticalSystemObject",
+ "TRUE");
+ if (ret != LDB_SUCCESS) {
+ return ret;
+ }
+ el2 = ldb_msg_find_element(ac->msg,
+ "isCriticalSystemObject");
+ el2->flags = LDB_FLAG_MOD_REPLACE;
+ }
+
+ /* Step 1.4: "userAccountControl" -> "primaryGroupID" mapping */
+ if (!ldb_msg_find_element(ac->msg, "primaryGroupID")) {
+ uint32_t rid = ds_uf2prim_group_rid(user_account_control);
+ ret = samdb_msg_add_uint(ldb, ac->msg, ac->msg,
+ "primaryGroupID", rid);
+ if (ret != LDB_SUCCESS) {
+ return ret;
+ }
+ el2 = ldb_msg_find_element(ac->msg,
+ "primaryGroupID");
+ el2->flags = LDB_FLAG_MOD_REPLACE;
+ }
+
+ /* Step 1.5: Add additional flags when needed */
+ if ((user_account_control & UF_NORMAL_ACCOUNT) &&
+ (ldb_request_get_control(ac->req, LDB_CONTROL_RELAX_OID) == NULL)) {
+ user_account_control |= UF_ACCOUNTDISABLE;
+ user_account_control |= UF_PASSWD_NOTREQD;
+
+ ret = samdb_msg_set_uint(ldb, ac->msg, ac->msg,
+ "userAccountControl",
+ user_account_control);
+ if (ret != LDB_SUCCESS) {
+ return ret;
+ }
+ }
+ }
+
+ } else if (strcmp(ac->type, "group") == 0) {
+ /* Step 2.2: Default values */
+ ret = samdb_find_or_add_attribute(ldb, ac->msg,
+ "groupType",
+ talloc_asprintf(ac->msg, "%u", GTYPE_SECURITY_GLOBAL_GROUP));
+ if (ret != LDB_SUCCESS) return ret;
+
+ /* Step 2.3: "groupType" -> "sAMAccountType" */
+ el = ldb_msg_find_element(ac->msg, "groupType");
+ if (el != NULL) {
+ uint32_t group_type, account_type;
+
+ group_type = strtoul((const char *)el->values[0].data,
+ NULL, 0);
+
+ /* The creation of builtin groups requires the
+ * RELAX control */
+ if (group_type == GTYPE_SECURITY_BUILTIN_LOCAL_GROUP) {
+ if (ldb_request_get_control(ac->req,
+ LDB_CONTROL_RELAX_OID) == NULL) {
+ return LDB_ERR_UNWILLING_TO_PERFORM;
+ }
+ }
+
+ account_type = ds_gtype2atype(group_type);
+ if (account_type == 0) {
+ ldb_set_errstring(ldb, "samldb: Unrecognized account type!");
+ return LDB_ERR_UNWILLING_TO_PERFORM;
+ }
+ ret = samdb_msg_add_uint(ldb, ac->msg, ac->msg,
+ "sAMAccountType",
+ account_type);
+ if (ret != LDB_SUCCESS) {
+ return ret;
+ }
+ el2 = ldb_msg_find_element(ac->msg, "sAMAccountType");
+ el2->flags = LDB_FLAG_MOD_REPLACE;
+ }
+ }
+
+ return LDB_SUCCESS;
+}
+
+/*
+ * "Primary group ID" trigger (MS-SAMR 3.1.1.8.2)
+ *
+ * Has to be invoked on "add" and "modify" operations on "user" and "computer"
+ * objects.
+ * ac->msg contains the "add"/"modify" message
+ */
+
+static int samldb_prim_group_set(struct samldb_ctx *ac)
+{
+ struct ldb_context *ldb = ldb_module_get_ctx(ac->module);
+ struct ldb_dn *prim_group_dn;
+ uint32_t rid;
+ struct dom_sid *sid;
+
+ rid = samdb_result_uint(ac->msg, "primaryGroupID", (uint32_t) -1);
+ if (rid == (uint32_t) -1) {
+ /* we aren't affected of any primary group set */
+ return LDB_SUCCESS;
+
+ } else if (!ldb_request_get_control(ac->req, LDB_CONTROL_RELAX_OID)) {
+ ldb_set_errstring(ldb,
+ "The primary group isn't settable on add operations!");
+ return LDB_ERR_UNWILLING_TO_PERFORM;
+ }
+
+ sid = dom_sid_add_rid(ac, samdb_domain_sid(ldb), rid);
+ if (sid == NULL) {
--
Samba Shared Repository
More information about the samba-cvs
mailing list