The branch, v3-6-test has been updated
via 5c19b41 s3:idmap_ldap: allow creation of ldap stored mappings for
explicitly configured domains.
via 4a40ad0 s3:idmap_ldap: rename idmap_ldap_get_new_id to
idmap_ldap_allocate_id
via bf75cac s3:idmap_ldap: rename idmap_ldap_allocate_id to
idmap_ldap_allocate_id_internal
from 5b5ef7f Fix bug #8203 - winbindd needs to reset the DC connection
if an RPC times out.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit 5c19b41e2b844fddbb88fea8b7cd16bc0e830cfd
Author: Michael Adam <[email protected]>
Date: Wed Jun 1 00:30:11 2011 +0200
s3:idmap_ldap: allow creation of ldap stored mappings for explicitly
configured domains.
After the preparations, this is achieved by using
idmap_ldap_allocate_id_internal()
as get_new_id rw method instead of idmap_ldap_allocate_id().
(cherry picked from commit 74cd06b3dff42bda4dd0a0f3fd250a975d0258ed)
The last 3 patches address bug #8200 (Add Support for multiple writable ldap
idmap domains).
commit 4a40ad004896ce30a997b5142fa73b50ab2762f3
Author: Michael Adam <[email protected]>
Date: Wed Jun 1 00:25:23 2011 +0200
s3:idmap_ldap: rename idmap_ldap_get_new_id to idmap_ldap_allocate_id
This is in preparation of allowing allocating ldap based domain-specific
configs.
(cherry picked from commit dea3ef1ab689a3d01846147d2a83377b09335f8f)
commit bf75cacae075a503c08d60f04e2a858271d8b923
Author: Michael Adam <[email protected]>
Date: Wed Jun 1 00:25:23 2011 +0200
s3:idmap_ldap: rename idmap_ldap_allocate_id to
idmap_ldap_allocate_id_internal
This is in preparation of allowing allocating ldap based domain-specific
configs.
(cherry picked from commit 2de65b97b98e2c8cc218b60da749ac17195d8413)
-----------------------------------------------------------------------
Summary of changes:
source3/winbindd/idmap_ldap.c | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/idmap_ldap.c b/source3/winbindd/idmap_ldap.c
index 7195912..a9cb4fc 100644
--- a/source3/winbindd/idmap_ldap.c
+++ b/source3/winbindd/idmap_ldap.c
@@ -232,8 +232,8 @@ done:
Allocate a new uid or gid
********************************/
-static NTSTATUS idmap_ldap_allocate_id(struct idmap_domain *dom,
- struct unixid *xid)
+static NTSTATUS idmap_ldap_allocate_id_internal(struct idmap_domain *dom,
+ struct unixid *xid)
{
TALLOC_CTX *mem_ctx;
NTSTATUS ret = NT_STATUS_UNSUCCESSFUL;
@@ -391,21 +391,21 @@ done:
* For now this is for the default idmap domain only.
* Should be extended later on.
*/
-static NTSTATUS idmap_ldap_get_new_id(struct idmap_domain *dom,
- struct unixid *id)
+static NTSTATUS idmap_ldap_allocate_id(struct idmap_domain *dom,
+ struct unixid *id)
{
NTSTATUS ret;
if (!strequal(dom->name, "*")) {
- DEBUG(3, ("idmap_ldap_get_new_id: "
+ DEBUG(3, ("idmap_ldap_allocate_id: "
"Refusing allocation of a new unixid for domain'%s'. "
- "Currently only supported for the default "
+ "This is only supported for the default "
"domain \"*\".\n",
dom->name));
return NT_STATUS_NOT_IMPLEMENTED;
}
- ret = idmap_ldap_allocate_id(dom, id);
+ ret = idmap_ldap_allocate_id_internal(dom, id);
return ret;
}
@@ -484,7 +484,7 @@ static NTSTATUS idmap_ldap_db_init(struct idmap_domain *dom)
ctx->rw_ops = talloc_zero(ctx, struct idmap_rw_ops);
CHECK_ALLOC_DONE(ctx->rw_ops);
- ctx->rw_ops->get_new_id = idmap_ldap_get_new_id;
+ ctx->rw_ops->get_new_id = idmap_ldap_allocate_id_internal;
ctx->rw_ops->set_mapping = idmap_ldap_set_mapping;
ret = smbldap_init(ctx, winbind_event_context(), ctx->url,
@@ -1144,7 +1144,7 @@ static struct idmap_methods idmap_ldap_methods = {
.init = idmap_ldap_db_init,
.unixids_to_sids = idmap_ldap_unixids_to_sids,
.sids_to_unixids = idmap_ldap_sids_to_unixids,
- .allocate_id = idmap_ldap_get_new_id,
+ .allocate_id = idmap_ldap_allocate_id,
};
NTSTATUS idmap_ldap_init(void);
--
Samba Shared Repository
