Clean up gssrpc timeout code

Revert b8b7bd6 (for #6120) now that
we are setting the kadmin client timeout the appropriate way.

In clnt_create(), do not set a timeout after creating the handle;
doing so defeats the purpose of keeping track of whether the caller
has set a handle timeout.

src/lib/kadm5/clnt/client_rpc.c

@@ -10,7 +10,7 @@
 #endif
 
 /* Default timeout can be changed using clnt_control() */
-static struct timeval TIMEOUT = { 120, 0 };
+static struct timeval TIMEOUT = { 25, 0 };
 
 generic_ret *
 create_principal_2(cprinc_arg *argp, CLIENT *clnt)

src/lib/rpc/clnt_generic.c

@@ -94,17 +94,12 @@ clnt_create(
 		if (client == NULL) {
 			return (NULL);
 		}
-		tv.tv_sec = 120;
-		clnt_control(client, CLSET_TIMEOUT, &tv);
 		break;
 	case IPPROTO_TCP:
 		client = clnttcp_create(&sockin, prog, vers, &sock, 0, 0);
 		if (client == NULL) {
 			return (NULL);
 		}
-		tv.tv_sec = 120;
-		tv.tv_usec = 0;
-		clnt_control(client, CLSET_TIMEOUT, &tv);
 		break;
 	default:
 		rpc_createerr.cf_stat = RPC_SYSTEMERROR;