diff options
| author | Andrew Tridgell <tridge@samba.org> | 2000-05-12 06:27:34 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2000-05-12 06:27:34 +0000 |
| commit | 7738941ccf4ebcaccea872619c465a45fb7bf0ae (patch) | |
| tree | 3f8cce962e99bb7c3ca83bea12db842704e72d52 /source3/nsswitch/winbindd_group.c | |
| parent | a17db82c63b1c39014e2c26145e28f22d5b74307 (diff) | |
| download | samba-7738941ccf4ebcaccea872619c465a45fb7bf0ae.tar.gz samba-7738941ccf4ebcaccea872619c465a45fb7bf0ae.tar.bz2 samba-7738941ccf4ebcaccea872619c465a45fb7bf0ae.zip | |
use "winbind separator" in tng as well
(This used to be commit 0189af544244d7d20e4042cd1238f370968cb7a9)
Diffstat (limited to 'source3/nsswitch/winbindd_group.c')
| -rw-r--r-- | source3/nsswitch/winbindd_group.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source3/nsswitch/winbindd_group.c b/source3/nsswitch/winbindd_group.c index db94bab836..e96947b7e6 100644 --- a/source3/nsswitch/winbindd_group.c +++ b/source3/nsswitch/winbindd_group.c @@ -271,7 +271,7 @@ static BOOL winbindd_fill_grent_mem(struct winbindd_domain *domain, /* Create name */ slprintf(entry->name, sizeof(entry->name), - "%s/%s", name_dom, name_user); + "%s%s%s", name_dom, lp_winbind_separator(), name_user); /* Add to list */ @@ -562,7 +562,9 @@ enum winbindd_result winbindd_getgrnam_from_gid(struct winbindd_cli_state return WINBINDD_ERROR; } - string_sub(group_name, "\\", "/", sizeof(fstring)); + if (strcmp(lp_winbind_separator(),"\\")) { + string_sub(group_name, "\\", lp_winbind_separator(), sizeof(fstring)); + } if (!((name_type == SID_NAME_ALIAS) || (name_type == SID_NAME_DOM_GRP))) { DEBUG(1, ("from_gid: name '%s' is not a local or domain group: %d\n", @@ -716,7 +718,7 @@ enum winbindd_result winbindd_getgrent(struct winbindd_cli_state *state) /* Prepend domain to name */ slprintf(domain_group_name, sizeof(domain_group_name), - "%s/%s", ent->domain->name, group_name); + "%s%s%s", ent->domain->name, lp_winbind_separator(), group_name); /* Get group entry from group name */ |