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, 2 insertions, 5 deletions

diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index d62907e14b..d2bec218fe 100644
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -140,17 +140,14 @@ static BOOL StringToSid(DOM_SID *sid, const char *str)
 	DOM_SID *sids = NULL;
 	int num_sids;
 	BOOL result = True;
-	fstring name, domain;
-	
+
 	if (strncmp(str, "S-", 2) == 0) {
 		return string_to_sid(sid, str);
 	}
 
-	split_domain_name(str, domain, name);
-
 	if (!cacls_open_policy_hnd() ||
 	    !NT_STATUS_IS_OK(cli_lsa_lookup_names(&lsa_cli, lsa_cli.mem_ctx, &pol, 1, 
-						  (const char **)&domain, (const char **)&name, 
+						  &str, 
 						  &sids, &types, &num_sids))) {
 		result = False;
 		goto done;