diff options
| author | Jeremy Allison <jra@samba.org> | 2020-09-08 13:58:49 -0700 |
|---|---|---|
| committer | Noel Power <npower@samba.org> | 2020-09-15 10:09:37 +0000 |
| commit | e034072c96962754a222b5d4d436db4c4256a7f3 (patch) | |
| tree | bf59097108c8d2e7fb61d8c8aa3bc282379233f0 /libcli | |
| parent | da9c7b193804b6f5259ca13482660f04b7c5dc1b (diff) | |
| download | samba-e034072c96962754a222b5d4d436db4c4256a7f3.tar.gz | |
libcli: nbt: Fix resolve_lmhosts_file_as_sockaddr() to return size_t * count of addresses.
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Noel Power <npower@samba.org>
Diffstat (limited to 'libcli')
| -rw-r--r-- | libcli/nbt/libnbt.h | 2 | ||||
| -rw-r--r-- | libcli/nbt/lmhosts.c | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/libcli/nbt/libnbt.h b/libcli/nbt/libnbt.h index 496b2b91783..204484be73f 100644 --- a/libcli/nbt/libnbt.h +++ b/libcli/nbt/libnbt.h @@ -372,6 +372,6 @@ NTSTATUS resolve_lmhosts_file_as_sockaddr(TALLOC_CTX *mem_ctx, const char *name, int name_type, struct sockaddr_storage **return_iplist, - int *return_count); + size_t *return_count); #endif /* __LIBNBT_H__ */ diff --git a/libcli/nbt/lmhosts.c b/libcli/nbt/lmhosts.c index 7c00567fdba..dd06e70c071 100644 --- a/libcli/nbt/lmhosts.c +++ b/libcli/nbt/lmhosts.c @@ -164,7 +164,7 @@ NTSTATUS resolve_lmhosts_file_as_sockaddr(TALLOC_CTX *mem_ctx, const char *name, int name_type, struct sockaddr_storage **return_iplist, - int *return_count) + size_t *return_count) { /* * "lmhosts" means parse the local lmhosts file. @@ -234,11 +234,6 @@ NTSTATUS resolve_lmhosts_file_as_sockaddr(TALLOC_CTX *mem_ctx, break; } - if ((int)ret_count < 0) { - TALLOC_FREE(ctx); - endlmhosts(fp); - return NT_STATUS_INVALID_PARAMETER; - } *return_count = ret_count; *return_iplist = talloc_move(mem_ctx, &iplist); TALLOC_FREE(ctx); |