Back out some of the less well thought out ideas from last weeks work on

winbind default domains, particulary now I understand whats going on a lot
better.  This ensures that the RPC client code does as little 'magic' as
possible - this is up to the application/user.  (Where - for to name->sid code
- it was all along).  This leaves the change that allows the sid->name code to
return domains and usernames in seperate paramaters.

Andrew Bartlett
(This used to be commit 5dfba2cf536f761b0aee314ed9e30dc53900b691)

1 files changed, 3 insertions, 11 deletions

diff --git a/source3/rpc_parse/parse_lsa.c b/source3/rpc_parse/parse_lsa.c
index ae6068e3d6..a70d1e98a9 100644
--- a/source3/rpc_parse/parse_lsa.c
+++ b/source3/rpc_parse/parse_lsa.c
@@ -1045,7 +1045,7 @@ makes a structure.
 ********************************************************************/
 
 void init_q_lookup_names(TALLOC_CTX *mem_ctx, LSA_Q_LOOKUP_NAMES *q_l, 
-			 POLICY_HND *hnd, int num_names, const char **dom_names, const char **names)
+			 POLICY_HND *hnd, int num_names, const char **names)
 {
 	int i;
 
@@ -1071,19 +1071,11 @@ void init_q_lookup_names(TALLOC_CTX *mem_ctx, LSA_Q_LOOKUP_NAMES *q_l,
 	}
 
 	for (i = 0; i < num_names; i++) {
-		char *full_name;
 		int len;
-
-		full_name = talloc_asprintf(mem_ctx, "%s\\%s", dom_names[i], names[i]);
-		if (!full_name) {
-			DEBUG(0, ("init_q_lookup_names(): out of memory doing talloc_asprintf\n"));
-			return;
-		}
-
-		len = strlen(full_name);
+		len = strlen(names[i]);
 
 		init_uni_hdr(&q_l->hdr_name[i], len);
-		init_unistr2(&q_l->uni_name[i], full_name, len);
+		init_unistr2(&q_l->uni_name[i], names[i], len);
 	}
 }