|
 |
e19a30 |
commit 1ee2184248251ff44ae1ba557f12151cb8cf93ff
|
|
|
e19a30 |
Author: Chuck Lever <chuck.lever@oracle.com>
|
|
|
e19a30 |
Date: Mon Nov 2 08:47:41 2015 -0500
|
|
|
e19a30 |
|
|
|
e19a30 |
gssd: Make TCP the default protocol for GSSD connections.
|
|
|
e19a30 |
|
|
|
e19a30 |
No failure case if gssd doesn't recognize the kernel's requested
|
|
|
e19a30 |
protocol. Caught with "protocol=rdma" upcall.
|
|
|
e19a30 |
|
|
|
e19a30 |
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
|
|
|
e19a30 |
Signed-off-by: Steve Dickson <steved@redhat.com>
|
|
|
e19a30 |
|
|
|
e19a30 |
diff --git a/utils/gssd/gssd_proc.c b/utils/gssd/gssd_proc.c
|
|
|
e19a30 |
index 11168b2..cee8991 100644
|
|
|
e19a30 |
--- a/utils/gssd/gssd_proc.c
|
|
|
e19a30 |
+++ b/utils/gssd/gssd_proc.c
|
|
|
e19a30 |
@@ -348,16 +348,9 @@ create_auth_rpc_client(struct clnt_info *clp,
|
|
|
e19a30 |
printerr(2, "creating %s client for server %s\n", clp->protocol,
|
|
|
e19a30 |
clp->servername);
|
|
|
e19a30 |
|
|
|
e19a30 |
- if ((strcmp(clp->protocol, "tcp")) == 0) {
|
|
|
e19a30 |
- protocol = IPPROTO_TCP;
|
|
|
e19a30 |
- } else if ((strcmp(clp->protocol, "udp")) == 0) {
|
|
|
e19a30 |
+ protocol = IPPROTO_TCP;
|
|
|
e19a30 |
+ if ((strcmp(clp->protocol, "udp")) == 0)
|
|
|
e19a30 |
protocol = IPPROTO_UDP;
|
|
|
e19a30 |
- } else {
|
|
|
e19a30 |
- printerr(0, "WARNING: unrecognized protocol, '%s', requested "
|
|
|
e19a30 |
- "for connection to server %s for user with uid %d\n",
|
|
|
e19a30 |
- clp->protocol, clp->servername, uid);
|
|
|
e19a30 |
- goto out_fail;
|
|
|
e19a30 |
- }
|
|
|
e19a30 |
|
|
|
e19a30 |
switch (addr->sa_family) {
|
|
|
e19a30 |
case AF_INET:
|