summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2001-07-20 06:25:12 +0000
committerTim Potter <tpot@samba.org>2001-07-20 06:25:12 +0000
commit57933a9c6f1a914b69dd38e0346ac17d47f87d45 (patch)
tree813d758ccc03e650e46cf59ca49354fc09fad6d6 /source3
parent8db78af9702dab2e89f1f7adf56996a20a8cb2f4 (diff)
downloadsamba-57933a9c6f1a914b69dd38e0346ac17d47f87d45.tar.gz
samba-57933a9c6f1a914b69dd38e0346ac17d47f87d45.tar.bz2
samba-57933a9c6f1a914b69dd38e0346ac17d47f87d45.zip
In cli_lsa_lookup_sids() don't append a separator character between domain
and name if there is no name. (This used to be commit e0ebbc9ae3277a5a389eef021f32509a017cbd4d)
Diffstat (limited to 'source3')
-rw-r--r--source3/libsmb/cli_lsarpc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/libsmb/cli_lsarpc.c b/source3/libsmb/cli_lsarpc.c
index 4f015f20f0..dcc4a65414 100644
--- a/source3/libsmb/cli_lsarpc.c
+++ b/source3/libsmb/cli_lsarpc.c
@@ -275,7 +275,8 @@ uint32 cli_lsa_lookup_sids(struct cli_state *cli, TALLOC_CTX *mem_ctx,
name, &t_names.uni_name[i]);
slprintf(full_name, sizeof(full_name) - 1,
- "%s%s%s", dom_name, dom_name[0] ?
+ "%s%s%s", dom_name,
+ (dom_name[0] && name[0]) ?
lp_winbind_separator() : "", name);
(*names)[i] = talloc_strdup(mem_ctx, full_name);