From: Tim Potter <tpot@samba.org> 
Date: Fri, 20 Jul 2001 01:35:00 +0000 (+0000)
Subject: Changed the cli_lsa_lookup_sids() function to unpack the domain and user or
X-Git-Tag: samba-2.2.5pre1~1779^2~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2accab2589d8c3decc489fb6af8d65d437a506e7;p=thirdparty%2Fsamba.git

Changed the cli_lsa_lookup_sids() function to unpack the domain and user or
group using rpcstr_pull_unistr2_fstring rather than pull_ascii_fstring (!!)
---

diff --git a/source/libsmb/cli_lsarpc.c b/source/libsmb/cli_lsarpc.c
index 61afeb7f38a..4f015f20f09 100644
--- a/source/libsmb/cli_lsarpc.c
+++ b/source/libsmb/cli_lsarpc.c
@@ -268,15 +268,19 @@ uint32 cli_lsa_lookup_sids(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 		/* Translate optimised name through domain index array */
 
 		if (dom_idx != 0xffffffff) {
-			pull_ascii_fstring(dom_name, &ref.ref_dom[dom_idx].uni_dom_name);
-			pull_ascii_fstring(name, &t_names.uni_name[i]);
+
+			rpcstr_pull_unistr2_fstring(
+                                dom_name, &ref.ref_dom[dom_idx].uni_dom_name);
+			rpcstr_pull_unistr2_fstring(
+                                name, &t_names.uni_name[i]);
 
 			slprintf(full_name, sizeof(full_name) - 1,
 				 "%s%s%s", dom_name, dom_name[0] ? 
-				 "\\" : "", name);
+				 lp_winbind_separator() : "", name);
 
 			(*names)[i] = talloc_strdup(mem_ctx, full_name);
 			(*types)[i] = t_names.name[i].sid_name_use;
+
 		} else {
 			(*names)[i] = NULL;
 			(*types)[i] = SID_NAME_UNKNOWN;