From f5d809c824487f1df92d8e50b1bb13bb02a4a090 Mon Sep 17 00:00:00 2001
From: Ian Kent <ikent@redhat.com>
Date: Mon, 1 Sep 2025 15:22:55 +0800
Subject: [PATCH] - add fix for RHEL-111930.

---
 ...ssing-unlock-in-sasl_do_kinit_ext_cc.patch | 37 +++++++++++++++++++
 autofs.spec                                   | 12 +++++-
 2 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 autofs-5.1.8-fix-missing-unlock-in-sasl_do_kinit_ext_cc.patch

diff --git a/autofs-5.1.8-fix-missing-unlock-in-sasl_do_kinit_ext_cc.patch b/autofs-5.1.8-fix-missing-unlock-in-sasl_do_kinit_ext_cc.patch
new file mode 100644
index 0000000..0b61c17
--- /dev/null
+++ b/autofs-5.1.8-fix-missing-unlock-in-sasl_do_kinit_ext_cc.patch
@@ -0,0 +1,37 @@
+autofs-5.1.8 - fix missing unlock in sasl_do_kinit_ext_cc()
+
+From: James Dingwall <james-autofs@dingwall.me.uk>
+
+There is a missing mutex unlock in function sasl_do_kinit_ext_cc(),
+fix it.
+
+Signed-off-by: James Dingwall <james-autofs@dingwall.me.uk>
+Signed-off-by: Ian Kent <raven@themaw.net>
+---
+ CHANGELOG            |    1 +
+ modules/cyrus-sasl.c |    4 ++++
+ 2 files changed, 5 insertions(+)
+
+--- autofs-5.1.4.orig/CHANGELOG
++++ autofs-5.1.4/CHANGELOG
+@@ -165,6 +165,7 @@
+ - fix ldap sasl reconnect problem.
+ - always recreate credential cache.
+ - fix always recreate credential cache.
++- fix missing unlock in sasl_do_kinit_ext_cc().
+ 
+ xx/xx/2018 autofs-5.1.5
+ - fix flag file permission.
+--- autofs-5.1.4.orig/modules/cyrus-sasl.c
++++ autofs-5.1.4/modules/cyrus-sasl.c
+@@ -751,6 +751,10 @@ sasl_do_kinit_ext_cc(unsigned logopt, st
+ 
+ 	debug(logopt, "Kerberos authentication was successful!");
+ 
++	status = pthread_mutex_unlock(&krb5cc_mutex);
++	if (status)
++		fatal(status);
++
+ 	return 0;
+ 
+ out_cleanup_def_princ:
diff --git a/autofs.spec b/autofs.spec
index d2736f6..39ad674 100644
--- a/autofs.spec
+++ b/autofs.spec
@@ -8,7 +8,7 @@
 Summary: A tool for automatically mounting and unmounting filesystems
 Name: autofs
 Version: 5.1.4
-Release: 114%{?dist}.4
+Release: 114%{?dist}.5
 Epoch: 1
 License: GPLv2+
 Group: System Environment/Daemons
@@ -350,6 +350,9 @@ Patch340: autofs-5.1.6-fix-ldap-sasl-reconnect-problem.patch
 Patch341: autofs-5.1.8-always-recreate-credential-cache.patch
 Patch342: autofs-5.1.9-fix-always-recreate-credential-cache.patch
 
+# JIRA: RHEL-111930
+Patch343: autofs-5.1.8-fix-missing-unlock-in-sasl_do_kinit_ext_cc.patch
+
 %if %{with_systemd}
 BuildRequires: systemd-units
 BuildRequires: systemd-devel
@@ -739,6 +742,8 @@ echo %{version}-%{release} > .version
 %patch -P 341 -p1
 %patch -P 342 -p1
 
+%patch -P 343 -p1
+
 %build
 LDFLAGS=-Wl,-z,now
 %configure --disable-mount-locking --enable-ignore-busy --with-libtirpc --without-hesiod %{?systemd_configure_arg:}
@@ -833,6 +838,11 @@ fi
 %dir /etc/auto.master.d
 
 %changelog
+* Mon Sep 01 2025 Ian Kent <ikent@redhat.com> - 5.1.4-114.el8_10.5
+- RHEL-111930 - automount blocked when attempting to lookup ldap maps
+  - fix missing unlock in sasl_do_kinit_ext_cc().
+- Resolves: RHEL-111930
+
 * Mon Jun 09 2025 Ian Kent <ikent@redhat.com> - 5.1.4-114.el8_10.4
 - RHEL-90238 - autofs fails to mount shares when using kerberised LDAP (RHEL 8)
   - fix ldap sasl reconnect problem.