s3:winbind: Move fillup_pw_field() as static to wb_fill_pwent.c
[ira/wip.git] / source3 / winbindd / winbindd_user.c
index 270a297b7cdb52510f1a4c1b92fd30762df804e0..6afa941b7f5c207f30a6dfd168f83814d755d58f 100644 (file)
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
 
-static bool fillup_pw_field(const char *lp_template, 
-                           const char *username, 
-                           const char *domname,
-                           uid_t uid,
-                           gid_t gid,
-                           const char *in, 
-                           fstring out)
-{
-       char *templ;
-
-       if (out == NULL)
-               return False;
-
-       /* The substitution of %U and %D in the 'template 
-          homedir' is done by talloc_sub_specified() below.
-          If we have an in string (which means the value has already
-          been set in the nss_info backend), then use that.
-          Otherwise use the template value passed in. */
-
-       if ( in && !strequal(in,"") && lp_security() == SEC_ADS ) {
-               templ = talloc_sub_specified(NULL, in, 
-                                            username, domname,
-                                    uid, gid);
-       } else {
-               templ = talloc_sub_specified(NULL, lp_template, 
-                                            username, domname,
-                                            uid, gid);         
-       }
-               
-       if (!templ)
-               return False;
-
-       safe_strcpy(out, templ, sizeof(fstring) - 1);
-       TALLOC_FREE(templ);
-               
-       return True;
-       
-}
-/* Fill a pwent structure with information we have obtained */
-
-static bool winbindd_fill_pwent(char *dom_name, char *user_name, 
-                               DOM_SID *user_sid, DOM_SID *group_sid,
-                               char *full_name, char *homedir, char *shell,
-                               struct winbindd_pw *pw)
-{
-       fstring output_username;
-       
-       if (!pw || !dom_name || !user_name)
-               return False;
-       
-       /* Resolve the uid number */
-
-       if (!NT_STATUS_IS_OK(idmap_sid_to_uid(user_sid, &pw->pw_uid))) {
-               DEBUG(1, ("error getting user id for sid %s\n",
-                         sid_string_dbg(user_sid)));
-               return False;
-       }
-       
-       /* Resolve the gid number */   
-
-       if (!NT_STATUS_IS_OK(idmap_sid_to_gid(group_sid, &pw->pw_gid))) {
-               DEBUG(1, ("error getting group id for sid %s\n",
-                         sid_string_dbg(group_sid)));
-               return False;
-       }
-
-       strlower_m(user_name);
-
-       /* Username */
-
-       fill_domain_username(output_username, dom_name, user_name, True); 
-
-       safe_strcpy(pw->pw_name, output_username, sizeof(pw->pw_name) - 1);
-       
-       /* Full name (gecos) */
-       
-       safe_strcpy(pw->pw_gecos, full_name, sizeof(pw->pw_gecos) - 1);
-
-       /* Home directory and shell */
-       
-       if (!fillup_pw_field(lp_template_homedir(), user_name, dom_name, 
-                            pw->pw_uid, pw->pw_gid, homedir, pw->pw_dir))
-               return False;
-
-       if (!fillup_pw_field(lp_template_shell(), user_name, dom_name, 
-                            pw->pw_uid, pw->pw_gid, shell, pw->pw_shell))
-               return False;
-
-       /* Password - set to "*" as we can't generate anything useful here.
-          Authentication can be done using the pam_winbind module. */
-
-       safe_strcpy(pw->pw_passwd, "*", sizeof(pw->pw_passwd) - 1);
-
-       return True;
-}
-
 /* Wrapper for domain->methods->query_user, only on the parent->child pipe */
 
 enum winbindd_result winbindd_dual_userinfo(struct winbindd_domain *domain,
                                            struct winbindd_cli_state *state)
 {
        DOM_SID sid;
-       WINBIND_USERINFO user_info;
+       struct wbint_userinfo user_info;
        NTSTATUS status;
 
        /* Ensure null termination */
-       state->request.data.sid[sizeof(state->request.data.sid)-1]='\0';
+       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));
+       DEBUG(3, ("[%5lu]: lookupsid %s\n", (unsigned long)state->pid,
+                 state->request->data.sid));
 
