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_user.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_user.c')
| -rw-r--r-- | source3/nsswitch/winbindd_user.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source3/nsswitch/winbindd_user.c b/source3/nsswitch/winbindd_user.c index 3e7cba0118..9a73b0107b 100644 --- a/source3/nsswitch/winbindd_user.c +++ b/source3/nsswitch/winbindd_user.c @@ -207,7 +207,9 @@ enum winbindd_result winbindd_getpwnam_from_uid(struct winbindd_cli_state return WINBINDD_ERROR; } - string_sub(user_name, "\\", "/", sizeof(fstring)); + if (strcmp("\\", lp_winbind_separator())) { + string_sub(user_name, "\\", lp_winbind_separator(), sizeof(fstring)); + } /* Get some user info */ @@ -363,7 +365,7 @@ enum winbindd_result winbindd_getpwent(struct winbindd_cli_state *state) /* Prepend domain to name */ slprintf(domain_user_name, sizeof(domain_user_name), - "%s/%s", ent->domain->name, user_name); + "%s%s%s", ent->domain->name, lp_winbind_separator(), user_name); /* Get passwd entry from user name */ |