summaryrefslogtreecommitdiff
path: root/source3/libsmb
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2008-01-12 00:05:07 -0800
committerJeremy Allison <jra@samba.org>2008-01-12 00:05:07 -0800
commit76d904e6d84ea41d824f2ecb4682d84718ff1bdd (patch)
tree4f39155d985c6ddb5d85092b37d46ab368c8858d /source3/libsmb
parentff98a654d613daad484023250c6619ce09917f6e (diff)
downloadsamba-76d904e6d84ea41d824f2ecb4682d84718ff1bdd.tar.gz
samba-76d904e6d84ea41d824f2ecb4682d84718ff1bdd.tar.bz2
samba-76d904e6d84ea41d824f2ecb4682d84718ff1bdd.zip
Fix CID 470. resolve_order can't be NULL here so simplify code.
Jeremy. (This used to be commit 2e75f3ecdf9890b9d7d4bd03f3fa15ef74816d5d)
Diffstat (limited to 'source3/libsmb')
-rw-r--r--source3/libsmb/namequery.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c
index 853fe979b7..ad999b34b4 100644
--- a/source3/libsmb/namequery.c
+++ b/source3/libsmb/namequery.c
@@ -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 */