-       if (!string_to_sid(&sid, state->request.data.sid)) {
-               DEBUG(5, ("%s not a SID\n", state->request.data.sid));
+       if (!string_to_sid(&sid, state->request->data.sid)) {
+               DEBUG(5, ("%s not a SID\n", state->request->data.sid));
                return WINBINDD_ERROR;
        }
 
@@ -151,13 +55,15 @@ enum winbindd_result winbindd_dual_userinfo(struct winbindd_domain *domain,
                return WINBINDD_ERROR;
        }
 
-       fstrcpy(state->response.data.user_info.acct_name, user_info.acct_name);
-       fstrcpy(state->response.data.user_info.full_name, user_info.full_name);
-       fstrcpy(state->response.data.user_info.homedir, user_info.homedir);
-       fstrcpy(state->response.data.user_info.shell, user_info.shell);
-       state->response.data.user_info.primary_gid = user_info.primary_gid;     
+       fstrcpy(state->response->data.user_info.acct_name,
+               user_info.acct_name);
+       fstrcpy(state->response->data.user_info.full_name,
+               user_info.full_name);
+       fstrcpy(state->response->data.user_info.homedir, user_info.homedir);
+       fstrcpy(state->response->data.user_info.shell, user_info.shell);
+       state->response->data.user_info.primary_gid = user_info.primary_gid;
        if (!sid_peek_check_rid(&domain->sid, &user_info.group_sid,
-                               &state->response.data.user_info.group_rid)) {
+                               &state->response->data.user_info.group_rid)) {
                DEBUG(1, ("Could not extract group rid out of %s\n",
                          sid_string_dbg(&sid)));
                return WINBINDD_ERROR;
@@ -165,626 +71,3 @@ enum winbindd_result winbindd_dual_userinfo(struct winbindd_domain *domain,
 
        return WINBINDD_OK;
 }
-
-struct getpwsid_state {
-       struct winbindd_cli_state *state;
-       struct winbindd_domain *domain;
-       char *username;
-       char *fullname;
-       char *homedir;
-       char *shell;
-       DOM_SID user_sid;
-       uid_t uid;
-       DOM_SID group_sid;
-       gid_t gid;
-};
-
-static void getpwsid_queryuser_recv(void *private_data, bool success,
-                                   const char *acct_name,
-                                   const char *full_name, 
-                                   const char *homedir,
-                                   const char *shell,
-                                   uint32 gid,
-                                   uint32 group_rid);
-static void getpwsid_sid2uid_recv(void *private_data, bool success, uid_t uid);
-static void getpwsid_sid2gid_recv(void *private_data, bool success, gid_t gid);
-
-static void winbindd_getpwsid(struct winbindd_cli_state *state,
-                             const DOM_SID *sid)
-{
-       struct getpwsid_state *s;
-
-       s = TALLOC_ZERO_P(state->mem_ctx, struct getpwsid_state);
-       if (s == NULL) {
-               DEBUG(0, ("talloc failed\n"));
-               goto error;
-       }
-
-       s->state = state;
-       s->domain = find_domain_from_sid_noinit(sid);
-       if (s->domain == NULL) {
-               DEBUG(3, ("Could not find domain for sid %s\n",
-                         sid_string_dbg(sid)));
-               goto error;
-       }
-
-       sid_copy(&s->user_sid, sid);
-
-       query_user_async(s->state->mem_ctx, s->domain, sid,
-                        getpwsid_queryuser_recv, s);
-       return;
-
- error:
-       request_error(state);
-}
-       
-static void getpwsid_queryuser_recv(void *private_data, bool success,
-                                   const char *acct_name,
-                                   const char *full_name, 
-                                   const char *homedir,
-                                   const char *shell,
-                                   uint32 gid,
-                                   uint32 group_rid)
-{
-       fstring username;
-       struct getpwsid_state *s =
-               talloc_get_type_abort(private_data, struct getpwsid_state);
-
-       if (!success) {
-               DEBUG(5, ("Could not query domain %s SID %s\n",
-                         s->domain->name, sid_string_dbg(&s->user_sid)));
-               request_error(s->state);
-               return;
-       }
-
-       if ( acct_name && *acct_name ) {
-       fstrcpy( username, acct_name );
-       } else {                
-               char *domain_name = NULL;
-               enum lsa_SidType type;
-               char *user_name = NULL;
-               struct winbindd_domain *domain = NULL;
-               
-               domain = find_lookup_domain_from_sid(&s->user_sid);
-               if (domain == NULL) {
-                       DEBUG(5, ("find_lookup_domain_from_sid(%s) failed\n",
-                                 sid_string_dbg(&s->user_sid)));
-                       request_error(s->state);
-                       return;                 
-               }
-               winbindd_lookup_name_by_sid(s->state->mem_ctx, domain,
-                                           &s->user_sid, &domain_name,
-                                           &user_name, &type );                
-
-               /* If this still fails we ar4e done.  Just error out */
-               if ( !user_name ) {
-                       DEBUG(5,("Could not obtain a name for SID %s\n",
-                                sid_string_dbg(&s->user_sid)));
-                       request_error(s->state);
-                       return;                 
-               }
-
-               fstrcpy( username, user_name );         
-       }
-
-       strlower_m( username );
-       s->username = talloc_strdup(s->state->mem_ctx, username);
-
-       ws_name_replace( s->username, WB_REPLACE_CHAR );
-        
-       s->fullname = talloc_strdup(s->state->mem_ctx, full_name);
-       s->homedir = talloc_strdup(s->state->mem_ctx, homedir);
-       s->shell = talloc_strdup(s->state->mem_ctx, shell);
-       s->gid = gid;   
-       sid_copy(&s->group_sid, &s->domain->sid);
-       sid_append_rid(&s->group_sid, group_rid);
-
-       winbindd_sid2uid_async(s->state->mem_ctx, &s->user_sid,
-                              getpwsid_sid2uid_recv, s);
-}
-
-static void getpwsid_sid2uid_recv(void *private_data, bool success, uid_t uid)
-{
-       struct getpwsid_state *s =
-               talloc_get_type_abort(private_data, struct getpwsid_state);
-
-       if (!success) {
-               DEBUG(5, ("Could not query uid for user %s\\%s\n",
-                         s->domain->name, s->username));
-               request_error(s->state);
-               return;
-       }
-
-       s->uid = uid;
-       winbindd_sid2gid_async(s->state->mem_ctx, &s->group_sid,
-                              getpwsid_sid2gid_recv, s);
-}
-
-static void getpwsid_sid2gid_recv(void *private_data, bool success, gid_t gid)
-{
-       struct getpwsid_state *s =
-               talloc_get_type_abort(private_data, struct getpwsid_state);
-       struct winbindd_pw *pw;
-       fstring output_username;
-
-       /* allow the nss backend to override the primary group ID.
-          If the gid has already been set, then keep it.
-          This makes me feel dirty.  If the nss backend already
-          gave us a gid, we don't really care whether the sid2gid()
-          call worked or not.   --jerry  */
-
-       if ( s->gid == (gid_t)-1 ) {
-
-               if (!success) {
-                       DEBUG(5, ("Could not query gid for user %s\\%s\n",
-                                 s->domain->name, s->username));
-                       goto failed;
-               }
-
-               /* take what the sid2gid() call gave us */
-               s->gid = gid;
-       }
-
-       pw = &s->state->response.data.pw;
-       pw->pw_uid = s->uid;
-       pw->pw_gid = s->gid;
-       fill_domain_username(output_username, s->domain->name, s->username, True); 
-       safe_strcpy(pw->pw_name, output_username, sizeof(pw->pw_name) - 1);
-       safe_strcpy(pw->pw_gecos, s->fullname, sizeof(pw->pw_gecos) - 1);
-
-       if (!fillup_pw_field(lp_template_homedir(), s->username, s->domain->name, 
-                            pw->pw_uid, pw->pw_gid, s->homedir, pw->pw_dir)) {
-               DEBUG(5, ("Could not compose homedir\n"));
-               goto failed;
-       }
-
-       if (!fillup_pw_field(lp_template_shell(), s->username, s->domain->name, 
-                            pw->pw_uid, pw->pw_gid, s->shell, pw->pw_shell)) {
-               DEBUG(5, ("Could not compose shell\n"));
-               goto failed;
-       }
-
-       /* Password - set to "*" as we can't generate anything useful here.
-          Authentication can be done using the pam_winbind module. */
-
-       safe_strcpy(pw->pw_passwd, "*", sizeof(pw->pw_passwd) - 1);
-
-       request_ok(s->state);
-       return;
-
- failed:
-       request_error(s->state);
-}
-
-/* Return a password structure from a username.  */
-
-static void getpwnam_name2sid_recv(void *private_data, bool success,
-                                  const DOM_SID *sid, enum lsa_SidType type);
-
-void winbindd_getpwnam(struct winbindd_cli_state *state)
-{
-       struct winbindd_domain *domain;
-       fstring domname, username;
-       char *domuser;
-       size_t dusize;
-
-       domuser = state->request.data.username;
-       dusize = sizeof(state->request.data.username);
-
-       /* Ensure null termination (it's an fstring) */
-       domuser[dusize-1] = '\0';
-
-       DEBUG(3, ("[%5lu]: getpwnam %s\n",
-                 (unsigned long)state->pid,
-                 domuser));
-
-       ws_name_return(domuser, WB_REPLACE_CHAR);
-
-       if (!parse_domain_user(domuser, domname, username)) {
-               DEBUG(5, ("Could not parse domain user: %s\n", domuser));
-               request_error(state);
-               return;
-       }
-
-       /* Get info for the domain */
-
-       domain = find_domain_from_name(domname);
-
-       if (domain == NULL) {
-               DEBUG(7, ("could not find domain entry for domain %s.  "
-                         "Using primary domain\n", domname));
-               if ( (domain = find_our_domain()) == NULL ) {
-                       DEBUG(0,("Cannot find my primary domain structure!\n"));
-                       request_error(state);
-                       return;
-               }
-       }
-
-       if (strequal(domname, lp_workgroup()) &&
-           lp_winbind_trusted_domains_only() ) {
-               DEBUG(7,("winbindd_getpwnam: My domain -- "
-                        "rejecting getpwnam() for %s\\%s.\n",
-                        domname, username));
-               request_error(state);
-               return;
-       }
-
-       /* Get rid and name type from name.  The following costs 1 packet */
-
-       winbindd_lookupname_async(state->mem_ctx, domname, username,
-                                 getpwnam_name2sid_recv, WINBINDD_GETPWNAM, 
-                                 state);
-}
-
-static void getpwnam_name2sid_recv(void *private_data, bool success,
-                                  const DOM_SID *sid, enum lsa_SidType type)
-{
-       struct winbindd_cli_state *state =
-               (struct winbindd_cli_state *)private_data;
-       fstring domname, username;      
-
-       if (!success) {
-               DEBUG(5, ("Could not lookup name for user %s\n",
-                         state->request.data.username));
-               request_error(state);
-               return;
-       }
-
-       if ((type != SID_NAME_USER) && (type != SID_NAME_COMPUTER)) {
-               DEBUG(5, ("%s is not a user\n", state->request.data.username));
-               request_error(state);
-               return;
-       }
-
-       if ( parse_domain_user(state->request.data.username, domname, username) ) {
-               check_domain_trusted( domname, sid );   
-       }
-
-
-
-       winbindd_getpwsid(state, sid);
-}
-
-static void getpwuid_recv(void *private_data, bool success, const char *sid)
-{
-       struct winbindd_cli_state *state =
-               (struct winbindd_cli_state *)private_data;
-       DOM_SID user_sid;
-
-       if (!success) {
-               DEBUG(10,("uid2sid_recv: uid [%lu] to sid mapping failed\n.",
-                         (unsigned long)(state->request.data.uid)));
-               request_error(state);
-               return;
-       }
-       
-       DEBUG(10,("uid2sid_recv: uid %lu has sid %s\n",
-                 (unsigned long)(state->request.data.uid), sid));
-
-       string_to_sid(&user_sid, sid);
-       winbindd_getpwsid(state, &user_sid);
-}
-
-/* Return a password structure given a uid number */
-void winbindd_getpwuid(struct winbindd_cli_state *state)
-{
-       DEBUG(3, ("[%5lu]: getpwuid %lu\n", (unsigned long)state->pid, 
-                 (unsigned long)state->request.data.uid));
-
-       /* always query idmap via the async interface */
-       /* if this turns to be too slow we will add here a direct query to the cache */
-       winbindd_uid2sid_async(state->mem_ctx, state->request.data.uid, getpwuid_recv, state);
-}
-
-/*
- * set/get/endpwent functions
- */
-
-/* Rewind file pointer for ntdom passwd database */
-
-static bool winbindd_setpwent_internal(struct winbindd_cli_state *state)
-{
-       struct winbindd_domain *domain;
-        
-       DEBUG(3, ("[%5lu]: setpwent\n", (unsigned long)state->pid));
-        
-       /* Check user has enabled this */
-        
-       if (!lp_winbind_enum_users()) {
-               return False;
-       }
-
-       /* Free old static data if it exists */
-        
-       if (state->getpwent_state != NULL) {
-               free_getent_state(state->getpwent_state);
-               state->getpwent_state = NULL;
-       }
-
-#if 0  /* JERRY */
-       /* add any local users we have */
-               
-       if ( (domain_state = (struct getent_state *)malloc(sizeof(struct getent_state))) == NULL )
-               return False;
-                
-       ZERO_STRUCTP(domain_state);
-
-       /* Add to list of open domains */
-                
-       DLIST_ADD(state->getpwent_state, domain_state);
-#endif
-        
-       /* Create sam pipes for each domain we know about */
-        
-       for(domain = domain_list(); domain != NULL; domain = domain->next) {
-               struct getent_state *domain_state;
-                
-               
-               /* don't add our domaina if we are a PDC or if we 
-                  are a member of a Samba domain */
-               
-               if ( (IS_DC || lp_winbind_trusted_domains_only())
-                       && strequal(domain->name, lp_workgroup()) )
-               {
-                       continue;
-               }
-                                               
-               /* Create a state record for this domain */
-                
-               if ((domain_state = SMB_MALLOC_P(struct getent_state)) == NULL) {
-                       DEBUG(0, ("malloc failed\n"));
-                       return False;
-               }
-                
-               ZERO_STRUCTP(domain_state);
-
-               fstrcpy(domain_state->domain_name, domain->name);
-
-               /* Add to list of open domains */
-                
-               DLIST_ADD(state->getpwent_state, domain_state);
-       }
-        
-       state->getpwent_initialized = True;
-       return True;
-}
-
-void winbindd_setpwent(struct winbindd_cli_state *state)
-{
-       if (winbindd_setpwent_internal(state)) {
-               request_ok(state);
-       } else {
-               request_error(state);
-       }
-}
-
-/* Close file pointer to ntdom passwd database */
-
-void winbindd_endpwent(struct winbindd_cli_state *state)
-{
-       DEBUG(3, ("[%5lu]: endpwent\n", (unsigned long)state->pid));
-
-       free_getent_state(state->getpwent_state);    
-       state->getpwent_initialized = False;
-       state->getpwent_state = NULL;
-       request_ok(state);
-}
-
-/* Get partial list of domain users for a domain.  We fill in the sam_entries,
-   and num_sam_entries fields with domain user information.  The dispinfo_ndx
-   field is incremented to the index of the next user to fetch.  Return True if
-   some users were returned, False otherwise. */
-
-static bool get_sam_user_entries(struct getent_state *ent, TALLOC_CTX *mem_ctx)
-{
-       NTSTATUS status;
-       uint32 num_entries;
-       WINBIND_USERINFO *info;
-       struct getpwent_user *name_list = NULL;
-       struct winbindd_domain *domain;
-       struct winbindd_methods *methods;
-       unsigned int i;
-
-       if (ent->num_sam_entries)
-               return False;
-
-       if (!(domain = find_domain_from_name(ent->domain_name))) {
-               DEBUG(3, ("no such domain %s in get_sam_user_entries\n",
-                         ent->domain_name));
-               return False;
-       }
-
-       methods = domain->methods;
-
-       /* Free any existing user info */
-
-       SAFE_FREE(ent->sam_entries);
-       ent->num_sam_entries = 0;
-       
-       /* Call query_user_list to get a list of usernames and user rids */
-
-       num_entries = 0;
-
-       status = methods->query_user_list(domain, mem_ctx, &num_entries, 
-                                         &info);
-               
-       if (!NT_STATUS_IS_OK(status)) {
-               DEBUG(10,("get_sam_user_entries: query_user_list failed with %s\n",
-                       nt_errstr(status) ));
-               return False;
-       }
-
-       if (num_entries) {
-               name_list = SMB_REALLOC_ARRAY(name_list, struct getpwent_user, ent->num_sam_entries + num_entries);
-               
-               if (!name_list) {
-                       DEBUG(0,("get_sam_user_entries realloc failed.\n"));
-                       return False;
-               }
-       }
-
-       for (i = 0; i < num_entries; i++) {
-               /* Store account name and gecos */
-               if (!info[i].acct_name) {
-                       fstrcpy(name_list[ent->num_sam_entries + i].name, "");
-               } else {
-                       fstrcpy(name_list[ent->num_sam_entries + i].name, 
-                               info[i].acct_name); 
-               }
-               if (!info[i].full_name) {
-                       fstrcpy(name_list[ent->num_sam_entries + i].gecos, "");
-               } else {
-                       fstrcpy(name_list[ent->num_sam_entries + i].gecos, 
-                               info[i].full_name); 
-               }
-               if (!info[i].homedir) {
-                       fstrcpy(name_list[ent->num_sam_entries + i].homedir, "");
-               } else {
-                       fstrcpy(name_list[ent->num_sam_entries + i].homedir, 
-                               info[i].homedir); 
-               }
-               if (!info[i].shell) {
-                       fstrcpy(name_list[ent->num_sam_entries + i].shell, "");
-               } else {
-                       fstrcpy(name_list[ent->num_sam_entries + i].shell, 
-                               info[i].shell); 
-               }
-       
-       
-               /* User and group ids */
-               sid_copy(&name_list[ent->num_sam_entries+i].user_sid,
-                        &info[i].user_sid);
-               sid_copy(&name_list[ent->num_sam_entries+i].group_sid,
-                        &info[i].group_sid);
-       }
-               
-       ent->num_sam_entries += num_entries;
-       
-       /* Fill in remaining fields */
-       
-       ent->sam_entries = name_list;
-       ent->sam_entry_index = 0;
-       return ent->num_sam_entries > 0;
-}
-
-/* Fetch next passwd entry from ntdom database */
-
-#define MAX_GETPWENT_USERS 500
-
-void winbindd_getpwent(struct winbindd_cli_state *state)
-{
-       struct getent_state *ent;
-       struct winbindd_pw *user_list;
-       int num_users, user_list_ndx;
-
-       DEBUG(3, ("[%5lu]: getpwent\n", (unsigned long)state->pid));
-
-       /* Check user has enabled this */
-
-       if (!lp_winbind_enum_users()) {
-               request_error(state);
-               return;
-       }
-
-       /* Allocate space for returning a chunk of users */
-
-       num_users = MIN(MAX_GETPWENT_USERS, state->request.data.num_entries);
-
-       if (num_users == 0) {
-               request_error(state);
-               return;
-       }
-       
-       if ((state->response.extra_data.data = SMB_MALLOC_ARRAY(struct winbindd_pw, num_users)) == NULL) {
-               request_error(state);
-               return;
-       }
-
-       memset(state->response.extra_data.data, 0, num_users * 
-              sizeof(struct winbindd_pw));
-
-       user_list = (struct winbindd_pw *)state->response.extra_data.data;
-
-       if (!state->getpwent_initialized)
-               winbindd_setpwent_internal(state);
-       
-       if (!(ent = state->getpwent_state)) {
-               request_error(state);
-               return;
-       }
-
-       /* Start sending back users */
-
-       for (user_list_ndx = 0; user_list_ndx < num_users; ) {
-               struct getpwent_user *name_list = NULL;
-               uint32 result;
-
-               /* Do we need to fetch another chunk of users? */
-
-               if (ent->num_sam_entries == ent->sam_entry_index) {
-
-                       while(ent &&
-                             !get_sam_user_entries(ent, state->mem_ctx)) {
-                               struct getent_state *next_ent;
-
-                               /* Free state information for this domain */
-
-                               SAFE_FREE(ent->sam_entries);
-
-                               next_ent = ent->next;
-                               DLIST_REMOVE(state->getpwent_state, ent);
-
-                               SAFE_FREE(ent);
-                               ent = next_ent;
-                       }
-                       /* No more domains */
-
-                       if (!ent) 
-                               break;
-               }
-
-               name_list = (struct getpwent_user *)ent->sam_entries;
-
-               /* Lookup user info */
-               
-               result = winbindd_fill_pwent(
-                       ent->domain_name, 
-                       name_list[ent->sam_entry_index].name,
-                       &name_list[ent->sam_entry_index].user_sid,
-                       &name_list[ent->sam_entry_index].group_sid,
-                       name_list[ent->sam_entry_index].gecos,
-                       name_list[ent->sam_entry_index].homedir,
-                       name_list[ent->sam_entry_index].shell,
-                       &user_list[user_list_ndx]);
-               
-               /* Add user to return list */
-               
-               if (result) {
-                               
-                       user_list_ndx++;
-                       state->response.data.num_entries++;
-                       state->response.length += 
-                               sizeof(struct winbindd_pw);
-
-               } else
-                       DEBUG(1, ("could not lookup domain user %s\n",
-                                 name_list[ent->sam_entry_index].name));
-
-               ent->sam_entry_index++;
-               
-       }
-
-       /* Out of domains */
-
-       if (user_list_ndx > 0)
-               request_ok(state);
-       else
-               request_error(state);
-}
-
-/* List domain users without mapping to unix ids */
-void winbindd_list_users(struct winbindd_cli_state *state)
-{
-       winbindd_list_ent(state, LIST_USERS);
-}