The branch, v4-0-test has been updated
via db3b5f16ec8d9b83d8a82a535a4847dce5923663 (commit)
from 353bb79f568f20c8469cb9458f7b14c24612ad23 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit db3b5f16ec8d9b83d8a82a535a4847dce5923663
Author: Andrew Bartlett <[EMAIL PROTECTED]>
Date: Fri Mar 14 12:32:07 2008 +1100
Allow more 'domain' objects when looking for a unqiue SID.
Andrew Bartlett
-----------------------------------------------------------------------
Summary of changes:
source/dsdb/samdb/ldb_modules/samldb.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/dsdb/samdb/ldb_modules/samldb.c
b/source/dsdb/samdb/ldb_modules/samldb.c
index 905cd4a..5407db9 100644
--- a/source/dsdb/samdb/ldb_modules/samldb.c
+++ b/source/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,
--
Samba Shared Repository
