sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

Fix CID 470. resolve_order can't be NULL here so simplify code.

Browse Source 
Jeremy.
This commit is contained in:
Jeremy Allison 2008-01-12 00:05:07 -08:00
parent ecb52f50fe
commit 2e75f3ecdf
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/libsmb/namequery.c
View File

@ -1422,14 +1422,13 @@ NTSTATUS resolve_ads(const char *name,
resolve_hosts() when looking up DC's via SRV RR entries in DNS
**********************************************************************/
NTSTATUS internal_resolve_name(const char *name,
static NTSTATUS internal_resolve_name(const char *name,
int name_type,
const char *sitename,
struct ip_service **return_iplist,
int *return_count,
const char *resolve_order)
{
const char *name_resolve_list;
char *tok;
const char *ptr;
NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
@ -1483,16 +1482,10 @@ NTSTATUS internal_resolve_name(const char *name,
return NT_STATUS_INVALID_PARAMETER;
}
if (!resolve_order) {
name_resolve_list = lp_name_resolve_order();
} else {
name_resolve_list = resolve_order;
}
if (!name_resolve_list[0]) {
if (!resolve_order[0]) {
ptr = "host";
} else {
ptr = name_resolve_list;
ptr = resolve_order;
}
/* iterate through the name resolution backends */