summaryrefslogtreecommitdiff
path: root/source3/winbindd
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2007-12-15 21:10:58 +0100
committerVolker Lendecke <vl@samba.org>2007-12-15 22:09:35 +0100
commit105635e23c5c77c5efed727bbc686650406ab82e (patch)
tree694d5f9b7599dd208b74331652f59497d8716ff0 /source3/winbindd
parent2cb7f5f632fc3c30c0afa57d1c99f506885f113a (diff)
downloadsamba-105635e23c5c77c5efed727bbc686650406ab82e.tar.gz
samba-105635e23c5c77c5efed727bbc686650406ab82e.tar.bz2
samba-105635e23c5c77c5efed727bbc686650406ab82e.zip
Use sid_string_talloc where we have a tmp talloc ctx
(This used to be commit f00ab810d2540679bec109498ac89e1eafe18f03)
Diffstat (limited to 'source3/winbindd')
-rw-r--r--source3/winbindd/idmap_ldap.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/source3/winbindd/idmap_ldap.c b/source3/winbindd/idmap_ldap.c
index a980d54bbe..17e9eefe43 100644
--- a/source3/winbindd/idmap_ldap.c
+++ b/source3/winbindd/idmap_ldap.c
@@ -1166,7 +1166,7 @@ static NTSTATUS idmap_ldap_sids_to_unixids(struct idmap_domain *dom,
filter = talloc_asprintf(memctx, "(&(objectClass=%s)(%s=%s))",
LDAP_OBJ_IDMAP_ENTRY,
LDAP_ATTRIBUTE_SID,
- sid_string_static(ids[0]->sid));
+ sid_string_talloc(memctx, ids[0]->sid));
CHECK_ALLOC_DONE(filter);
DEBUG(10, ("Filter: [%s]\n", filter));
} else {
@@ -1187,7 +1187,8 @@ again:
for (i = 0; (i < IDMAP_LDAP_MAX_IDS) && ids[idx]; i++, idx++) {
filter = talloc_asprintf_append_buffer(filter, "(%s=%s)",
LDAP_ATTRIBUTE_SID,
- sid_string_static(ids[idx]->sid));
+ sid_string_talloc(memctx,
+ ids[idx]->sid));
CHECK_ALLOC_DONE(filter);
}
filter = talloc_asprintf_append_buffer(filter, "))");
@@ -1385,7 +1386,7 @@ static NTSTATUS idmap_ldap_set_mapping(struct idmap_domain *dom,
id_str = talloc_asprintf(memctx, "%lu", (unsigned long)map->xid.id);
CHECK_ALLOC_DONE(id_str);
- sid = talloc_strdup(memctx, sid_string_static(map->sid));
+ sid = talloc_strdup(memctx, sid_string_talloc(memctx, map->sid));
CHECK_ALLOC_DONE(sid);
dn = talloc_asprintf(memctx, "%s=%s,%s",