From 88bc0a25ff3c4bd71563c2d89d768e5dac4c52bf Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Tue, 8 Mar 2011 14:23:15 +0100 Subject: [PATCH] s3: Make parse_sidlist public Signed-off-by: Jeremy Allison --- source3/winbindd/winbindd_getsidaliases.c | 34 ------------------------------- source3/winbindd/winbindd_proto.h | 2 ++ source3/winbindd/winbindd_util.c | 31 ++++++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 34 deletions(-) diff --git a/source3/winbindd/winbindd_getsidaliases.c b/source3/winbindd/winbindd_getsidaliases.c index a90bfb31d43..f01dac9c4ce 100644 --- a/source3/winbindd/winbindd_getsidaliases.c +++ b/source3/winbindd/winbindd_getsidaliases.c @@ -27,9 +27,6 @@ struct winbindd_getsidaliases_state { uint32_t *aliases; }; -static bool parse_sidlist(TALLOC_CTX *mem_ctx, const char *sidstr, - struct dom_sid **sids, uint32_t *num_sids); - static void winbindd_getsidaliases_done(struct tevent_req *subreq); struct tevent_req *winbindd_getsidaliases_send(TALLOC_CTX *mem_ctx, @@ -155,34 +152,3 @@ NTSTATUS winbindd_getsidaliases_recv(struct tevent_req *req, response->data.num_entries = state->num_aliases; return NT_STATUS_OK; } - -static bool parse_sidlist(TALLOC_CTX *mem_ctx, const char *sidstr, - struct dom_sid **sids, uint32_t *num_sids) -{ - const char *p; - - p = sidstr; - if (p == NULL) - return False; - - while (p[0] != '\0') { - struct dom_sid sid; - const char *q = NULL; - - if (!dom_sid_parse_endp(p, &sid, &q)) { - DEBUG(1, ("Could not parse sid %s\n", p)); - return false; - } - if ((q == NULL) || (q[0] != '\n')) { - DEBUG(1, ("Got invalid sidstr: %s\n", p)); - return false; - } - if (!NT_STATUS_IS_OK(add_sid_to_array(mem_ctx, &sid, sids, - num_sids))) - { - return False; - } - p = q+1; - } - return True; -} diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h index a9d5659f98f..a5b4a646432 100644 --- a/source3/winbindd/winbindd_proto.h +++ b/source3/winbindd/winbindd_proto.h @@ -424,6 +424,8 @@ void winbindd_set_locator_kdc_envs(const struct winbindd_domain *domain); void winbindd_unset_locator_kdc_env(const struct winbindd_domain *domain); void set_auth_errors(struct winbindd_response *resp, NTSTATUS result); bool is_domain_offline(const struct winbindd_domain *domain); +bool parse_sidlist(TALLOC_CTX *mem_ctx, const char *sidstr, + struct dom_sid **sids, uint32_t *num_sids); /* The following definitions come from winbindd/winbindd_wins.c */ diff --git a/source3/winbindd/winbindd_util.c b/source3/winbindd/winbindd_util.c index 1a6cf8722e5..b43d7b826f5 100644 --- a/source3/winbindd/winbindd_util.c +++ b/source3/winbindd/winbindd_util.c @@ -1370,3 +1370,34 @@ bool is_domain_offline(const struct winbindd_domain *domain) } return !domain->online; } + +bool parse_sidlist(TALLOC_CTX *mem_ctx, const char *sidstr, + struct dom_sid **sids, uint32_t *num_sids) +{ + const char *p; + + p = sidstr; + if (p == NULL) + return False; + + while (p[0] != '\0') { + struct dom_sid sid; + const char *q = NULL; + + if (!dom_sid_parse_endp(p, &sid, &q)) { + DEBUG(1, ("Could not parse sid %s\n", p)); + return false; + } + if ((q == NULL) || (q[0] != '\n')) { + DEBUG(1, ("Got invalid sidstr: %s\n", p)); + return false; + } + if (!NT_STATUS_IS_OK(add_sid_to_array(mem_ctx, &sid, sids, + num_sids))) + { + return False; + } + p = q+1; + } + return True; +} -- 2.11.4.GIT