diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-03-14 12:32:07 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-03-14 12:32:07 +1100 |
| commit | de9b3af624833be8f5c3520d5ac99fba14b8032f (patch) | |
| tree | 33e131937ab09a217ecd534f7c64a9dce4029ebf | |
| parent | 9a6422b6954242e5298653eef0d12a584f0d2811 (diff) | |
| download | samba-de9b3af624833be8f5c3520d5ac99fba14b8032f.tar.gz samba-de9b3af624833be8f5c3520d5ac99fba14b8032f.tar.bz2 samba-de9b3af624833be8f5c3520d5ac99fba14b8032f.zip | |
Allow more 'domain' objects when looking for a unqiue SID.
Andrew Bartlett
(This used to be commit db3b5f16ec8d9b83d8a82a535a4847dce5923663)
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/samldb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c index 905cd4a995..5407db9956 100644 --- a/source4/dsdb/samdb/ldb_modules/samldb.c +++ b/source4/dsdb/samdb/ldb_modules/samldb.c @@ -293,7 +293,7 @@ int samldb_notice_sid(struct ldb_module *module, /* find the domain DN */ ret = ldb_search_exp_fmt(module->ldb, mem_ctx, &dom_res, NULL, LDB_SCOPE_SUBTREE, attrs, - "(&(objectSid=%s)(objectclass=domain))", + "(&(objectSid=%s)(|(|(objectClass=domain)(objectClass=builtinDomain))(objectClass=samba4LocalDomain)))", ldap_encode_ndr_dom_sid(mem_ctx, dom_sid)); if (ret == LDB_SUCCESS) { if (dom_res->count == 0) { @@ -369,7 +369,7 @@ static int samldb_generate_samAccountName(struct ldb_module *module, TALLOC_CTX /* Format: $000000-000000000000 */ do { - *name = talloc_asprintf(mem_ctx, "$%.6X-%.6X%.6X", (unsigned int)random(), (unsigned int)random(), (unsigned int)random()); + *name = talloc_asprintf(mem_ctx, "$%.6X-%.6X%.6X", (unsigned int)generate_random(), (unsigned int)generate_random(), (unsigned int)generate_random()); /* TODO: Figure out exactly what this is meant to conflict with */ ret = ldb_search_exp_fmt(module->ldb, mem_ctx, &res, dom_dn, LDB_SCOPE_SUBTREE, attrs, |