|
 |
a55744 |
diff -up libtirpc-1.1.4/src/auth_gss.c.orig libtirpc-1.1.4/src/auth_gss.c
|
|
|
a55744 |
--- libtirpc-1.1.4/src/auth_gss.c.orig 2021-04-17 13:11:03.229880600 -0400
|
|
|
a55744 |
+++ libtirpc-1.1.4/src/auth_gss.c 2021-04-17 13:15:10.722391798 -0400
|
|
|
a55744 |
@@ -982,3 +982,9 @@ rpc_gss_max_data_length(AUTH *auth, int
|
|
|
a55744 |
rpc_gss_clear_error();
|
|
|
a55744 |
return result;
|
|
|
a55744 |
}
|
|
|
a55744 |
+
|
|
|
a55744 |
+bool_t
|
|
|
a55744 |
+is_authgss_client(CLIENT *clnt)
|
|
|
a55744 |
+{
|
|
|
a55744 |
+ return (clnt->cl_auth->ah_ops == &authgss_ops);
|
|
|
a55744 |
+}
|
|
|
a55744 |
diff -up libtirpc-1.1.4/src/clnt_dg.c.orig libtirpc-1.1.4/src/clnt_dg.c
|
|
|
a55744 |
--- libtirpc-1.1.4/src/clnt_dg.c.orig 2018-08-27 10:06:49.000000000 -0400
|
|
|
a55744 |
+++ libtirpc-1.1.4/src/clnt_dg.c 2021-04-17 13:15:10.722391798 -0400
|
|
|
a55744 |
@@ -60,6 +60,9 @@
|
|
|
a55744 |
#include <sys/uio.h>
|
|
|
a55744 |
#endif
|
|
|
a55744 |
|
|
|
a55744 |
+#ifdef HAVE_RPCSEC_GSS
|
|
|
a55744 |
+#include <rpc/auth_gss.h>
|
|
|
a55744 |
+#endif
|
|
|
a55744 |
|
|
|
a55744 |
#define MAX_DEFAULT_FDS 20000
|
|
|
a55744 |
|
|
|
a55744 |
@@ -356,6 +359,11 @@ clnt_dg_call(cl, proc, xargs, argsp, xre
|
|
|
a55744 |
salen = cu->cu_rlen;
|
|
|
a55744 |
}
|
|
|
a55744 |
|
|
|
a55744 |
+#ifdef HAVE_RPCSEC_GSS
|
|
|
a55744 |
+ if (is_authgss_client(cl))
|
|
|
a55744 |
+ nrefreshes = 0;
|
|
|
a55744 |
+#endif
|
|
|
a55744 |
+
|
|
|
a55744 |
/* Clean up in case the last call ended in a longjmp(3) call. */
|
|
|
a55744 |
call_again:
|
|
|
a55744 |
xdrs = &(cu->cu_outxdrs);
|
|
|
a55744 |
diff -up libtirpc-1.1.4/src/clnt_vc.c.orig libtirpc-1.1.4/src/clnt_vc.c
|
|
|
a55744 |
--- libtirpc-1.1.4/src/clnt_vc.c.orig 2018-08-27 10:06:49.000000000 -0400
|
|
|
a55744 |
+++ libtirpc-1.1.4/src/clnt_vc.c 2021-04-17 13:15:10.723391824 -0400
|
|
|
a55744 |
@@ -68,6 +68,10 @@
|
|
|
a55744 |
#include <rpc/rpc.h>
|
|
|
a55744 |
#include "rpc_com.h"
|
|
|
a55744 |
|
|
|
a55744 |
+#ifdef HAVE_RPCSEC_GSS
|
|
|
a55744 |
+#include <rpc/auth_gss.h>
|
|
|
a55744 |
+#endif
|
|
|
a55744 |
+
|
|
|
a55744 |
#define MCALL_MSG_SIZE 24
|
|
|
a55744 |
|
|
|
a55744 |
#define CMGROUP_MAX 16
|
|
|
a55744 |
@@ -380,6 +384,11 @@ clnt_vc_call(cl, proc, xdr_args, args_pt
|
|
|
a55744 |
(xdr_results == NULL && timeout.tv_sec == 0
|
|
|
a55744 |
&& timeout.tv_usec == 0) ? FALSE : TRUE;
|
|
|
a55744 |
|
|
|
a55744 |
+#ifdef HAVE_RPCSEC_GSS
|
|
|
a55744 |
+ if (is_authgss_client(cl))
|
|
|
a55744 |
+ refreshes = 0;
|
|
|
a55744 |
+#endif
|
|
|
a55744 |
+
|
|
|
a55744 |
call_again:
|
|
|
a55744 |
xdrs->x_op = XDR_ENCODE;
|
|
|
a55744 |
ct->ct_error.re_status = RPC_SUCCESS;
|
|
|
a55744 |
diff -up libtirpc-1.1.4/tirpc/rpc/auth_gss.h.orig libtirpc-1.1.4/tirpc/rpc/auth_gss.h
|
|
|
a55744 |
--- libtirpc-1.1.4/tirpc/rpc/auth_gss.h.orig 2018-08-27 10:06:49.000000000 -0400
|
|
|
a55744 |
+++ libtirpc-1.1.4/tirpc/rpc/auth_gss.h 2021-04-17 13:15:10.723391824 -0400
|
|
|
a55744 |
@@ -120,6 +120,8 @@ void gss_log_debug (const char *fmt, ..
|
|
|
a55744 |
void gss_log_status (char *m, OM_uint32 major, OM_uint32 minor);
|
|
|
a55744 |
void gss_log_hexdump (const u_char *buf, int len, int offset);
|
|
|
a55744 |
|
|
|
a55744 |
+bool_t is_authgss_client (CLIENT *);
|
|
|
a55744 |
+
|
|
|
a55744 |
#ifdef __cplusplus
|
|
|
a55744 |
}
|
|
|
a55744 |
#endif
|