sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-22 22:04:08 +03:00
Code

s3: libsmb: Cleanup - put talloc parameter first in name_resolve_bcast().

Browse Source 
No logic changes.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Isaac Boukris <iboukris@samba.org>
This commit is contained in:
Jeremy Allison 2020-07-20 17:56:48 -07:00 committed by Isaac Boukris
parent cef158a75c
commit eaea3c0a62
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source3/libsmb/libsmb_dir.c
View File

@ -606,8 +606,11 @@ SMBC_opendir_ctx(SMBCCTX *context,
*/
ip_list = NULL;
status = name_resolve_bcast(MSBROWSE, 1, talloc_tos(),
&ip_list, &count);
status = name_resolve_bcast(talloc_tos(),
MSBROWSE,
1,
&ip_list,
&count);
if (!NT_STATUS_IS_OK(status))
{

6
source3/libsmb/namequery.c
View File

@ -1909,9 +1909,9 @@ NTSTATUS name_resolve_bcast_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
return NT_STATUS_OK;
}
NTSTATUS name_resolve_bcast(const char *name,
NTSTATUS name_resolve_bcast(TALLOC_CTX *mem_ctx,
const char *name,
int name_type,
TALLOC_CTX *mem_ctx,
struct sockaddr_storage **return_iplist,
int *return_count)
{
@ -2763,9 +2763,9 @@ NTSTATUS internal_resolve_name(const char *name,
} else if (strequal(tok, "bcast")) {
struct sockaddr_storage *ss_list = NULL;
status = name_resolve_bcast(
talloc_tos(),
name,
name_type,
talloc_tos(),
&ss_list,
return_count);
if (!NT_STATUS_IS_OK(status)) {

4
source3/libsmb/namequery.h
View File

@ -68,9 +68,9 @@ struct tevent_req *name_resolve_bcast_send(TALLOC_CTX *mem_ctx,
NTSTATUS name_resolve_bcast_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
struct sockaddr_storage **addrs,
int *num_addrs);
NTSTATUS name_resolve_bcast(const char *name,
NTSTATUS name_resolve_bcast(TALLOC_CTX *mem_ctx,
const char *name,
int name_type,
TALLOC_CTX *mem_ctx,
struct sockaddr_storage **return_iplist,
int *return_count);
struct tevent_req *resolve_wins_send(TALLOC_CTX *mem_ctx,

8
source3/utils/nmblookup.c
View File

@ -171,9 +171,11 @@ static bool query_one(const char *lookup, unsigned int lookup_type)
&bcast_addr, talloc_tos(),
&ip_list, &count, &flags);
} else {
status = name_resolve_bcast(
lookup, lookup_type,
talloc_tos(), &ip_list, &count);
status = name_resolve_bcast(talloc_tos(),
lookup,
lookup_type,
&ip_list,
&count);
}
if (!NT_STATUS_IS_OK(status)) {