sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-03 13:47:25 +03:00
Code

r17159: Bug 3920: Restore wnibind use default domain behavior for domain groups.

Browse Source 
This break local users and 'winbind nested groups' on domain members.
Cannot be helped.

My plans is to move the default domain crud to the client code (pam and
nss libraries) in 3.0.24.
This commit is contained in:
Gerald Carter 2006-07-20 18:02:51 +00:00 committed by Gerald (Jerry) Carter
parent 75054e984e
commit 8ee22eeab5
2 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/nsswitch/winbindd_group.c
View File

@ -41,15 +41,8 @@ static BOOL fill_grent(struct winbindd_gr *gr, const char *dom_name,
const char *gr_name, gid_t unix_gid)
{
fstring full_group_name;
BOOL can_assume = False;
/* I *hate* winbind use default domain!!!! Somehow I will figure out
how to remove this parameter. -jerry */
if ( (lp_server_role() == ROLE_DOMAIN_MEMBER) && strequal(dom_name, lp_workgroup() ) )
can_assume = True;
fill_domain_username( full_group_name, dom_name, gr_name, can_assume);
fill_domain_username( full_group_name, dom_name, gr_name, True );
gr->gr_gid = unix_gid;
@ -153,7 +146,7 @@ static BOOL fill_grent_mem(struct winbindd_domain *domain,
/* Append domain name */
fill_domain_username(name, domain->name, the_name, False);
fill_domain_username(name, domain->name, the_name, True);
len = strlen(name);
@ -759,7 +752,7 @@ void winbindd_getgrent(struct winbindd_cli_state *state)
/* Fill in group entry */
fill_domain_username(domain_group_name, ent->domain_name,
name_list[ent->sam_entry_index].acct_name, False);
name_list[ent->sam_entry_index].acct_name, True);
result = fill_grent(&group_list[group_list_ndx],
ent->domain_name,
@ -936,7 +929,7 @@ void winbindd_list_groups(struct winbindd_cli_state *state)
groups.sam_entries)[i].acct_name;
fstring name;
fill_domain_username(name, domain->name, group_name, False);
fill_domain_username(name, domain->name, group_name, True);
/* Append to extra data */
memcpy(&extra_data[extra_data_len], name,
strlen(name));

28
source/nsswitch/winbindd_util.c
View File

@ -812,14 +812,28 @@ BOOL is_in_gid_range(gid_t gid)
/* Is this a domain which we may assume no DOMAIN\ prefix? */
static BOOL assume_domain(const char *domain) {
if ((lp_winbind_use_default_domain()
|| lp_winbind_trusted_domains_only()) &&
strequal(lp_workgroup(), domain))
return True;
static BOOL assume_domain(const char *domain)
{
/* never assume the domain on a standalone server */
if (strequal(get_global_sam_name(), domain))
if ( lp_server_role() == ROLE_STANDALONE )
return False;
/* domain member servers may possibly assume for the domain name */
if ( lp_server_role() == ROLE_DOMAIN_MEMBER ) {
if ( !strequal(lp_workgroup(), domain) )
return False;
if ( lp_winbind_use_default_domain() || lp_winbind_trusted_domains_only() )
return True;
}
/* only left with a domain controller */
if ( strequal(get_global_sam_name(), domain) ) {
return True;
}
return False;
}
@ -832,7 +846,7 @@ BOOL parse_domain_user(const char *domuser, fstring domain, fstring user)
if ( !p ) {
fstrcpy(user, domuser);
if ( assume_domain(lp_workgroup())) {
fstrcpy(domain, lp_workgroup());
} else {