diff options
| -rw-r--r-- | utils/gssd/gssd.c | 6 | ||||
| -rw-r--r-- | utils/gssd/gssd.h | 1 | ||||
| -rw-r--r-- | utils/gssd/gssd.man | 8 | ||||
| -rw-r--r-- | utils/gssd/gssd_proc.c | 6 |
4 files changed, 19 insertions, 2 deletions
diff --git a/utils/gssd/gssd.c b/utils/gssd/gssd.c index 611ef1a..6b8b863 100644 --- a/utils/gssd/gssd.c +++ b/utils/gssd/gssd.c @@ -64,6 +64,7 @@ char *ccachesearch[GSSD_MAX_CCACHE_SEARCH + 1]; int use_memcache = 0; int root_uses_machine_creds = 1; unsigned int context_timeout = 0; +unsigned int rpc_timeout = 5; char *preferred_realm = NULL; int pipefds[2] = { -1, -1 }; @@ -105,7 +106,7 @@ main(int argc, char *argv[]) char *progname; memset(ccachesearch, 0, sizeof(ccachesearch)); - while ((opt = getopt(argc, argv, "DfvrlmnMp:k:d:t:R:")) != -1) { + while ((opt = getopt(argc, argv, "DfvrlmnMp:k:d:t:T:R:")) != -1) { switch (opt) { case 'f': fg = 1; @@ -143,6 +144,9 @@ main(int argc, char *argv[]) case 't': context_timeout = atoi(optarg); break; + case 'T': + rpc_timeout = atoi(optarg); + break; case 'R': preferred_realm = strdup(optarg); break; diff --git a/utils/gssd/gssd.h b/utils/gssd/gssd.h index 56a18d6..48f4ad8 100644 --- a/utils/gssd/gssd.h +++ b/utils/gssd/gssd.h @@ -66,6 +66,7 @@ extern char *ccachesearch[]; extern int use_memcache; extern int root_uses_machine_creds; extern unsigned int context_timeout; +extern unsigned int rpc_timeout; extern char *preferred_realm; extern int pipefds[2]; diff --git a/utils/gssd/gssd.man b/utils/gssd/gssd.man index ac13fd4..ea58fa0 100644 --- a/utils/gssd/gssd.man +++ b/utils/gssd/gssd.man @@ -289,6 +289,14 @@ new kernel contexts to be negotiated after seconds, which allows changing Kerberos tickets and identities frequently. The default is no explicit timeout, which means the kernel context will live the lifetime of the Kerberos service ticket used in its creation. +.TP +.B -T timeout +Timeout, in seconds, to create an RPC connection with a server while +establishing an authenticated gss context for a user. +The default timeout is set to 5 seconds. +If you get messages like "WARNING: can't create tcp rpc_clnt to server +%servername% for user with uid %uid%: RPC: Remote system error - +Connection timed out", you should consider an increase of this timeout. .SH SEE ALSO .BR rpc.svcgssd (8), .BR kerberos (1), diff --git a/utils/gssd/gssd_proc.c b/utils/gssd/gssd_proc.c index 9925dab..121feb1 100644 --- a/utils/gssd/gssd_proc.c +++ b/utils/gssd/gssd_proc.c @@ -850,7 +850,7 @@ create_auth_rpc_client(struct clnt_info *clp, OM_uint32 min_stat; char rpc_errmsg[1024]; int protocol; - struct timeval timeout = {5, 0}; + struct timeval timeout; struct sockaddr *addr = (struct sockaddr *) &clp->addr; socklen_t salen; @@ -918,6 +918,10 @@ create_auth_rpc_client(struct clnt_info *clp, if (!populate_port(addr, salen, clp->prog, clp->vers, protocol)) goto out_fail; + /* set the timeout according to the requested valued */ + timeout.tv_sec = (long) rpc_timeout; + timeout.tv_usec = (long) 0; + rpc_clnt = nfs_get_rpcclient(addr, salen, protocol, clp->prog, clp->vers, &timeout); if (!rpc_clnt) { |