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

1 files changed, 1 insertions, 10 deletions

diff --git a/source/rpcclient/cmd_lsarpc.c b/source/rpcclient/cmd_lsarpc.c
index 67efbb1ff73..1b733d25c36 100644
--- a/source/rpcclient/cmd_lsarpc.c
+++ b/source/rpcclient/cmd_lsarpc.c
@@ -80,8 +80,6 @@ static NTSTATUS cmd_lsa_lookup_names(struct cli_state *cli,
 	DOM_SID *sids;
 	uint32 *types;
 	int num_names, i;
-	fstring name, domain;
-	const char *name2, *domain2;
 
 	if (argc == 1) {
 		printf("Usage: %s [name1 [name2 [...]]]\n", argv[0]);
@@ -95,15 +93,8 @@ static NTSTATUS cmd_lsa_lookup_names(struct cli_state *cli,
 	if (!NT_STATUS_IS_OK(result))
 		goto done;
 
-	/* Lookup the names */
-
-	split_domain_name(argv[1], domain, name);
-
-	name2 = talloc_strdup(mem_ctx, name);
-	domain2 = talloc_strdup(mem_ctx, domain);
-
 	result = cli_lsa_lookup_names(cli, mem_ctx, &pol, argc - 1, 
-				      &domain2, &name2, &sids, 
+				      (const char**)(argv + 1), &sids, 
 				      &types, &num_names);
 
 	if (!NT_STATUS_IS_OK(result))