diff options
| author | Günther Deschner <gd@samba.org> | 2005-09-16 13:01:25 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:03:39 -0500 |
| commit | 9cc189286585b42941f191ea63d6ddf041ecc7ed (patch) | |
| tree | 483c29e7925c525795b7c98e74e00f0e925423f6 | |
| parent | fdcc645973dfc8cd5c3eba55ca5d676fef348c99 (diff) | |
| download | samba-9cc189286585b42941f191ea63d6ddf041ecc7ed.tar.gz samba-9cc189286585b42941f191ea63d6ddf041ecc7ed.tar.bz2 samba-9cc189286585b42941f191ea63d6ddf041ecc7ed.zip | |
r10262: * Fix for getgrnam not returning builtin group (which is done by getent
group)
* Give a better debug message when returning builtin groups.
Guenther
(This used to be commit ec79971dc7606c1dfea3acf87cd19fa4153ae417)
| -rw-r--r-- | source3/nsswitch/winbindd_group.c | 8 | ||||
| -rw-r--r-- | source3/nsswitch/winbindd_util.c | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/source3/nsswitch/winbindd_group.c b/source3/nsswitch/winbindd_group.c index cc8af6adcf..157b663acc 100644 --- a/source3/nsswitch/winbindd_group.c +++ b/source3/nsswitch/winbindd_group.c @@ -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); diff --git a/source3/nsswitch/winbindd_util.c b/source3/nsswitch/winbindd_util.c index 14b6f03fd4..46daef63ff 100644 --- a/source3/nsswitch/winbindd_util.c +++ b/source3/nsswitch/winbindd_util.c @@ -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) { |