summaryrefslogtreecommitdiff
path: root/source3/utils
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2002-01-26 11:48:42 +0000
committerAndrew Bartlett <abartlet@samba.org>2002-01-26 11:48:42 +0000
commitba8c1c6e459aef204aa93e9cf7e717209335a06b (patch)
tree598da297115b7b43274c4a6980b0f2d0eecd6b06 /source3/utils
parent670f46fd4c6ef8eb338284c820f8560bcece095a (diff)
downloadsamba-ba8c1c6e459aef204aa93e9cf7e717209335a06b.tar.gz
samba-ba8c1c6e459aef204aa93e9cf7e717209335a06b.tar.bz2
samba-ba8c1c6e459aef204aa93e9cf7e717209335a06b.zip
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)
Diffstat (limited to 'source3/utils')
-rw-r--r--source3/utils/smbcacls.c7
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;