sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

s3: libsmb: Pass in TALLOC_CTX * parameter to resolve_ads() instead of creating one internally.

Browse Source 
Pass in talloc_tos() to make it match the other resolve_XXX() functions.

No memory leaks as this is used for transient data and is cleaned up
when the calling frame in internal_resolve_name() is destroyed.

Preparing to have it return a talloc'ed struct sockaddr_storage array
rather than a malloc'ed struct ip_service array.

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:59:20 -07:00 committed by Isaac Boukris
parent 2297c883b5
commit 97781fe0ae
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source3/libsmb/namequery.c
View File

@ -2375,7 +2375,8 @@ static NTSTATUS resolve_hosts(TALLOC_CTX *mem_ctx,
/* Special name type used to cause a _kerberos DNS lookup. */
#define KDC_NAME_TYPE 0xDCDC
static NTSTATUS resolve_ads(const char *name,
static NTSTATUS resolve_ads(TALLOC_CTX *ctx,
const char *name,
int name_type,
const char *sitename,
struct ip_service **return_iplist,
@ -2383,7 +2384,6 @@ static NTSTATUS resolve_ads(const char *name,
{
int i;
NTSTATUS status;
TALLOC_CTX *ctx;
struct dns_rr_srv *dcs = NULL;
int numdcs = 0;
int numaddrs = 0;
@ -2393,11 +2393,6 @@ static NTSTATUS resolve_ads(const char *name,
return NT_STATUS_INVALID_PARAMETER;
}
if ( (ctx = talloc_init("resolve_ads")) == NULL ) {
DEBUG(0,("resolve_ads: talloc_init() failed!\n"));
return NT_STATUS_NO_MEMORY;
}
switch (name_type) {
case 0x1b:
DEBUG(5,("resolve_ads: Attempting to resolve "
@ -2432,14 +2427,12 @@ static NTSTATUS resolve_ads(const char *name,
}
if ( !NT_STATUS_IS_OK( status ) ) {
talloc_destroy(ctx);
return status;
}
if (numdcs == 0) {
*return_iplist = NULL;
*return_count = 0;
talloc_destroy(ctx);
return NT_STATUS_OK;
}
@ -2455,7 +2448,6 @@ static NTSTATUS resolve_ads(const char *name,
NULL ) {
DEBUG(0,("resolve_ads: malloc failed for %d entries\n",
numaddrs ));
talloc_destroy(ctx);
return NT_STATUS_NO_MEMORY;
}
@ -2497,7 +2489,6 @@ static NTSTATUS resolve_ads(const char *name,
if (res) {
freeaddrinfo(res);
}
talloc_destroy(ctx);
return NT_STATUS_NO_MEMORY;
}
}
@ -2536,7 +2527,6 @@ static NTSTATUS resolve_ads(const char *name,
}
}
talloc_destroy(ctx);
return NT_STATUS_OK;
}
@ -2694,7 +2684,8 @@ NTSTATUS internal_resolve_name(const char *name,
} else if(strequal( tok, "kdc")) {
/* deal with KDC_NAME_TYPE names here.
* This will result in a SRV record lookup */
status = resolve_ads(name,
status = resolve_ads(talloc_tos(),
name,
KDC_NAME_TYPE,
sitename,
return_iplist,
@ -2709,7 +2700,8 @@ NTSTATUS internal_resolve_name(const char *name,
} else if(strequal( tok, "ads")) {
/* deal with 0x1c and 0x1b names here.
* This will result in a SRV record lookup */
status = resolve_ads(name,
status = resolve_ads(talloc_tos(),
name,
name_type,
sitename,
return_iplist,