diff options
| author | Michael Adam <obnox@samba.org> | 2008-11-26 15:16:22 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2008-12-11 10:27:08 +0100 |
| commit | 218b39b708535f3c2e60c24b073ff9676c28d1c8 (patch) | |
| tree | cce0e694db83f0f063dbac71ea33fa20757041af /source/winbindd/idmap_ad.c | |
| parent | b1a583adf7b49cfb4a7d301956093800b7022192 (diff) | |
| download | samba-218b39b708535f3c2e60c24b073ff9676c28d1c8.tar.gz samba-218b39b708535f3c2e60c24b073ff9676c28d1c8.tar.xz samba-218b39b708535f3c2e60c24b073ff9676c28d1c8.zip | |
winbindd/idmap_ad: rename ctx to mem_ctx in nss_ad_get_info()
in preparation to using the idmap_ad_context there
Michael
(cherry picked from commit 9c23d62f07867f4d94d822f0190c6479ffb7df24)
Diffstat (limited to 'source/winbindd/idmap_ad.c')
| -rw-r--r-- | source/winbindd/idmap_ad.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/winbindd/idmap_ad.c b/source/winbindd/idmap_ad.c index 0f2ac5127e4..170c1d954e3 100644 --- a/source/winbindd/idmap_ad.c +++ b/source/winbindd/idmap_ad.c @@ -725,7 +725,7 @@ static NTSTATUS nss_rfc2307_init( struct nss_domain_entry *e ) ***********************************************************************/ static NTSTATUS nss_ad_get_info( struct nss_domain_entry *e, const DOM_SID *sid, - TALLOC_CTX *ctx, + TALLOC_CTX *mem_ctx, ADS_STRUCT *ads, LDAPMessage *msg, char **homedir, @@ -766,9 +766,9 @@ static NTSTATUS nss_ad_get_info( struct nss_domain_entry *e, /* See if we can use the ADS connection struct swe were given */ if (ads) { - *homedir = ads_pull_string( ads, ctx, msg, ad_schema->posix_homedir_attr ); - *shell = ads_pull_string( ads, ctx, msg, ad_schema->posix_shell_attr ); - *gecos = ads_pull_string( ads, ctx, msg, ad_schema->posix_gecos_attr ); + *homedir = ads_pull_string( ads, mem_ctx, msg, ad_schema->posix_homedir_attr ); + *shell = ads_pull_string( ads, mem_ctx, msg, ad_schema->posix_shell_attr ); + *gecos = ads_pull_string( ads, mem_ctx, msg, ad_schema->posix_gecos_attr ); if (gid) { if ( !ads_pull_uint32(ads, msg, ad_schema->posix_gidnumber_attr, gid ) ) @@ -787,7 +787,7 @@ static NTSTATUS nss_ad_get_info( struct nss_domain_entry *e, attrs[3] = ad_schema->posix_gidnumber_attr; sidstr = sid_binstring(sid); - filter = talloc_asprintf(ctx, "(objectSid=%s)", sidstr); + filter = talloc_asprintf(mem_ctx, "(objectSid=%s)", sidstr); SAFE_FREE(sidstr); if (!filter) { @@ -801,9 +801,9 @@ static NTSTATUS nss_ad_get_info( struct nss_domain_entry *e, goto done; } - *homedir = ads_pull_string(ads_internal, ctx, msg_internal, ad_schema->posix_homedir_attr); - *shell = ads_pull_string(ads_internal, ctx, msg_internal, ad_schema->posix_shell_attr); - *gecos = ads_pull_string(ads_internal, ctx, msg_internal, ad_schema->posix_gecos_attr); + *homedir = ads_pull_string(ads_internal, mem_ctx, msg_internal, ad_schema->posix_homedir_attr); + *shell = ads_pull_string(ads_internal, mem_ctx, msg_internal, ad_schema->posix_shell_attr); + *gecos = ads_pull_string(ads_internal, mem_ctx, msg_internal, ad_schema->posix_gecos_attr); if (gid) { if (!ads_pull_uint32(ads_internal, msg_internal, ad_schema->posix_gidnumber_attr, gid)) |