diff options
| author | Volker Lendecke <vl@samba.org> | 2010-09-08 16:58:21 -0700 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-09-09 06:19:23 +0200 |
| commit | 4e4228bd5d970350516162cc716ec2e083ead56f (patch) | |
| tree | 88c46bdbe8ebcc660ab66b5d78a80dbac6addc9e | |
| parent | 7372a50a0333b362745c89b7f0c17f77db156dec (diff) | |
| download | samba-4e4228bd5d970350516162cc716ec2e083ead56f.tar.gz samba-4e4228bd5d970350516162cc716ec2e083ead56f.tar.bz2 samba-4e4228bd5d970350516162cc716ec2e083ead56f.zip | |
s3: Remove unused arg "user_sid" from winbindd_store_creds
All callers have passed in NULL
| -rw-r--r-- | source3/winbindd/winbindd_creds.c | 11 | ||||
| -rw-r--r-- | source3/winbindd/winbindd_pam.c | 2 | ||||
| -rw-r--r-- | source3/winbindd/winbindd_proto.h | 3 |
3 files changed, 5 insertions, 11 deletions
diff --git a/source3/winbindd/winbindd_creds.c b/source3/winbindd/winbindd_creds.c index 39968ce46e..11dbfed6ba 100644 --- a/source3/winbindd/winbindd_creds.c +++ b/source3/winbindd/winbindd_creds.c @@ -57,8 +57,7 @@ NTSTATUS winbindd_store_creds(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx, const char *user, const char *pass, - struct netr_SamInfo3 *info3, - const struct dom_sid *user_sid) + struct netr_SamInfo3 *info3) { NTSTATUS status; uchar nt_pass[NT_HASH_LEN]; @@ -70,10 +69,6 @@ NTSTATUS winbindd_store_creds(struct winbindd_domain *domain, info3->base.rid); info3->base.user_flags |= NETLOGON_CACHED_ACCOUNT; - } else if (user_sid != NULL) { - - sid_copy(&cred_sid, user_sid); - } else if (user != NULL) { /* do lookup ourself */ @@ -139,7 +134,7 @@ NTSTATUS winbindd_update_creds_by_info3(struct winbindd_domain *domain, const char *pass, struct netr_SamInfo3 *info3) { - return winbindd_store_creds(domain, mem_ctx, user, pass, info3, NULL); + return winbindd_store_creds(domain, mem_ctx, user, pass, info3); } NTSTATUS winbindd_update_creds_by_name(struct winbindd_domain *domain, @@ -147,7 +142,7 @@ NTSTATUS winbindd_update_creds_by_name(struct winbindd_domain *domain, const char *user, const char *pass) { - return winbindd_store_creds(domain, mem_ctx, user, pass, NULL, NULL); + return winbindd_store_creds(domain, mem_ctx, user, pass, NULL); } diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c index 86d9e6d0c3..5576417850 100644 --- a/source3/winbindd/winbindd_pam.c +++ b/source3/winbindd/winbindd_pam.c @@ -1624,7 +1624,7 @@ process_result: state->mem_ctx, state->request->data.auth.user, state->request->data.auth.pass, - info3, NULL); + info3); } } diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h index 9ea2369fc4..4e21b6558f 100644 --- a/source3/winbindd/winbindd_proto.h +++ b/source3/winbindd/winbindd_proto.h @@ -234,8 +234,7 @@ NTSTATUS winbindd_store_creds(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx, const char *user, const char *pass, - struct netr_SamInfo3 *info3, - const struct dom_sid *user_sid); + struct netr_SamInfo3 *info3); NTSTATUS winbindd_update_creds_by_info3(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx, const char *user, |