From: Greg Hudson <ghudson@mit.edu>
Date: Thu, 2 Oct 2008 17:23:54 +0000 (+0000)
Subject: Increase the default RPC timeout for kadmin from 25 seconds to 120
X-Git-Tag: krb5-1.7-alpha1~361
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b8b7bd63231094a3583847853bf60cb002781161;p=krb5.git

Increase the default RPC timeout for kadmin from 25 seconds to 120
seconds.  Code changes from a patch submitted by umich.

ticket: 6120

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20810 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/kadm5/clnt/client_rpc.c b/src/lib/kadm5/clnt/client_rpc.c
index 2823da9a1..2edafcbe5 100644
--- a/src/lib/kadm5/clnt/client_rpc.c
+++ b/src/lib/kadm5/clnt/client_rpc.c
@@ -7,7 +7,7 @@
 #endif
 
 /* Default timeout can be changed using clnt_control() */
-static struct timeval TIMEOUT = { 25, 0 };
+static struct timeval TIMEOUT = { 120, 0 };
 
 generic_ret *
 create_principal_2(cprinc_arg *argp, CLIENT *clnt)
diff --git a/src/lib/rpc/clnt_generic.c b/src/lib/rpc/clnt_generic.c
index 07490eeea..696e5a2e8 100644
--- a/src/lib/rpc/clnt_generic.c
+++ b/src/lib/rpc/clnt_generic.c
@@ -94,7 +94,7 @@ clnt_create(
 		if (client == NULL) {
 			return (NULL);
 		}
-		tv.tv_sec = 25;
+		tv.tv_sec = 120;
 		clnt_control(client, CLSET_TIMEOUT, &tv);
 		break;
 	case IPPROTO_TCP:
@@ -102,7 +102,7 @@ clnt_create(
 		if (client == NULL) {
 			return (NULL);
 		}
-		tv.tv_sec = 25;
+		tv.tv_sec = 120;
 		tv.tv_usec = 0;
 		clnt_control(client, CLSET_TIMEOUT, &tv);
 		break;