/*
- Unix SMB/Netbios implementation.
- Version 2.0
+ Unix SMB/CIFS implementation.
Winbind daemon - user related functions
Copyright (C) Tim Potter 2000
+ Copyright (C) Jeremy Allison 2001.
+ Copyright (C) Gerald (Jerry) Carter 2003.
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
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include "includes.h"
#include "winbindd.h"
+#undef DBGC_CLASS
+#define DBGC_CLASS DBGC_WINBIND
+
+extern userdom_struct current_user_info;
+
/* Fill a pwent structure with information we have obtained */
-static BOOL winbindd_fill_pwent(char *domain_name, char *name,
- uint32 user_rid, uint32 group_rid,
- char *full_name, struct winbindd_pw *pw)
+static BOOL winbindd_fill_pwent(char *dom_name, char *user_name,
+ DOM_SID *user_sid, DOM_SID *group_sid,
+ char *full_name, struct winbindd_pw *pw)
{
- extern userdom_struct current_user_info;
- fstring name_domain, name_user;
- pstring homedir;
+ fstring output_username;
+ char *homedir;
+ char *shell;
+ fstring sid_string;
- if (!pw || !name)
+ if (!pw || !dom_name || !user_name)
return False;
/* Resolve the uid number */
-
- if (!winbindd_idmap_get_uid_from_rid(domain_name, user_rid,
- &pw->pw_uid)) {
- DEBUG(1, ("error getting user id for rid %d\n", user_rid));
+
+ if (!NT_STATUS_IS_OK(idmap_sid_to_uid(user_sid, &pw->pw_uid, 0))) {
+ DEBUG(1, ("error getting user id for sid %s\n", sid_to_string(sid_string, user_sid)));
return False;
}
/* Resolve the gid number */
-
- if (!winbindd_idmap_get_gid_from_rid(domain_name, group_rid,
- &pw->pw_gid)) {
- DEBUG(1, ("error getting group id for rid %d\n", group_rid));
+
+ if (!NT_STATUS_IS_OK(idmap_sid_to_gid(group_sid, &pw->pw_gid, 0))) {
+ DEBUG(1, ("error getting group id for sid %s\n", sid_to_string(sid_string, group_sid)));
return False;
}
+ strlower_m(user_name);
+
/* Username */
-
- safe_strcpy(pw->pw_name, name, sizeof(pw->pw_name) - 1);
+
+ fill_domain_username(output_username, dom_name, user_name);
+
+ 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 - use template config parameters. The
defaults are /tmp for the home directory and /bin/false for
shell. */
- parse_domain_user(name, name_domain, name_user);
-
/* The substitution of %U and %D in the 'template homedir' is done
- by lp_string() calling standard_sub_basic(). */
+ by alloc_sub_specified() below. */
+
+ fstrcpy(current_user_info.domain, dom_name);
- fstrcpy(current_user_info.smb_name, name_user);
- fstrcpy(current_user_info.domain, name_domain);
+ homedir = alloc_sub_specified(lp_template_homedir(), user_name, dom_name, pw->pw_uid, pw->pw_gid);
- pstrcpy(homedir, lp_template_homedir());
+ if (!homedir)
+ return False;
safe_strcpy(pw->pw_dir, homedir, sizeof(pw->pw_dir) - 1);
- safe_strcpy(pw->pw_shell, lp_template_shell(),
+ SAFE_FREE(homedir);
+
+ shell = alloc_sub_specified(lp_template_shell(), user_name, dom_name, pw->pw_uid, pw->pw_gid);
+
+ if (!shell)
+ return False;
+
+ safe_strcpy(pw->pw_shell, shell,
sizeof(pw->pw_shell) - 1);
+ SAFE_FREE(shell);
+
/* Password - set to "x" as we can't generate anything useful here.
- Authentication can be done using the pam_ntdom module. */
+ Authentication can be done using the pam_winbind module. */
safe_strcpy(pw->pw_passwd, "x", sizeof(pw->pw_passwd) - 1);
-
+
return True;
}
-/* Return a password structure from a username. Specify whether cached data
- can be returned. */
+/* Return a password structure from a username. */
-enum winbindd_result winbindd_getpwnam_from_user(struct winbindd_cli_state
- *state)
+enum winbindd_result winbindd_getpwnam(struct winbindd_cli_state *state)
{
- uint32 user_rid, group_rid;
- SAM_USERINFO_CTR *user_info;
+ WINBIND_USERINFO user_info;
+ WINBINDD_PW *pw;
DOM_SID user_sid;
- fstring name_domain, name_user, name, gecos_name;
+ NTSTATUS status;
+ fstring name_domain, name_user;
enum SID_NAME_USE name_type;
- struct winbindd_domain *domain;
+ struct winbindd_domain *domain;
+ TALLOC_CTX *mem_ctx;
- DEBUG(3, ("[%5d]: getpwnam %s\n", state->pid,
+ /* Ensure null termination */
+ state->request.data.username[sizeof(state->request.data.username)-1]='\0';
+
+ DEBUG(3, ("[%5lu]: getpwnam %s\n", (unsigned long)state->pid,
state->request.data.username));
/* Parse domain and username */
- parse_domain_user(state->request.data.username, name_domain,
- name_user);
-
- /* Reject names that don't have a domain - i.e name_domain contains
- the entire name. */
-
- if (strequal(name_domain, ""))
- return WINBINDD_ERROR;
+ parse_domain_user(state->request.data.username,
+ name_domain, name_user);
- if ((domain = find_domain_from_name(name_domain)) == NULL) {
- DEBUG(5, ("No such domain: %s\n", name_domain));
- return WINBINDD_ERROR;
- }
-
- /* Check for cached user entry */
-
- if (winbindd_fetch_user_cache_entry(domain, name_user,
- &state->response.data.pw))
+ /* if this is our local domain (or no domain), the do a local tdb search */
+
+ if ( !*name_domain || strequal(name_domain, get_global_sam_name()) ) {
+ if ( !(pw = wb_getpwnam(name_user)) ) {
+ DEBUG(5,("winbindd_getpwnam: lookup for %s\\%s failed\n",
+ name_domain, name_user));
+ return WINBINDD_ERROR;
+ }
+ memcpy( &state->response.data.pw, pw, sizeof(WINBINDD_PW) );
return WINBINDD_OK;
+ }
+
+ /* should we deal with users for our domain? */
- slprintf(name, sizeof(name) - 1, "%s\\%s", name_domain, name_user);
+ if ((domain = find_domain_from_name(name_domain)) == NULL) {
+ DEBUG(5, ("no such domain: %s\n", name_domain));
+ return WINBINDD_ERROR;
+ }
+
+ if ( domain->primary && lp_winbind_trusted_domains_only()) {
+ DEBUG(7,("winbindd_getpwnam: My domain -- rejecting getpwnam() for %s\\%s.\n",
+ name_domain, name_user));
+ return WINBINDD_ERROR;
+ }
/* Get rid and name type from name */
- if (!winbindd_lookup_sid_by_name(name, &user_sid, &name_type)) {
+ if (!winbindd_lookup_sid_by_name(domain, domain->name, name_user, &user_sid, &name_type)) {
DEBUG(1, ("user '%s' does not exist\n", name_user));
return WINBINDD_ERROR;
}
- if (name_type != SID_NAME_USER) {
+ if (name_type != SID_NAME_USER && name_type != SID_NAME_COMPUTER) {
DEBUG(1, ("name '%s' is not a user name: %d\n", name_user,
name_type));
return WINBINDD_ERROR;
}
- /* Get some user info. Split the user rid from the sid obtained
- from the winbind_lookup_by_name() call and use it in a
- winbind_lookup_userinfo() */
+ /* Get some user info. */
- sid_split_rid(&user_sid, &user_rid);
-
- if (!winbindd_lookup_userinfo(domain, user_rid, &user_info)) {
- DEBUG(1, ("pwnam_from_user(): error getting user info for "
- "user '%s'\n", name_user));
+ if (!(mem_ctx = talloc_init("winbindd_getpwnam([%s]\\[%s])",
+ name_domain, name_user))) {
+ DEBUG(1, ("out of memory\n"));
return WINBINDD_ERROR;
}
-
- group_rid = user_info->info.id21->group_rid;
- unistr2_to_ascii(gecos_name, &user_info->info.id21->uni_full_name,
- sizeof(gecos_name) - 1);
- /* Now take all this information and fill in a passwd structure */
-
- if (!winbindd_fill_pwent(name_domain, state->request.data.username,
- user_rid, group_rid, gecos_name,
+ status = domain->methods->query_user(domain, mem_ctx, &user_sid,
+ &user_info);
+
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(1, ("error getting user info for user '[%s]\\[%s]'\n",
+ name_domain, name_user));
+ talloc_destroy(mem_ctx);
+ return WINBINDD_ERROR;
+ }
+
+ /* Now take all this information and fill in a passwd structure */
+ if (!winbindd_fill_pwent(name_domain, user_info.acct_name,
+ user_info.user_sid, user_info.group_sid,
+ user_info.full_name,
&state->response.data.pw)) {
+ talloc_destroy(mem_ctx);
return WINBINDD_ERROR;
}
-
- winbindd_store_user_cache_entry(domain, name_user,
- &state->response.data.pw);
+
+ talloc_destroy(mem_ctx);
return WINBINDD_OK;
}
/* Return a password structure given a uid number */
-enum winbindd_result winbindd_getpwnam_from_uid(struct winbindd_cli_state
- *state)
+enum winbindd_result winbindd_getpwuid(struct winbindd_cli_state *state)
{
DOM_SID user_sid;
struct winbindd_domain *domain;
- uint32 user_rid, group_rid;
- fstring user_name, gecos_name;
+ WINBINDD_PW *pw;
+ fstring dom_name;
+ fstring user_name;
enum SID_NAME_USE name_type;
- SAM_USERINFO_CTR *user_info;
+ WINBIND_USERINFO user_info;
+ TALLOC_CTX *mem_ctx;
+ NTSTATUS status;
gid_t gid;
/* Bug out if the uid isn't in the winbind range */
(state->request.data.uid > server_state.uid_high))
return WINBINDD_ERROR;
- DEBUG(3, ("[%5d]: getpwuid %d\n", state->pid,
- state->request.data.uid));
+ DEBUG(3, ("[%5lu]: getpwuid %lu\n", (unsigned long)state->pid,
+ (unsigned long)state->request.data.uid));
+
+ /* always try local tdb first */
+
+ if ( (pw = wb_getpwuid(state->request.data.uid)) != NULL ) {
+ memcpy( &state->response.data.pw, pw, sizeof(WINBINDD_PW) );
+ return WINBINDD_OK;
+ }
/* Get rid from uid */
- if (!winbindd_idmap_get_rid_from_uid(state->request.data.uid,
- &user_rid, &domain)) {
- DEBUG(1, ("Could not convert uid %d to rid\n",
- state->request.data.uid));
+ if (!NT_STATUS_IS_OK(idmap_uid_to_sid(&user_sid, state->request.data.uid))) {
+ DEBUG(1, ("could not convert uid %lu to SID\n",
+ (unsigned long)state->request.data.uid));
return WINBINDD_ERROR;
}
- /* Check for cached uid entry */
-
- if (winbindd_fetch_uid_cache_entry(domain,
- state->request.data.uid,
- &state->response.data.pw))
- return WINBINDD_OK;
-
/* Get name and name type from rid */
- sid_copy(&user_sid, &domain->sid);
- sid_append_rid(&user_sid, user_rid);
-
- if (!winbindd_lookup_name_by_sid(&user_sid, user_name, &name_type)) {
+ if (!winbindd_lookup_name_by_sid(&user_sid, dom_name, user_name, &name_type)) {
fstring temp;
sid_to_string(temp, &user_sid);
- DEBUG(1, ("Could not lookup sid %s\n", temp));
-
+ DEBUG(1, ("could not lookup sid %s\n", temp));
return WINBINDD_ERROR;
}
- if (strcmp("\\", lp_winbind_separator()))
- string_sub(user_name, "\\", lp_winbind_separator(),
- sizeof(fstring));
+ domain = find_domain_from_sid(&user_sid);
+
+ if (!domain) {
+ DEBUG(1,("Can't find domain from sid\n"));
+ return WINBINDD_ERROR;
+ }
/* Get some user info */
- if (!winbindd_lookup_userinfo(domain, user_rid, &user_info)) {
- DEBUG(1, ("pwnam_from_uid(): error getting user info for "
- "user '%s'\n", user_name));
+ if (!(mem_ctx = talloc_init("winbind_getpwuid(%lu)",
+ (unsigned long)state->request.data.uid))) {
+
+ DEBUG(1, ("out of memory\n"));
return WINBINDD_ERROR;
}
-
- group_rid = user_info->info.id21->group_rid;
- unistr2_to_ascii(gecos_name, &user_info->info.id21->uni_full_name,
- sizeof(gecos_name) - 1);
- /* Resolve gid number */
+ status = domain->methods->query_user(domain, mem_ctx, &user_sid,
+ &user_info);
- if (!winbindd_idmap_get_gid_from_rid(domain->name, group_rid, &gid)) {
+ if (!NT_STATUS_IS_OK(status)) {
+ DEBUG(1, ("error getting user info for user '%s'\n",
+ user_name));
+ talloc_destroy(mem_ctx);
+ return WINBINDD_ERROR;
+ }
+
+ /* Check group has a gid number */
+
+ if (!NT_STATUS_IS_OK(idmap_sid_to_gid(user_info.group_sid, &gid, 0))) {
DEBUG(1, ("error getting group id for user %s\n", user_name));
+ talloc_destroy(mem_ctx);
return WINBINDD_ERROR;
}
/* Fill in password structure */
- if (!winbindd_fill_pwent(domain->name, user_name, user_rid, group_rid,
- gecos_name, &state->response.data.pw))
+ if (!winbindd_fill_pwent(domain->name, user_info.acct_name, user_info.user_sid,
+ user_info.group_sid,
+ user_info.full_name, &state->response.data.pw)) {
+ talloc_destroy(mem_ctx);
return WINBINDD_ERROR;
+ }
- winbindd_store_uid_cache_entry(domain, state->request.data.uid,
- &state->response.data.pw);
-
+ talloc_destroy(mem_ctx);
+
return WINBINDD_OK;
}
enum winbindd_result winbindd_setpwent(struct winbindd_cli_state *state)
{
- struct winbindd_domain *tmp;
+ struct winbindd_domain *domain;
- DEBUG(3, ("[%5d]: setpwent\n", state->pid));
+ DEBUG(3, ("[%5lu]: setpwent\n", (unsigned long)state->pid));
- /* Check user has enabled this */
+ /* Check user has enabled this */
- if (!lp_winbind_enum_users())
- return WINBINDD_ERROR;
+ if (!lp_winbind_enum_users())
+ return WINBINDD_ERROR;
- /* Free old static data if it exists */
+ /* Free old static data if it exists */
- if (state->getpwent_state != NULL) {
- free_getent_state(state->getpwent_state);
- state->getpwent_state = NULL;
- }
+ 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 WINBINDD_ERROR;
+
+ 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 */
+ /* Create sam pipes for each domain we know about */
- for(tmp = domain_list; tmp != NULL; tmp = tmp->next) {
- struct getent_state *domain_state;
-
- /* Skip domains other than WINBINDD_DOMAIN environment
- variable */
+ for(domain = domain_list(); domain != NULL; domain = domain->next) {
+ struct getent_state *domain_state;
- if ((strcmp(state->request.domain, "") != 0) &&
- !check_domain_env(state->request.domain, tmp->name))
- continue;
-
- /* Create a state record for this domain */
+
+ /* 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 = (struct getent_state *)
- malloc(sizeof(struct getent_state))) == NULL)
- return WINBINDD_ERROR;
+ if ((domain_state = SMB_MALLOC_P(struct getent_state)) == NULL)
+ return WINBINDD_ERROR;
- ZERO_STRUCTP(domain_state);
+ ZERO_STRUCTP(domain_state);
- domain_state->domain = tmp;
- domain_state->mem_ctx = talloc_init();
+ fstrcpy(domain_state->domain_name, domain->name);
- /* Add to list of open domains */
+ /* Add to list of open domains */
- DLIST_ADD(state->getpwent_state, domain_state);
- }
+ DLIST_ADD(state->getpwent_state, domain_state);
+ }
- return WINBINDD_OK;
+ state->getpwent_initialized = True;
+
+ return WINBINDD_OK;
}
/* Close file pointer to ntdom passwd database */
enum winbindd_result winbindd_endpwent(struct winbindd_cli_state *state)
{
- DEBUG(3, ("[%5d]: endpwent\n", state->pid));
+ DEBUG(3, ("[%5lu]: endpwent\n", (unsigned long)state->pid));
- free_getent_state(state->getpwent_state);
- state->getpwent_state = NULL;
+ free_getent_state(state->getpwent_state);
+ state->getpwent_initialized = False;
+ state->getpwent_state = NULL;
- return WINBINDD_OK;
+ return WINBINDD_OK;
}
/* Get partial list of domain users for a domain. We fill in the sam_entries,
field is incremented to the index of the next user to fetch. Return True if
some users were returned, False otherwise. */
-#define MAX_FETCH_SAM_ENTRIES 100
-
static BOOL get_sam_user_entries(struct getent_state *ent)
{
NTSTATUS status;
uint32 num_entries;
- SAM_DISPINFO_1 info1;
- SAM_DISPINFO_CTR ctr;
+ WINBIND_USERINFO *info;
struct getpwent_user *name_list = NULL;
- uint32 group_rid;
+ BOOL result = False;
+ TALLOC_CTX *mem_ctx;
+ struct winbindd_domain *domain;
+ struct winbindd_methods *methods;
+ unsigned int i;
- if (ent->got_all_sam_entries)
+ if (ent->num_sam_entries)
return False;
- ZERO_STRUCT(info1);
- ZERO_STRUCT(ctr);
-
- ctr.sam.info1 = &info1;
+ if (!(mem_ctx = talloc_init("get_sam_user_entries(%s)",
+ ent->domain_name)))
+ return False;
-#if 0
- /* Look in cache for entries, else get them direct */
-
- if (winbindd_fetch_user_cache(ent->domain,
- (struct getpwent_user **)
- &ent->sam_entries,
- &ent->num_sam_entries)) {
- return True;
+ 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;
}
-#endif
-
- /* For the moment we set the primary group for every user to be the
- Domain Users group. There are serious problems with determining
- the actual primary group for large domains. This should really
- be made into a 'winbind force group' smb.conf parameter or
- something like that. */
- group_rid = DOMAIN_GROUP_RID_USERS;
+ methods = domain->methods;
/* Free any existing user info */
SAFE_FREE(ent->sam_entries);
ent->num_sam_entries = 0;
- /* Call query_dispinfo to get a list of usernames and user rids */
+ /* Call query_user_list to get a list of usernames and user rids */
- do {
- int i;
-
- num_entries = 0;
+ num_entries = 0;
- status = winbindd_query_dispinfo(ent->domain, ent->mem_ctx,
- &ent->dispinfo_ndx, 1,
- &num_entries, &ctr);
+ status = methods->query_user_list(domain, mem_ctx, &num_entries,
+ &info);
- if (num_entries) {
- struct getpwent_user *tnl;
-
- tnl = (struct getpwent_user *)Realloc(name_list,
- sizeof(struct getpwent_user) *
- (ent->num_sam_entries +
- num_entries));
-
- if (!tnl) {
- DEBUG(0,("get_sam_user_entries: Realloc failed.\n"));
- SAFE_FREE(name_list);
- return WINBINDD_ERROR;
- } else
- name_list = tnl;
- }
-
- for (i = 0; i < num_entries; i++) {
-
- /* Store account name and gecos */
-
- unistr2_to_ascii(
- name_list[ent->num_sam_entries + i].name,
- &info1.str[i].uni_acct_name,
- sizeof(fstring));
-
- unistr2_to_ascii(
- name_list[ent->num_sam_entries + i].gecos,
- &info1.str[i].uni_full_name,
- sizeof(fstring));
-
- /* User and group ids */
-
- name_list[ent->num_sam_entries + i].user_rid =
- info1.sam[i].rid_user;
-
- name_list[ent->num_sam_entries + i].
- group_rid = group_rid;
- }
+ if (num_entries) {
+ struct getpwent_user *tnl;
- ent->num_sam_entries += num_entries;
+ tnl = SMB_REALLOC_ARRAY(name_list, struct getpwent_user, ent->num_sam_entries + num_entries);
+
+ if (!tnl) {
+ DEBUG(0,("get_sam_user_entries realloc failed.\n"));
+ SAFE_FREE(name_list);
+ goto done;
+ } else
+ name_list = tnl;
+ }
- if (NT_STATUS_V(status) != NT_STATUS_V(STATUS_MORE_ENTRIES)) {
- break;
+ 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);
}
-
- } while (ent->num_sam_entries < MAX_FETCH_SAM_ENTRIES);
-
-#if 0
- /* Fill cache with received entries */
+ 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);
+ }
+
+ /* 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;
- winbindd_store_user_cache(ent->domain, ent->sam_entries,
- ent->num_sam_entries);
-#endif
-
/* Fill in remaining fields */
ent->sam_entries = name_list;
ent->sam_entry_index = 0;
- ent->got_all_sam_entries = (NT_STATUS_V(status) != NT_STATUS_V(STATUS_MORE_ENTRIES));
+ result = ent->num_sam_entries > 0;
+
+ done:
+
+ talloc_destroy(mem_ctx);
- return ent->num_sam_entries > 0;
+ return result;
}
/* Fetch next passwd entry from ntdom database */
struct getent_state *ent;
struct winbindd_pw *user_list;
int num_users, user_list_ndx = 0, i;
- char *sep;
- DEBUG(3, ("[%5d]: getpwent\n", state->pid));
+ DEBUG(3, ("[%5lu]: getpwent\n", (unsigned long)state->pid));
/* Check user has enabled this */
num_users = MIN(MAX_GETPWENT_USERS, state->request.data.num_entries);
- if ((state->response.extra_data =
- malloc(num_users * sizeof(struct winbindd_pw))) == NULL)
+ if ((state->response.extra_data = SMB_MALLOC_ARRAY(struct winbindd_pw, num_users)) == NULL)
return WINBINDD_ERROR;
memset(state->response.extra_data, 0, num_users *
sizeof(struct winbindd_pw));
user_list = (struct winbindd_pw *)state->response.extra_data;
- sep = lp_winbind_separator();
+
+ if (!state->getpwent_initialized)
+ winbindd_setpwent(state);
if (!(ent = state->getpwent_state))
return WINBINDD_ERROR;
for (i = 0; i < num_users; i++) {
struct getpwent_user *name_list = NULL;
- fstring domain_user_name;
uint32 result;
/* Do we need to fetch another chunk of users? */
/* No more domains */
if (!ent)
- break;
+ break;
}
name_list = ent->sam_entries;
- /* Skip machine accounts */
-
- if (name_list[ent->sam_entry_index].
- name[strlen(name_list[ent->sam_entry_index].name) - 1]
- == '$') {
- ent->sam_entry_index++;
- continue;
- }
-
/* Lookup user info */
- slprintf(domain_user_name, sizeof(domain_user_name) - 1,
- "%s%s%s", ent->domain->name, sep,
- name_list[ent->sam_entry_index].name);
-
result = winbindd_fill_pwent(
- ent->domain->name,
- domain_user_name,
- name_list[ent->sam_entry_index].user_rid,
- name_list[ent->sam_entry_index].group_rid,
+ 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,
&user_list[user_list_ndx]);
} else
DEBUG(1, ("could not lookup domain user %s\n",
- domain_user_name));
+ name_list[ent->sam_entry_index].name));
}
/* Out of domains */
enum winbindd_result winbindd_list_users(struct winbindd_cli_state *state)
{
struct winbindd_domain *domain;
- SAM_DISPINFO_CTR ctr;
- SAM_DISPINFO_1 info1;
+ WINBIND_USERINFO *info;
+ const char *which_domain;
uint32 num_entries = 0, total_entries = 0;
char *ted, *extra_data = NULL;
int extra_data_len = 0;
- TALLOC_CTX *mem_ctx;
- enum winbindd_result rv = WINBINDD_ERROR;
+ TALLOC_CTX *mem_ctx;
+ enum winbindd_result rv = WINBINDD_ERROR;
- DEBUG(3, ("[%5d]: list users\n", state->pid));
+ DEBUG(3, ("[%5lu]: list users\n", (unsigned long)state->pid));
- if (!(mem_ctx = talloc_init()))
- return WINBINDD_ERROR;
+ if (!(mem_ctx = talloc_init("winbindd_list_users")))
+ return WINBINDD_ERROR;
+ /* Ensure null termination */
+ state->request.domain_name[sizeof(state->request.domain_name)-1]='\0';
+ which_domain = state->request.domain_name;
+
/* Enumerate over trusted domains */
- ctr.sam.info1 = &info1;
-
- for (domain = domain_list; domain; domain = domain->next) {
+ for (domain = domain_list(); domain; domain = domain->next) {
NTSTATUS status;
- uint32 start_ndx = 0;
-
- /* Skip domains other than WINBINDD_DOMAIN environment
- variable */
-
- if ((strcmp(state->request.domain, "") != 0) &&
- !check_domain_env(state->request.domain, domain->name))
+ struct winbindd_methods *methods;
+ unsigned int i;
+
+ /* if we have a domain name restricting the request and this
+ one in the list doesn't match, then just bypass the remainder
+ of the loop */
+
+ if ( *which_domain && !strequal(which_domain, domain->name) )
continue;
+
+ methods = domain->methods;
/* Query display info */
+ status = methods->query_user_list(domain, mem_ctx,
+ &num_entries, &info);
- do {
- int i;
-
- status = winbindd_query_dispinfo(
- domain, mem_ctx, &start_ndx,
- 1, &num_entries, &ctr);
-
- if (num_entries == 0)
- continue;
-
- /* Allocate some memory for extra data */
+ if (num_entries == 0)
+ continue;
- total_entries += num_entries;
+ /* Allocate some memory for extra data */
+ total_entries += num_entries;
- ted = Realloc(extra_data, sizeof(fstring) *
- total_entries);
+ ted = SMB_REALLOC(extra_data, sizeof(fstring) * total_entries);
- if (!ted) {
- DEBUG(0,("winbindd_list_users: failed to enlarge buffer!\n"));
- SAFE_FREE(extra_data);
- goto done;
- } else
- extra_data = ted;
+ if (!ted) {
+ DEBUG(0,("failed to enlarge buffer!\n"));
+ SAFE_FREE(extra_data);
+ goto done;
+ } else
+ extra_data = ted;
- /* Pack user list into extra data fields */
+ /* Pack user list into extra data fields */
- for (i = 0; i < num_entries; i++) {
- UNISTR2 *uni_acct_name;
- fstring acct_name, name;
-
- /* Convert unistring to ascii */
-
- uni_acct_name = &ctr.sam.info1->str[i].
- uni_acct_name;
- unistr2_to_ascii(acct_name, uni_acct_name,
- sizeof(acct_name) - 1);
-
- slprintf(name, sizeof(name) - 1, "%s%s%s",
- domain->name, lp_winbind_separator(),
- acct_name);
-
- /* Append to extra data */
+ for (i = 0; i < num_entries; i++) {
+ fstring acct_name, name;
- memcpy(&extra_data[extra_data_len], name,
- strlen(name));
- extra_data_len += strlen(name);
-
- extra_data[extra_data_len++] = ',';
- }
- } while (NT_STATUS_V(status) == NT_STATUS_V(STATUS_MORE_ENTRIES));
+ if (!info[i].acct_name) {
+ fstrcpy(acct_name, "");
+ } else {
+ fstrcpy(acct_name, info[i].acct_name);
+ }
+
+ fill_domain_username(name, domain->name, acct_name);
+
+ /* Append to extra data */
+ memcpy(&extra_data[extra_data_len], name,
+ strlen(name));
+ extra_data_len += strlen(name);
+ extra_data[extra_data_len++] = ',';
+ }
}
/* Assign extra_data fields in response structure */
rv = WINBINDD_OK;
done:
- talloc_destroy(mem_ctx);
- return rv;
+ talloc_destroy(mem_ctx);
+
+ return rv;
}
git.samba.org / tprouty / samba.git / blobdiff