sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-12 09:18:10 +03:00
Code

r10262: * Fix for getgrnam not returning builtin group (which is done by getent

Browse Source 
group)
* Give a better debug message when returning builtin groups.

Guenther
(This used to be commit ec79971dc7)
This commit is contained in:
Günther Deschner 2005-09-16 13:01:25 +00:00 committed by Gerald (Jerry) Carter
parent fdcc645973
commit 9cc1892865
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source3/nsswitch/winbindd_group.c
View File

@ -259,9 +259,10 @@ void winbindd_getgrnam(struct winbindd_cli_state *state)
if ( !((name_type==SID_NAME_DOM_GRP) ||
((name_type==SID_NAME_ALIAS) && domain->primary) ||
((name_type==SID_NAME_ALIAS) && domain->internal)) )
((name_type==SID_NAME_ALIAS) && domain->internal) ||
((name_type==SID_NAME_WKN_GRP) && domain->internal)) )
{
DEBUG(1, ("name '%s' is not a local or domain group: %d\n",
DEBUG(1, ("name '%s' is not a local, domain or builtin group: %d\n",
name_group, name_type));
request_error(state);
return;
@ -518,7 +519,8 @@ static BOOL get_sam_group_entries(struct getent_state *ent)
if ( ( lp_security() != SEC_ADS && domain->native_mode
&& domain->primary) || domain->internal )
{
DEBUG(4,("get_sam_group_entries: Native Mode 2k domain; enumerating local groups as well\n"));
DEBUG(4,("get_sam_group_entries: %s domain; enumerating local groups as well\n",
domain->native ? "Native Mode 2k":"BUILTIN"));
status = domain->methods->enum_local_groups(domain, mem_ctx, &num_entries, &sam_grp_entries);

2
source3/nsswitch/winbindd_util.c
View File

@ -805,7 +805,7 @@ static BOOL assume_domain(const char *domain) {
return False;
}
/* Parse a string of the form DOMAIN/user into a domain and a user */
/* Parse a string of the form DOMAIN\user into a domain and a user */
BOOL parse_domain_user(const char *domuser, fstring domain, fstring user)
{