s3-auth Change type of num_sids to uint32_t
[samba.git] / source3 / winbindd / winbindd_async.c
index efdcbc1281d77efb38d5d8f3e84fc594b8a21b6d..4d5273127379996fc3380d49ca7d7f4e1f5ed7a9 100644 (file)
@@ -6,17 +6,6 @@
    Copyright (C) Volker Lendecke 2005
    Copyright (C) Gerald Carter 2006
 
-   The helpers always consist of three functions: 
-
-   * A request setup function that takes the necessary parameters together
-     with a continuation function that is to be called upon completion
-
-   * A private continuation function that is internal only. This is to be
-     called by the lower-level functions in do_async(). Its only task is to
-     properly call the continuation function named above.
-
-   * A worker function that is called inside the appropriate child process.
-
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
 
-struct do_async_state {
-       TALLOC_CTX *mem_ctx;
-       struct winbindd_request request;
-       struct winbindd_response response;
-       void (*cont)(TALLOC_CTX *mem_ctx,
-                    bool success,
-                    struct winbindd_response *response,
-                    void *c, void *private_data);
-       void *c, *private_data;
-};
-
-static void do_async_recv(void *private_data, bool success)
-{
-       struct do_async_state *state =
-               talloc_get_type_abort(private_data, struct do_async_state);
-
-       state->cont(state->mem_ctx, success, &state->response,
-                   state->c, state->private_data);
-}
-
-void do_async(TALLOC_CTX *mem_ctx, struct winbindd_child *child,
-             const struct winbindd_request *request,
-             void (*cont)(TALLOC_CTX *mem_ctx, bool success,
-                          struct winbindd_response *response,
-                          void *c, void *private_data),
-             void *c, void *private_data)
-{
-       struct do_async_state *state;
-
-       state = TALLOC_ZERO_P(mem_ctx, struct do_async_state);
-       if (state == NULL) {
-               DEBUG(0, ("talloc failed\n"));
-               cont(mem_ctx, False, NULL, c, private_data);
-               return;
-       }
-
-       state->mem_ctx = mem_ctx;
-       state->request = *request;
-       state->request.length = sizeof(state->request);
-       state->cont = cont;
-       state->c = c;
-       state->private_data = private_data;
-
-       async_request(mem_ctx, child, &state->request,
-                     &state->response, do_async_recv, state);
-}
-
-static void do_async_domain(TALLOC_CTX *mem_ctx, struct winbindd_domain *domain,
-                           const struct winbindd_request *request,
-                           void (*cont)(TALLOC_CTX *mem_ctx, bool success,
-                                        struct winbindd_response *response,
-                                        void *c, void *private_data),
-                           void *c, void *private_data)
-{
-       struct do_async_state *state;
-
-       state = TALLOC_ZERO_P(mem_ctx, struct do_async_state);
-       if (state == NULL) {
-               DEBUG(0, ("talloc failed\n"));
-               cont(mem_ctx, False, NULL, c, private_data);
-               return;
-       }
-
-       state->mem_ctx = mem_ctx;
-       state->request = *request;
-       state->request.length = sizeof(state->request);
-       state->cont = cont;
-       state->c = c;
-       state->private_data = private_data;
-
-       async_domain_request(mem_ctx, domain, &state->request,
-                            &state->response, do_async_recv, state);
-}
-
-enum winbindd_result winbindd_dual_lookupsid(struct winbindd_domain *domain,
-                                            struct winbindd_cli_state *state)
-{
-       enum lsa_SidType type;
-       DOM_SID sid;
-       char *name;
-       char *dom_name;
-
-       /* Ensure null termination */
-       state->request->data.sid[sizeof(state->request->data.sid)-1]='\0';
-
-       DEBUG(3, ("[%5lu]: lookupsid %s\n", (unsigned long)state->pid, 
-                 state->request->data.sid));
-
-       /* Lookup sid from PDC using lsa_lookup_sids() */
-
-       if (!string_to_sid(&sid, state->request->data.sid)) {
-               DEBUG(5, ("%s not a SID\n", state->request->data.sid));
-               return WINBINDD_ERROR;
-       }
-
-       /* Lookup the sid */
-
-       if (!winbindd_lookup_name_by_sid(state->mem_ctx, domain, &sid, 
-                                        &dom_name, &name, &type)) 
-       {
-               TALLOC_FREE(dom_name);
-               TALLOC_FREE(name);
-               return WINBINDD_ERROR;
-       }
-
-       fstrcpy(state->response->data.name.dom_name, dom_name);
-       fstrcpy(state->response->data.name.name, name);
-       state->response->data.name.type = type;
-
-       TALLOC_FREE(dom_name);
-       TALLOC_FREE(name);
-       return WINBINDD_OK;
-}
-
-enum winbindd_result winbindd_dual_lookupname(struct winbindd_domain *domain,
-                                             struct winbindd_cli_state *state)
-{
-       enum lsa_SidType type;
-       char *name_domain, *name_user;
-       DOM_SID sid;
-       char *p;
-
-       /* Ensure null termination */
-       state->request->data.name.dom_name[sizeof(state->request->data.name.dom_name)-1]='\0';
-
-       /* Ensure null termination */
-       state->request->data.name.name[sizeof(state->request->data.name.name)-1]='\0';
-
-       /* cope with the name being a fully qualified name */
-       p = strstr(state->request->data.name.name, lp_winbind_separator());
-       if (p) {
-               *p = 0;
-               name_domain = state->request->data.name.name;
-               name_user = p+1;
-       } else {
-               name_domain = state->request->data.name.dom_name;
-               name_user = state->request->data.name.name;
-       }
-
-       DEBUG(3, ("[%5lu]: lookupname %s%s%s\n", (unsigned long)state->pid,
-                 name_domain, lp_winbind_separator(), name_user));
-
-       /* Lookup name from DC using lsa_lookup_names() */
-       if (!winbindd_lookup_sid_by_name(state->mem_ctx, state->request->original_cmd, domain, name_domain,
-                                        name_user, &sid, &type)) {
-               return WINBINDD_ERROR;
-       }
-
-       sid_to_fstring(state->response->data.sid.sid, &sid);
-       state->response->data.sid.type = type;
-
-       return WINBINDD_OK;
-}
-
-bool print_sidlist(TALLOC_CTX *mem_ctx, const DOM_SID *sids,
-                  size_t num_sids, char **result, ssize_t *len)
+bool print_sidlist(TALLOC_CTX *mem_ctx, const struct dom_sid *sids,
+                  uint32_t num_sids, char **result, ssize_t *len)
 {
        size_t i;
        size_t buflen = 0;
@@ -213,7 +48,7 @@ bool print_sidlist(TALLOC_CTX *mem_ctx, const DOM_SID *sids,
 }
 
 bool parse_sidlist(TALLOC_CTX *mem_ctx, const char *sidstr,
-                  DOM_SID **sids, size_t *num_sids)
+                  struct dom_sid **sids, uint32_t *num_sids)
 {
        const char *p, *q;
 
@@ -224,7 +59,7 @@ bool parse_sidlist(TALLOC_CTX *mem_ctx, const char *sidstr,
        while (p[0] != '\0') {
                fstring tmp;
                size_t sidlen;
-               DOM_SID sid;
+               struct dom_sid sid;
                q = strchr(p, '\n');
                if (q == NULL) {
                        DEBUG(0, ("Got invalid sidstr: %s\n", p));
@@ -251,127 +86,6 @@ bool parse_sidlist(TALLOC_CTX *mem_ctx, const char *sidstr,
        return True;
 }
 
-static void getsidaliases_recv(TALLOC_CTX *mem_ctx, bool success,
-                              struct winbindd_response *response,
-                              void *c, void *private_data)
-{
-       void (*cont)(void *priv, bool succ,
-                    DOM_SID *aliases, size_t num_aliases) =
-               (void (*)(void *, bool, DOM_SID *, size_t))c;
-       char *aliases_str;
-       DOM_SID *sids = NULL;
-       size_t num_sids = 0;
-
-       if (!success) {
-               DEBUG(5, ("Could not trigger getsidaliases\n"));
-               cont(private_data, success, NULL, 0);
-               return;
-       }
-
-       if (response->result != WINBINDD_OK) {
-               DEBUG(5, ("getsidaliases returned an error\n"));
-               cont(private_data, False, NULL, 0);
-               return;
-       }
-
-       aliases_str = (char *)response->extra_data.data;
-
-       if (aliases_str == NULL) {
-               DEBUG(10, ("getsidaliases return 0 SIDs\n"));
-               cont(private_data, True, NULL, 0);
-               return;
-       }
-
-       if (!parse_sidlist(mem_ctx, aliases_str, &sids, &num_sids)) {
-               DEBUG(0, ("Could not parse sids\n"));
-               cont(private_data, False, NULL, 0);
-               return;
-       }
-
-       cont(private_data, True, sids, num_sids);
-}
-
-void winbindd_getsidaliases_async(struct winbindd_domain *domain,
-                                 TALLOC_CTX *mem_ctx,
-                                 const DOM_SID *sids, size_t num_sids,
-                                 void (*cont)(void *private_data,
-                                              bool success,
-                                              const DOM_SID *aliases,
-                                              size_t num_aliases),
-                                 void *private_data)
-{
-       struct winbindd_request request;
-       char *sidstr = NULL;
-       ssize_t len;
-
-       if (num_sids == 0) {
-               cont(private_data, True, NULL, 0);
-               return;
-       }
-
-       if (!print_sidlist(mem_ctx, sids, num_sids, &sidstr, &len)) {
-               cont(private_data, False, NULL, 0);
-               return;
-       }
-
-       ZERO_STRUCT(request);
-       request.cmd = WINBINDD_DUAL_GETSIDALIASES;
-       request.extra_len = len;
-       request.extra_data.data = sidstr;
-
-       do_async_domain(mem_ctx, domain, &request, getsidaliases_recv,
-                       (void *)cont, private_data);
-}
-
-static void query_user_recv(TALLOC_CTX *mem_ctx, bool success,
-                           struct winbindd_response *response,
-                           void *c, void *private_data)
-{
-       void (*cont)(void *priv, bool succ, const char *acct_name,
-                    const char *full_name, const char *homedir, 
-                    const char *shell, uint32 gid, uint32 group_rid) =
-               (void (*)(void *, bool, const char *, const char *,
-                         const char *, const char *, uint32, uint32))c;
-
-       if (!success) {
-               DEBUG(5, ("Could not trigger query_user\n"));
-               cont(private_data, False, NULL, NULL, NULL, NULL, -1, -1);
-               return;
-       }
-
-       if (response->result != WINBINDD_OK) {
-                DEBUG(5, ("query_user returned an error\n"));
-               cont(private_data, False, NULL, NULL, NULL, NULL, -1, -1);
-               return;
-       }
-
-       cont(private_data, True, response->data.user_info.acct_name,
-            response->data.user_info.full_name,
-            response->data.user_info.homedir,
-            response->data.user_info.shell,
-            response->data.user_info.primary_gid,
-            response->data.user_info.group_rid);
-}
-
-void query_user_async(TALLOC_CTX *mem_ctx, struct winbindd_domain *domain,
-                     const DOM_SID *sid,
-                     void (*cont)(void *private_data, bool success,
-                                  const char *acct_name,
-                                  const char *full_name,
-                                  const char *homedir,
-                                  const char *shell,
-                                  gid_t gid,
-                                  uint32 group_rid),
-                     void *private_data)
-{
-       struct winbindd_request request;
-       ZERO_STRUCT(request);
-       request.cmd = WINBINDD_DUAL_USERINFO;
-       sid_to_fstring(request.data.sid, sid);
-       do_async_domain(mem_ctx, domain, &request, query_user_recv,
-                       (void *)cont, private_data);
-}
-
 enum winbindd_result winbindd_dual_ping(struct winbindd_domain *domain,
                                        struct winbindd_cli_state *state)
 {