diff options
author | Tim Potter <tpot@samba.org> | 2002-04-15 05:02:22 +0000 |
---|---|---|
committer | Tim Potter <tpot@samba.org> | 2002-04-15 05:02:22 +0000 |
commit | d9cfe0f3ebdcf053f79ee0bbba59d4dbe2831145 (patch) | |
tree | bdffbae91c0eef28bad9e1b3b092bc766d9f3150 /source3/utils | |
parent | 59a04032c86a9304156946c6f71bb4b1375ab81b (diff) | |
download | samba-d9cfe0f3ebdcf053f79ee0bbba59d4dbe2831145.tar.gz samba-d9cfe0f3ebdcf053f79ee0bbba59d4dbe2831145.tar.bz2 samba-d9cfe0f3ebdcf053f79ee0bbba59d4dbe2831145.zip |
Merge of lsa lookup names/sids patch from HEAD.
(This used to be commit e57c162897d4a7e66bb87091d179ac138f751c64)
Diffstat (limited to 'source3/utils')
-rw-r--r-- | source3/utils/smbcacls.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c index 8c0b2a4a72..017f4035b0 100644 --- a/source3/utils/smbcacls.c +++ b/source3/utils/smbcacls.c @@ -108,7 +108,6 @@ static void SidToString(fstring str, DOM_SID *sid) char **domains = NULL; char **names = NULL; uint32 *types = NULL; - int num_names; sid_to_string(str, sid); @@ -118,8 +117,8 @@ static void SidToString(fstring str, DOM_SID *sid) if (!cacls_open_policy_hnd() || !NT_STATUS_IS_OK(cli_lsa_lookup_sids(&lsa_cli, lsa_cli.mem_ctx, - &pol, 1, sid, &domains, &names, - &types, &num_names)) || + &pol, 1, sid, &domains, + &names, &types)) || !domains || !domains[0] || !names || !names[0]) { return; } @@ -137,7 +136,6 @@ static BOOL StringToSid(DOM_SID *sid, const char *str) { uint32 *types = NULL; DOM_SID *sids = NULL; - int num_sids; BOOL result = True; if (strncmp(str, "S-", 2) == 0) { @@ -145,9 +143,9 @@ static BOOL StringToSid(DOM_SID *sid, const char *str) } if (!cacls_open_policy_hnd() || - !NT_STATUS_IS_OK(cli_lsa_lookup_names(&lsa_cli, lsa_cli.mem_ctx, &pol, 1, - &str, - &sids, &types, &num_sids))) { + !NT_STATUS_IS_OK(cli_lsa_lookup_names(&lsa_cli, lsa_cli.mem_ctx, + &pol, 1, &str, &sids, + &types))) { result = False; goto done; } |