diff options
| author | Volker Lendecke <vl@samba.org> | 2009-08-02 17:17:27 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2009-08-05 03:21:24 -0400 |
| commit | f09a95aaff4542df4225f3828a0d737497f0f2e8 (patch) | |
| tree | 0daccb0969e18de81ff4227ca34e9e045586a841 | |
| parent | ff3ce9016a43906df55a0922f0697c91d255de88 (diff) | |
| download | samba-f09a95aaff4542df4225f3828a0d737497f0f2e8.tar.gz samba-f09a95aaff4542df4225f3828a0d737497f0f2e8.tar.bz2 samba-f09a95aaff4542df4225f3828a0d737497f0f2e8.zip | |
s3:winbind: Make parse_sidlist take a const char *
| -rw-r--r-- | source3/winbindd/winbindd_async.c | 15 | ||||
| -rw-r--r-- | source3/winbindd/winbindd_proto.h | 2 |
2 files changed, 12 insertions, 5 deletions
diff --git a/source3/winbindd/winbindd_async.c b/source3/winbindd/winbindd_async.c index f53875f617..094602160d 100644 --- a/source3/winbindd/winbindd_async.c +++ b/source3/winbindd/winbindd_async.c @@ -632,25 +632,32 @@ bool print_sidlist(TALLOC_CTX *mem_ctx, const DOM_SID *sids, return True; } -bool parse_sidlist(TALLOC_CTX *mem_ctx, char *sidstr, +bool parse_sidlist(TALLOC_CTX *mem_ctx, const char *sidstr, DOM_SID **sids, size_t *num_sids) { - char *p, *q; + const char *p, *q; p = sidstr; if (p == NULL) return False; while (p[0] != '\0') { + fstring tmp; + size_t sidlen; DOM_SID sid; q = strchr(p, '\n'); if (q == NULL) { DEBUG(0, ("Got invalid sidstr: %s\n", p)); return False; } - *q = '\0'; + sidlen = PTR_DIFF(q, p); + if (sidlen >= sizeof(tmp)-1) { + return false; + } + memcpy(tmp, p, sidlen); + tmp[sidlen] = '\0'; q += 1; - if (!string_to_sid(&sid, p)) { + if (!string_to_sid(&sid, tmp)) { DEBUG(0, ("Could not parse sid %s\n", p)); return False; } diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h index 08c08222a6..2202537777 100644 --- a/source3/winbindd/winbindd_proto.h +++ b/source3/winbindd/winbindd_proto.h @@ -100,7 +100,7 @@ enum winbindd_result winbindd_dual_list_groups(struct winbindd_domain *domain, struct winbindd_cli_state *state); bool print_sidlist(TALLOC_CTX *mem_ctx, const DOM_SID *sids, size_t num_sids, char **result, ssize_t *len); -bool parse_sidlist(TALLOC_CTX *mem_ctx, char *sidstr, +bool parse_sidlist(TALLOC_CTX *mem_ctx, const char *sidstr, DOM_SID **sids, size_t *num_sids); enum winbindd_result winbindd_dual_lookuprids(struct winbindd_domain *domain, struct winbindd_cli_state *state); |