diff options
| author | Jeremy Allison <jra@samba.org> | 2001-11-22 08:31:50 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2001-11-22 08:31:50 +0000 |
| commit | 1db30a338cf862c4c4e848472551fde9c8a64e41 (patch) | |
| tree | 85a5d19164e7e947592dcc679e62c5cc746b9fb1 /source3/libsmb | |
| parent | 609cdbfe37712b26a3cb52d711da986a13ccba7b (diff) | |
| download | samba-1db30a338cf862c4c4e848472551fde9c8a64e41.tar.gz samba-1db30a338cf862c4c4e848472551fde9c8a64e41.tar.bz2 samba-1db30a338cf862c4c4e848472551fde9c8a64e41.zip | |
Got positive and negative name caching working correctly with lookupname/lookupsid.
There was a bug in cli_lsa_lookup_name/lookup_sid where NT_STATUS_NONE_MAPPED was
being mapped to NT_STATUS_OK, and also the *wrong* number of entries mapped
was being returned. The correct field is mapped_count, *NOT* num_entries.
Jeremy.
(This used to be commit 9f8c644abc455510c06dbd5dbac49c6270746560)
Diffstat (limited to 'source3/libsmb')
| -rw-r--r-- | source3/libsmb/cli_lsarpc.c | 46 |
1 files changed, 24 insertions, 22 deletions
diff --git a/source3/libsmb/cli_lsarpc.c b/source3/libsmb/cli_lsarpc.c index 046422abc6..4850e2a8bb 100644 --- a/source3/libsmb/cli_lsarpc.c +++ b/source3/libsmb/cli_lsarpc.c @@ -255,36 +255,37 @@ NTSTATUS cli_lsa_lookup_sids(struct cli_state *cli, TALLOC_CTX *mem_ctx, result = r.status; - if (!NT_STATUS_IS_OK(result) && - NT_STATUS_V(result) != NT_STATUS_V(NT_STATUS_FILES_OPEN) && - NT_STATUS_V(result) != NT_STATUS_V(NT_STATUS_NONE_MAPPED)) { - + if (!NT_STATUS_IS_OK(result) && + NT_STATUS_V(result) != NT_STATUS_V(NT_STATUS_FILES_OPEN)) { /* An actual error occured */ goto done; } - result = NT_STATUS_OK; /* Return output parameters */ - (*num_names) = r.names->num_entries; - - if (!((*names) = (char **)talloc(mem_ctx, sizeof(char *) * - r.names->num_entries))) { + if (r.mapped_count == 0) { + result = NT_STATUS_NONE_MAPPED; + goto done; + } + + (*num_names) = r.mapped_count; + result = NT_STATUS_OK; + + if (!((*names) = (char **)talloc(mem_ctx, sizeof(char *) * r.mapped_count))) { DEBUG(0, ("cli_lsa_lookup_sids(): out of memory\n")); result = NT_STATUS_UNSUCCESSFUL; goto done; } - if (!((*types) = (uint32 *)talloc(mem_ctx, sizeof(uint32) * - r.names->num_entries))) { + if (!((*types) = (uint32 *)talloc(mem_ctx, sizeof(uint32) * r.mapped_count))) { DEBUG(0, ("cli_lsa_lookup_sids(): out of memory\n")); result = NT_STATUS_UNSUCCESSFUL; goto done; } - for (i = 0; i < r.names->num_entries; i++) { + for (i = 0; i < r.mapped_count; i++) { fstring name, dom_name, full_name; uint32 dom_idx = t_names.name[i].domain_idx; @@ -361,35 +362,36 @@ NTSTATUS cli_lsa_lookup_names(struct cli_state *cli, TALLOC_CTX *mem_ctx, result = r.status; - if (!NT_STATUS_IS_OK(result) && - NT_STATUS_V(result) != NT_STATUS_V(NT_STATUS_NONE_MAPPED)) { - + if (!NT_STATUS_IS_OK(result)) { /* An actual error occured */ goto done; } - result = NT_STATUS_OK; /* Return output parameters */ - (*num_sids) = r.num_entries; + if (r.mapped_count == 0) { + result = NT_STATUS_NONE_MAPPED; + goto done; + } + + (*num_sids) = r.mapped_count; + result = NT_STATUS_OK; - if (!((*sids = (DOM_SID *)talloc(mem_ctx, sizeof(DOM_SID) * - r.num_entries)))) { + if (!((*sids = (DOM_SID *)talloc(mem_ctx, sizeof(DOM_SID) * r.mapped_count)))) { DEBUG(0, ("cli_lsa_lookup_sids(): out of memory\n")); result = NT_STATUS_UNSUCCESSFUL; goto done; } - if (!((*types = (uint32 *)talloc(mem_ctx, sizeof(uint32) * - r.num_entries)))) { + if (!((*types = (uint32 *)talloc(mem_ctx, sizeof(uint32) * r.mapped_count)))) { DEBUG(0, ("cli_lsa_lookup_sids(): out of memory\n")); result = NT_STATUS_UNSUCCESSFUL; goto done; } - for (i = 0; i < r.num_entries; i++) { + for (i = 0; i < r.mapped_count; i++) { DOM_RID2 *t_rids = r.dom_rid; uint32 dom_idx = t_rids[i].rid_idx; uint32 dom_rid = t_rids[i].rid; |