diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2006-07-07 07:38:36 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:09:54 -0500 |
| commit | 0f215e99479cf75392a3a9f4ab7c3b2ef976f97d (patch) | |
| tree | d17e14e95ddc7bb3695e14d5ee20d567b2df7c69 /source4/dsdb/samdb | |
| parent | 6abc3e05b1bc191a411e334aa4c3d05bce14542e (diff) | |
| download | samba-0f215e99479cf75392a3a9f4ab7c3b2ef976f97d.tar.gz samba-0f215e99479cf75392a3a9f4ab7c3b2ef976f97d.tar.bz2 samba-0f215e99479cf75392a3a9f4ab7c3b2ef976f97d.zip | |
r16860: Fix (and reactivate) the RPC-SAMR test. We need to allow these sids
to be created as foreign, even if they are in a local domain.
Also we do need the user to exist for the life of the test, as we add
it to a group.
Andrew Bartlett
(This used to be commit ae470ff7014e52b55d88e9fe12e2322e069daf9d)
Diffstat (limited to 'source4/dsdb/samdb')
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/samldb.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c index b1fcaf4f02..81bfa32398 100644 --- a/source4/dsdb/samdb/ldb_modules/samldb.c +++ b/source4/dsdb/samdb/ldb_modules/samldb.c @@ -642,12 +642,10 @@ static int samldb_fill_foreignSecurityPrincipal_object(struct ldb_module *module "(&(objectSid=%s)(objectclass=domain))", ldap_encode_ndr_dom_sid(mem_ctx, dom_sid)); if (ret >= 1) { + /* We don't really like the idea of foreign sids that are not foreign, but it happens */ const char *name = samdb_result_string(dom_msgs[0], "name", NULL); - ldb_set_errstring(module->ldb, talloc_asprintf(mem_ctx, - "Attempt to add foreign SID record with SID %s rejected, because this domian (%s) is already in the database", - dom_sid_string(mem_ctx, sid), name)); - /* We don't really like the idea of foreign sids that are not foreign */ - return LDB_ERR_CONSTRAINT_VIOLATION; + ldb_debug(module->ldb, LDB_DEBUG_TRACE, "NOTE (strange but valid): Adding foreign SID record with SID %s, but this domian (%s) is already in the database", + dom_sid_string(mem_ctx, sid), name); } else if (ret == -1) { ldb_set_errstring(module->ldb, talloc_asprintf(mem_ctx, "samldb_fill_foreignSecurityPrincipal_object: error searching for a domain with this sid: %s\n", |