r26266: Remove more global_loadparm uses.

(This used to be commit 99113075c4a96679bcec4f4d6bba4acb3dee4245)

1 files changed, 4 insertions, 2 deletions

diff --git a/source4/libcli/smb2/connect.c b/source4/libcli/smb2/connect.c
index 6f05d56cd47..7cfaf59a650 100644
--- a/source4/libcli/smb2/connect.c
+++ b/source4/libcli/smb2/connect.c
@@ -163,6 +163,7 @@ static void continue_resolve(struct composite_context *creq)
 struct composite_context *smb2_connect_send(TALLOC_CTX *mem_ctx,
 					    const char *host,
 					    const char *share,
+					    const char **name_resolve_order,
 					    struct cli_credentials *credentials,
 					    struct event_context *ev)
 {
@@ -187,8 +188,7 @@ struct composite_context *smb2_connect_send(TALLOC_CTX *mem_ctx,
 	ZERO_STRUCT(name);
 	name.name = host;
 
-	creq = resolve_name_send(&name, c->event_ctx, 
-				 lp_name_resolve_order(global_loadparm));
+	creq = resolve_name_send(&name, c->event_ctx, name_resolve_order);
 	composite_continue(c, creq, continue_resolve, c);
 	return c;
 }
@@ -215,11 +215,13 @@ NTSTATUS smb2_connect_recv(struct composite_context *c, TALLOC_CTX *mem_ctx,
 */
 NTSTATUS smb2_connect(TALLOC_CTX *mem_ctx, 
 		      const char *host, const char *share,
+		      const char **name_resolve_order,
 		      struct cli_credentials *credentials,
 		      struct smb2_tree **tree,
 		      struct event_context *ev)
 {
 	struct composite_context *c = smb2_connect_send(mem_ctx, host, share, 
+							name_resolve_order,
 							credentials, ev);
 	return smb2_connect_recv(c, mem_ctx, tree);
 }