s3-auth Change type of num_sids to uint32_t
[samba.git] / source3 / winbindd / winbindd_async.c
index e44146ebcdec4993d7c79ec0ae6fe90e773d9699..4d5273127379996fc3380d49ca7d7f4e1f5ed7a9 100644 (file)
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
 
-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;
@@ -128,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;
 
@@ -139,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));