[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-3042-g242077f

[Volker Lendecke]

The branch, v3-3-test has been updated
       via  242077f714c738642edd125449ab5c89748bcecd (commit)
      from  e072b3667e590ba6dd1d9a47fb616a53753fa83e (commit)

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


- Log -----------------------------------------------------------------
commit 242077f714c738642edd125449ab5c89748bcecd
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Jun 28 10:38:33 2008 +0200

    Fix the build

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

Summary of changes:
 source/utils/net_rpc.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/utils/net_rpc.c b/source/utils/net_rpc.c
index 32900b4..d777018 100644
--- a/source/utils/net_rpc.c
+++ b/source/utils/net_rpc.c
@@ -5648,7 +5648,8 @@ static NTSTATUS rpc_trustdom_add_internals(struct net_context *c,
 	unsigned int orig_timeout;
 
 	if (argc != 2) {
-		d_printf("Usage: net rpc trustdom add <domain_name> <trust password>\n")
+		d_printf("Usage: net rpc trustdom add <domain_name> "
+			 "<trust password>\n");
 		return NT_STATUS_INVALID_PARAMETER;
 	}
 
@@ -5686,7 +5687,7 @@ static NTSTATUS rpc_trustdom_add_internals(struct net_context *c,
         /* This call can take a long time - allow the server to time out.
 	 * 35 seconds should do it. */
 
-        orig_timeout = cli_set_timeout(pipe_hnd->cli, 35000);
+        orig_timeout = rpccli_set_timeout(pipe_hnd, 35000);
 
 	/* Create trusting domain's account */
 	acb_info = ACB_NORMAL;
@@ -5706,7 +5707,7 @@ static NTSTATUS rpc_trustdom_add_internals(struct net_context *c,
 					 &user_rid);
 
 	/* And restore our original timeout. */
-	cli_set_timeout(pipe_hnd->cli, orig_timeout);
+	rpccli_set_timeout(pipe_hnd, orig_timeout);
 
 	if (!NT_STATUS_IS_OK(result)) {
 		d_printf("net rpc trustdom add: create user %s failed %s\n",


-- 
Samba Shared Repository