svn commit: samba r26334 - in branches/SAMBA_4_0: . source/librpc/rpc

[jelmer at samba.org]

Author: jelmer
Date: 2007-12-07 13:30:31 +0000 (Fri, 07 Dec 2007)
New Revision: 26334

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26334

Log:
Avoid loadparm_context.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/librpc/rpc/dcerpc_connect.c
   branches/SAMBA_4_0/source/librpc/rpc/dcerpc_secondary.c
   branches/SAMBA_4_0/source/librpc/rpc/dcerpc_sock.c


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/source/librpc/rpc/dcerpc_connect.c
===================================================================
--- branches/SAMBA_4_0/source/librpc/rpc/dcerpc_connect.c	2007-12-07 13:30:23 UTC (rev 26333)
+++ branches/SAMBA_4_0/source/librpc/rpc/dcerpc_connect.c	2007-12-07 13:30:31 UTC (rev 26334)
@@ -308,7 +308,7 @@
 
 	/* send pipe open request on tcp/ip */
 	pipe_req = dcerpc_pipe_open_tcp_send(s->io.pipe->conn, s->host, s->target_hostname, 
-					     s->port);
+					     s->port, io->name_resolve_order);
 	composite_continue(c, pipe_req, continue_pipe_open_ncacn_ip_tcp, c);
 	return c;
 }

Modified: branches/SAMBA_4_0/source/librpc/rpc/dcerpc_secondary.c
===================================================================
--- branches/SAMBA_4_0/source/librpc/rpc/dcerpc_secondary.c	2007-12-07 13:30:23 UTC (rev 26333)
+++ branches/SAMBA_4_0/source/librpc/rpc/dcerpc_secondary.c	2007-12-07 13:30:31 UTC (rev 26334)
@@ -92,7 +92,8 @@
 		pipe_tcp_req = dcerpc_pipe_open_tcp_send(s->pipe2->conn,
 							 s->binding->host,
 							 s->binding->target_hostname,
-							 atoi(s->binding->endpoint));
+							 atoi(s->binding->endpoint),
+							 lp_name_resolve_order(global_loadparm));
 		composite_continue(c, pipe_tcp_req, continue_open_tcp, c);
 		return c;
 

Modified: branches/SAMBA_4_0/source/librpc/rpc/dcerpc_sock.c
===================================================================
--- branches/SAMBA_4_0/source/librpc/rpc/dcerpc_sock.c	2007-12-07 13:30:23 UTC (rev 26333)
+++ branches/SAMBA_4_0/source/librpc/rpc/dcerpc_sock.c	2007-12-07 13:30:31 UTC (rev 26334)
@@ -452,7 +452,8 @@
 struct composite_context* dcerpc_pipe_open_tcp_send(struct dcerpc_connection *conn,
 						    const char *server,
 						    const char *target_hostname,
-						    uint32_t port)
+						    uint32_t port,
+						    const char **name_resolve_order)
 {
 	struct composite_context *c;
 	struct pipe_tcp_state *s;
@@ -478,8 +479,7 @@
 	s->conn            = conn;
 
 	make_nbt_name_server(&name, server);
-	resolve_req = resolve_name_send(&name, c->event_ctx, 
-					lp_name_resolve_order(global_loadparm));
+	resolve_req = resolve_name_send(&name, c->event_ctx, name_resolve_order);
 	composite_continue(c, resolve_req, continue_ip_resolve_name, c);
 	return c;
 }