Dirk Mueller
99d3e0d9fa
0002-gssd-revert-commit-513630d720bd.patch, 0003-gssd-switch-to-using-rpc_gss_seccreate.patch, 0004-gssd-handle-KRB5_AP_ERR_BAD_INTEGRITY-for-machine-cr.patch, 0005-gssd-handle-KRB5_AP_ERR_BAD_INTEGRITY-for-user-crede.patch, 0006-configure-check-for-rpc_gss_seccreate.patch: fixes for libtirpc 1.3.5 - drop reenable-nfsv2.patch (poo#106679) Fix crash when rpc-gssd run with -v. - Replace references to /var/adm/fillup-templates with new options. - do not strip the binaries - mkinitrd-boot.sh: allow other mkinitrd-setup - nfs-utils-eperm-fallback.patch: mount.nfs Includes new config file: /etc/nfsmount.conf and - Kill processes on NFS mounts when unmounting bnc#442490 * fix typo in handling of "init.d/nfs status" - nfs.init: * unmount rpc_pipefs - fix sysconfig filename for changed fillup call services (gssd and idmpad have been rolled in to nfs/nfsserver). - remove svcinfo.d dir as it is provided now by filesystem - update to version 1.1.2 - uses libgssglue instead of libgssapi - add rpcbind support [fate#300607] - added gssapi to buildrequires (#116355) showmount has been removed there (#309782) - added README.NFSv4 (#182775) OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=285
61 lines
1.9 KiB
Diff
61 lines
1.9 KiB
Diff
From 3abf6b5223af0ccf07d217d71978ee7987acce88 Mon Sep 17 00:00:00 2001
|
|
From: Olga Kornievskaia <kolga@netapp.com>
|
|
Date: Mon, 11 Dec 2023 08:52:47 -0500
|
|
Subject: [PATCH 3/6] gssd: switch to using rpc_gss_seccreate()
|
|
|
|
If available from the libtirpc library, switch to using
|
|
rpc_gss_seccreate() instead of authgss_create_default() which does not
|
|
expose gss error codes.
|
|
|
|
Reviewed-by: Chuck Lever <chuck.lever@oracle.com>
|
|
Signed-off-by: Olga Kornievskaia <kolga@netapp.com>
|
|
Signed-off-by: Steve Dickson <steved@redhat.com>
|
|
---
|
|
utils/gssd/gssd_proc.c | 15 +++++++++++++++
|
|
1 file changed, 15 insertions(+)
|
|
|
|
diff --git a/utils/gssd/gssd_proc.c b/utils/gssd/gssd_proc.c
|
|
index 4fb6b72d..99761157 100644
|
|
--- a/utils/gssd/gssd_proc.c
|
|
+++ b/utils/gssd/gssd_proc.c
|
|
@@ -70,6 +70,9 @@
|
|
#include <sys/types.h>
|
|
#include <sys/wait.h>
|
|
#include <syscall.h>
|
|
+#ifdef HAVE_TIRPC_GSS_SECCREATE
|
|
+#include <rpc/rpcsec_gss.h>
|
|
+#endif
|
|
|
|
#include "gssd.h"
|
|
#include "err_util.h"
|
|
@@ -330,6 +333,11 @@ create_auth_rpc_client(struct clnt_info *clp,
|
|
struct timeval timeout;
|
|
struct sockaddr *addr = (struct sockaddr *) &clp->addr;
|
|
socklen_t salen;
|
|
+#ifdef HAVE_TIRPC_GSS_SECCREATE
|
|
+ rpc_gss_options_req_t req;
|
|
+ rpc_gss_options_ret_t ret;
|
|
+ char mechanism[] = "kerberos_v5";
|
|
+#endif
|
|
pthread_t tid = pthread_self();
|
|
|
|
sec.qop = GSS_C_QOP_DEFAULT;
|
|
@@ -410,7 +418,14 @@ create_auth_rpc_client(struct clnt_info *clp,
|
|
|
|
printerr(3, "create_auth_rpc_client(0x%lx): creating context with server %s\n",
|
|
tid, tgtname);
|
|
+#ifdef HAVE_TIRPC_GSS_SECCREATE
|
|
+ memset(&req, 0, sizeof(req));
|
|
+ req.my_cred = sec.cred;
|
|
+ auth = rpc_gss_seccreate(rpc_clnt, tgtname, mechanism,
|
|
+ rpcsec_gss_svc_none, NULL, &req, &ret);
|
|
+#else
|
|
auth = authgss_create_default(rpc_clnt, tgtname, &sec);
|
|
+#endif
|
|
if (!auth) {
|
|
/* Our caller should print appropriate message */
|
|
printerr(2, "WARNING: Failed to create krb5 context for "
|
|
--
|
|
2.46.0
|
|
|