Updated to the latest upstream RC release: libtirpc-1-3-5-rc1
Signed-off-by: Steve Dickson <steved@redhat.com>
This commit is contained in:
parent
c1cb7a7d24
commit
bc6c487357
66
libtirpc.1.3.5-rc1.patch
Normal file
66
libtirpc.1.3.5-rc1.patch
Normal file
@ -0,0 +1,66 @@
|
|||||||
|
diff --git a/src/auth_gss.c b/src/auth_gss.c
|
||||||
|
index 3127b92..9d18f96 100644
|
||||||
|
--- a/src/auth_gss.c
|
||||||
|
+++ b/src/auth_gss.c
|
||||||
|
@@ -184,7 +184,6 @@ authgss_create(CLIENT *clnt, gss_name_t name, struct rpc_gss_sec *sec)
|
||||||
|
AUTH *auth, *save_auth;
|
||||||
|
struct rpc_gss_data *gd;
|
||||||
|
OM_uint32 min_stat = 0;
|
||||||
|
- rpc_gss_options_ret_t ret;
|
||||||
|
|
||||||
|
gss_log_debug("in authgss_create()");
|
||||||
|
|
||||||
|
@@ -230,12 +229,8 @@ authgss_create(CLIENT *clnt, gss_name_t name, struct rpc_gss_sec *sec)
|
||||||
|
save_auth = clnt->cl_auth;
|
||||||
|
clnt->cl_auth = auth;
|
||||||
|
|
||||||
|
- memset(&ret, 0, sizeof(rpc_gss_options_ret_t));
|
||||||
|
- if (!authgss_refresh(auth, &ret)) {
|
||||||
|
+ if (!authgss_refresh(auth, NULL))
|
||||||
|
auth = NULL;
|
||||||
|
- sec->major_status = ret.major_status;
|
||||||
|
- sec->minor_status = ret.minor_status;
|
||||||
|
- }
|
||||||
|
else
|
||||||
|
authgss_auth_get(auth); /* Reference for caller */
|
||||||
|
|
||||||
|
@@ -624,9 +619,12 @@ _rpc_gss_refresh(AUTH *auth, rpc_gss_options_ret_t *options_ret)
|
||||||
|
}
|
||||||
|
|
||||||
|
static bool_t
|
||||||
|
-authgss_refresh(AUTH *auth, void *ret)
|
||||||
|
+authgss_refresh(AUTH *auth, void *dummy)
|
||||||
|
{
|
||||||
|
- return _rpc_gss_refresh(auth, (rpc_gss_options_ret_t *)ret);
|
||||||
|
+ rpc_gss_options_ret_t ret;
|
||||||
|
+
|
||||||
|
+ memset(&ret, 0, sizeof(ret));
|
||||||
|
+ return _rpc_gss_refresh(auth, &ret);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool_t
|
||||||
|
@@ -844,9 +842,9 @@ rpc_gss_seccreate(CLIENT *clnt, char *principal, char *mechanism,
|
||||||
|
gd->sec = sec;
|
||||||
|
|
||||||
|
if (req) {
|
||||||
|
- sec.req_flags = req->req_flags;
|
||||||
|
+ gd->sec.req_flags = req->req_flags;
|
||||||
|
gd->time_req = req->time_req;
|
||||||
|
- sec.cred = req->my_cred;
|
||||||
|
+ gd->sec.cred = req->my_cred;
|
||||||
|
gd->icb = req->input_channel_bindings;
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/tirpc/rpc/auth_gss.h b/tirpc/rpc/auth_gss.h
|
||||||
|
index a530d42..f2af6e9 100644
|
||||||
|
--- a/tirpc/rpc/auth_gss.h
|
||||||
|
+++ b/tirpc/rpc/auth_gss.h
|
||||||
|
@@ -64,8 +64,6 @@ struct rpc_gss_sec {
|
||||||
|
rpc_gss_svc_t svc; /* service */
|
||||||
|
gss_cred_id_t cred; /* cred handle */
|
||||||
|
u_int req_flags; /* req flags for init_sec_context */
|
||||||
|
- int major_status;
|
||||||
|
- int minor_status;
|
||||||
|
};
|
||||||
|
|
||||||
|
/* Private data required for kernel implementation */
|
@ -2,12 +2,14 @@
|
|||||||
|
|
||||||
Name: libtirpc
|
Name: libtirpc
|
||||||
Version: 1.3.4
|
Version: 1.3.4
|
||||||
Release: 1%{?dist}
|
Release: 1.rc1%{?dist}
|
||||||
Summary: Transport Independent RPC Library
|
Summary: Transport Independent RPC Library
|
||||||
License: SISSL AND BSD-3-Clause
|
License: SISSL AND BSD-3-Clause
|
||||||
URL: http://git.linux-nfs.org/?p=steved/libtirpc.git;a=summary
|
URL: http://git.linux-nfs.org/?p=steved/libtirpc.git;a=summary
|
||||||
Source0: http://downloads.sourceforge.net/libtirpc/libtirpc-%{version}.tar.bz2
|
Source0: http://downloads.sourceforge.net/libtirpc/libtirpc-%{version}.tar.bz2
|
||||||
|
|
||||||
|
Patch001: libtirpc.1.3.5-rc1.patch
|
||||||
|
|
||||||
BuildRequires: automake, autoconf, libtool, pkgconfig
|
BuildRequires: automake, autoconf, libtool, pkgconfig
|
||||||
BuildRequires: krb5-devel
|
BuildRequires: krb5-devel
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
@ -112,6 +114,9 @@ mv %{buildroot}%{_mandir}/man3 %{buildroot}%{_mandir}/man3t
|
|||||||
%{_mandir}/*/*
|
%{_mandir}/*/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jan 3 2024 Steve Dickson <steved@redhat.com> - 1.3.4-1.rc1
|
||||||
|
- Updated to the latest upstream RC release: libtirpc-1-3-5-rc1
|
||||||
|
|
||||||
* Mon Oct 16 2023 Pavel Reichl <preichl@redhat.com> - 1.3.4-1
|
* Mon Oct 16 2023 Pavel Reichl <preichl@redhat.com> - 1.3.4-1
|
||||||
- Convert License tag to SPDX format
|
- Convert License tag to SPDX format
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user