52 lines
1.6 KiB
Diff
52 lines
1.6 KiB
Diff
|
From f05af7d9924b5e455f4e750c1e8985c560784fce Mon Sep 17 00:00:00 2001
|
||
|
|
From: Olga Kornievskaia <kolga@netapp.com>
|
||
|
|
Date: Mon, 11 Dec 2023 08:50:57 -0500
|
||
|
|
Subject: [PATCH 2/6] gssd: revert commit 513630d720bd
|
||
|
|
|
||
|
|
In preparation for using rpc_gss_seccreate(), revert commit 513630d720bd
|
||
|
|
"gssd: handle KRB5_AP_ERR_BAD_INTEGRITY for machine credentials"
|
||
|
|
|
||
|
|
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 | 16 +---------------
|
||
|
|
1 file changed, 1 insertion(+), 15 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/utils/gssd/gssd_proc.c b/utils/gssd/gssd_proc.c
|
||
|
|
index e5cc1d98..4fb6b72d 100644
|
||
|
|
--- a/utils/gssd/gssd_proc.c
|
||
|
|
+++ b/utils/gssd/gssd_proc.c
|
||
|
|
@@ -412,27 +412,13 @@ create_auth_rpc_client(struct clnt_info *clp,
|
||
|
|
tid, tgtname);
|
||
|
|
auth = authgss_create_default(rpc_clnt, tgtname, &sec);
|
||
|
|
if (!auth) {
|
||
|
|
- if (sec.minor_status == KRB5KRB_AP_ERR_BAD_INTEGRITY) {
|
||
|
|
- printerr(2, "WARNING: server=%s failed context "
|
||
|
|
- "creation with KRB5_AP_ERR_BAD_INTEGRITY\n",
|
||
|
|
- clp->servername);
|
||
|
|
- if (cred == GSS_C_NO_CREDENTIAL)
|
||
|
|
- retval = gssd_refresh_krb5_machine_credential(clp->servername,
|
||
|
|
- "*", NULL, 1);
|
||
|
|
- if (!retval) {
|
||
|
|
- auth = authgss_create_default(rpc_clnt, tgtname,
|
||
|
|
- &sec);
|
||
|
|
- if (auth)
|
||
|
|
- goto success;
|
||
|
|
- }
|
||
|
|
- }
|
||
|
|
/* Our caller should print appropriate message */
|
||
|
|
printerr(2, "WARNING: Failed to create krb5 context for "
|
||
|
|
"user with uid %d for server %s\n",
|
||
|
|
uid, tgtname);
|
||
|
|
goto out_fail;
|
||
|
|
}
|
||
|
|
-success:
|
||
|
|
+
|
||
|
|
/* Success !!! */
|
||
|
|
rpc_clnt->cl_auth = auth;
|
||
|
|
*clnt_return = rpc_clnt;
|
||
|
|
--
|
||
|
|
2.46.0
|
||
|
|
|