[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-1303-g2e75f3e

[Jeremy Allison]

The branch, v3-2-test has been updated
       via  2e75f3ecdf9890b9d7d4bd03f3fa15ef74816d5d (commit)
      from  ecb52f50fe3ec8beda48b6c88e9a3ae5a6a98d52 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 2e75f3ecdf9890b9d7d4bd03f3fa15ef74816d5d
Author: Jeremy Allison <jra at samba.org>
Date:   Sat Jan 12 00:05:07 2008 -0800

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

-----------------------------------------------------------------------

Summary of changes:
 source/libsmb/namequery.c |   13 +++----------
 1 files changed, 3 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/libsmb/namequery.c b/source/libsmb/namequery.c
index 853fe97..ad999b3 100644
--- a/source/libsmb/namequery.c
+++ b/source/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 */


-- 
Samba Shared Repository