diff options
| author | Volker Lendecke <vl@samba.org> | 2010-09-08 19:03:15 -0700 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-09-09 06:19:24 +0200 |
| commit | d38e1d13eab1a8d8aa8c660a40f6803aa62c3d68 (patch) | |
| tree | 8ae2597708fbe88415fbe33eec51bf4c136bc616 | |
| parent | c7d6e6f57174a684c5b84b31993b1d92311d4b80 (diff) | |
| download | samba-d38e1d13eab1a8d8aa8c660a40f6803aa62c3d68.tar.gz samba-d38e1d13eab1a8d8aa8c660a40f6803aa62c3d68.tar.xz samba-d38e1d13eab1a8d8aa8c660a40f6803aa62c3d68.zip | |
s3: Remove "mem_ctx" from lookup_cached_name()
| -rw-r--r-- | source3/winbindd/winbindd_cache.c | 3 | ||||
| -rw-r--r-- | source3/winbindd/winbindd_creds.c | 3 | ||||
| -rw-r--r-- | source3/winbindd/winbindd_pam.c | 3 | ||||
| -rw-r--r-- | source3/winbindd/winbindd_proto.h | 3 |
4 files changed, 4 insertions, 8 deletions
diff --git a/source3/winbindd/winbindd_cache.c b/source3/winbindd/winbindd_cache.c index 5d12c2b3bc2..d0f0e9b42f5 100644 --- a/source3/winbindd/winbindd_cache.c +++ b/source3/winbindd/winbindd_cache.c @@ -3194,8 +3194,7 @@ bool lookup_cached_sid(TALLOC_CTX *mem_ctx, const struct dom_sid *sid, return NT_STATUS_IS_OK(status); } -bool lookup_cached_name(TALLOC_CTX *mem_ctx, - const char *domain_name, +bool lookup_cached_name(const char *domain_name, const char *name, struct dom_sid *sid, enum lsa_SidType *type) diff --git a/source3/winbindd/winbindd_creds.c b/source3/winbindd/winbindd_creds.c index 11dbfed6ba8..c4a700b70dd 100644 --- a/source3/winbindd/winbindd_creds.c +++ b/source3/winbindd/winbindd_creds.c @@ -75,8 +75,7 @@ NTSTATUS winbindd_store_creds(struct winbindd_domain *domain, enum lsa_SidType type; - if (!lookup_cached_name(mem_ctx, - domain->name, + if (!lookup_cached_name(domain->name, user, &cred_sid, &type)) { diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c index 48df304f875..c162cc6feb6 100644 --- a/source3/winbindd/winbindd_pam.c +++ b/source3/winbindd/winbindd_pam.c @@ -838,8 +838,7 @@ static NTSTATUS winbindd_dual_pam_auth_cached(struct winbindd_domain *domain, parse_domain_user(state->request->data.auth.user, name_domain, name_user); - if (!lookup_cached_name(state->mem_ctx, - name_domain, + if (!lookup_cached_name(name_domain, name_user, &sid, &type)) { diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h index 4e21b6558f4..bc703a8775f 100644 --- a/source3/winbindd/winbindd_proto.h +++ b/source3/winbindd/winbindd_proto.h @@ -115,8 +115,7 @@ NTSTATUS wcache_lookup_groupmem(struct winbindd_domain *domain, bool lookup_cached_sid(TALLOC_CTX *mem_ctx, const struct dom_sid *sid, char **domain_name, char **name, enum lsa_SidType *type); -bool lookup_cached_name(TALLOC_CTX *mem_ctx, - const char *domain_name, +bool lookup_cached_name(const char *domain_name, const char *name, struct dom_sid *sid, enum lsa_SidType *type); |