sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

s3-lib: Fix %G substitution in AD member environment

Browse Source 
If we are a domain member we should look up the user with the domain
name specified else it will only work if we have
'winbind use default domain' set.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=12276

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
This commit is contained in:
Andreas Schneider 2016-09-19 13:59:54 +02:00 committed by Andreas Schneider
parent dd5c44b98d
commit 619ca5f63c
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
source3/lib/substitute.c
View File

@ -499,15 +499,18 @@ char *talloc_sub_basic(TALLOC_CTX *mem_ctx,
break;
case 'G' : {
struct passwd *pass;
bool is_domain_name = false;
const char *sep = lp_winbind_separator();
if (domain_name != NULL && domain_name[0] != '\0' &&
!strequal(domain_name, my_sam_name()))
{
(lp_security() == SEC_ADS ||
lp_security() == SEC_DOMAIN)) {
r = talloc_asprintf(tmp_ctx,
"%s%c%s",
domain_name,
*lp_winbind_separator(),
*sep,
smb_name);
is_domain_name = true;
} else {
r = talloc_strdup(tmp_ctx, smb_name);
}
@ -517,9 +520,18 @@ char *talloc_sub_basic(TALLOC_CTX *mem_ctx,
pass = Get_Pwnam_alloc(tmp_ctx, r);
if (pass != NULL) {
a_string = realloc_string_sub(
a_string, "%G",
gidtoname(pass->pw_gid));
char *group_name;
group_name = gidtoname(pass->pw_gid);
if (is_domain_name) {
p = strchr_m(group_name, *sep);
if (p != NULL) {
group_name = p + 1;
}
}
a_string = realloc_string_sub(a_string,
"%G",
group_name);
}
TALLOC_FREE(pass);
break;