Compare commits
6 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| 85a707f7a6 | |||
|
4fe3a75ab6 | ||
| 003f77fbd5 | |||
|
|
07bba838cf | ||
| 716f70a599 | |||
|
|
716b8d9776 |
@@ -4,10 +4,24 @@
|
||||
#
|
||||
# Matthias Koenig <mkoenig@suse.de>
|
||||
#
|
||||
case "$2" in
|
||||
interface="$1"
|
||||
action="$2"
|
||||
|
||||
is_loopback() {
|
||||
local type_path="/sys/class/net/$interface/type"
|
||||
local interface_type=$(<"$type_path")
|
||||
|
||||
if [ -f "$type_path" ] && [ "$interface_type" -eq 772 ]; then
|
||||
return 0
|
||||
else
|
||||
return 1
|
||||
fi
|
||||
}
|
||||
|
||||
case "$action" in
|
||||
up)
|
||||
if test -x /usr/bin/systemctl && systemctl -q is-enabled autofs.service; then
|
||||
systemctl reload autofs.service
|
||||
if ! is_loopback && test -x /usr/bin/systemctl && systemctl -q is-enabled autofs.service; then
|
||||
systemctl --no-block reload autofs.service
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
|
||||
@@ -1,74 +0,0 @@
|
||||
From: Jeff Mahoney <jeffm@suse.com>
|
||||
Subject: autofs: use libldap_r instead of libldap for thread safety
|
||||
References: bsc#955477
|
||||
|
||||
In order for OpenSSL to be threadsafe, CRYPTO_set_locking_callback needs
|
||||
to be used to set the locking function. That's only done with libldap_r,
|
||||
not plain libldap.
|
||||
|
||||
>From the openldap source:
|
||||
|
||||
** The preprocessor flag LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE
|
||||
** can be used to determine if -lldap_r is available at compile
|
||||
** time. You must define LDAP_THREAD_SAFE if and only if you
|
||||
** link with -lldap_r.
|
||||
**
|
||||
** If you fail to define LDAP_THREAD_SAFE when linking with
|
||||
** -lldap_r or define LDAP_THREAD_SAFE when linking with -lldap,
|
||||
** provided header definations and declarations may be incorrect.
|
||||
|
||||
The autofs Makefile defines LDAP_THREAD_SAFE and then links with -lldap.
|
||||
|
||||
This patch links with -lldap_r instead and fixes observed crashes.
|
||||
|
||||
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
|
||||
---
|
||||
aclocal.m4 | 8 ++++----
|
||||
configure.in | 2 +-
|
||||
2 files changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
Index: autofs-5.1.9/aclocal.m4
|
||||
===================================================================
|
||||
--- autofs-5.1.9.orig/aclocal.m4
|
||||
+++ autofs-5.1.9/aclocal.m4
|
||||
@@ -374,11 +374,11 @@ dnl
|
||||
dnl Check for function ldap_create_page_control
|
||||
dnl --------------------------------------------------------------------------
|
||||
AC_DEFUN([AF_CHECK_FUNC_LDAP_CREATE_PAGE_CONTROL],
|
||||
-[AC_MSG_CHECKING(for ldap_create_page_control in -lldap)
|
||||
+[AC_MSG_CHECKING(for ldap_create_page_control in -lldap_r)
|
||||
|
||||
# save current libs
|
||||
af_check_ldap_create_page_control_save_libs="$LIBS"
|
||||
-LIBS="$LIBS -lldap"
|
||||
+LIBS="$LIBS -lldap_r"
|
||||
af_check_ldap_create_page_control_save_cflags="$CFLAGS"
|
||||
CFLAGS="$CFLAGS -Werror=implicit-function-declaration"
|
||||
|
||||
@@ -410,11 +410,11 @@ dnl
|
||||
dnl Check for function ldap_parse_page_control
|
||||
dnl --------------------------------------------------------------------------
|
||||
AC_DEFUN([AF_CHECK_FUNC_LDAP_PARSE_PAGE_CONTROL],
|
||||
-[AC_MSG_CHECKING(for ldap_parse_page_control in -lldap)
|
||||
+[AC_MSG_CHECKING(for ldap_parse_page_control in -lldap_r)
|
||||
|
||||
# save current libs
|
||||
af_check_ldap_parse_page_control_save_libs="$LIBS"
|
||||
-LIBS="$LIBS -lldap"
|
||||
+LIBS="$LIBS -lldap_r"
|
||||
af_check_ldap_parse_page_control_save_cflags="$CFLAGS"
|
||||
CFLAGS="$CFLAGS -Werror=implicit-function-declaration"
|
||||
|
||||
Index: autofs-5.1.9/configure.ac
|
||||
===================================================================
|
||||
--- autofs-5.1.9.orig/configure.ac
|
||||
+++ autofs-5.1.9/configure.ac
|
||||
@@ -299,7 +299,7 @@ AC_ARG_WITH(openldap,
|
||||
if test -z "$HAVE_LDAP" -o "$HAVE_LDAP" != "0"; then
|
||||
HAVE_LDAP=0
|
||||
LDAP_FLAGS="$LDAP_FLAGS -DLDAP_DEPRECATED=1"
|
||||
- AC_CHECK_LIB(ldap, ldap_initialize, HAVE_LDAP=1 LIBLDAP="$LIBLDAP -lldap -llber -lresolv", ,
|
||||
+ AC_CHECK_LIB(ldap_r, ldap_initialize, HAVE_LDAP=1 LIBLDAP="$LIBLDAP -lldap_r -llber -lresolv", ,
|
||||
-llber -lresolv $LIBS)
|
||||
if test "$HAVE_LDAP" = "1"; then
|
||||
AC_DEFINE(WITH_LDAP,1,
|
||||
@@ -1,3 +1,23 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 25 08:08:50 UTC 2025 - Jonathan Kang <songchuan.kang@suse.com>
|
||||
|
||||
- Modified NetworkManager-autofs: (bsc#1250091)
|
||||
* don't reload autofs.service on loopback interface changes
|
||||
* add --no-block option to request asynchronous behavior
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 24 09:31:24 UTC 2025 - Thorsten Kukuk <kukuk@suse.com>
|
||||
|
||||
- Drop rcautofs symlink [jsc#PED-266]
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 18 01:31:04 UTC 2025 - David Disseldorp <ddiss@suse.com>
|
||||
|
||||
- Link against ldap.so instead of ldap_r.so; the former now provides
|
||||
thread-safety and the latter is a symlink which may not exist
|
||||
(bsc#1249966)
|
||||
* drop autofs-use-libldap_r-instead-of-libldap-for-thread-safety.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 16 20:29:16 UTC 2025 - David Disseldorp <ddiss@suse.com>
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package autofs
|
||||
#
|
||||
# Copyright (c) 2025 SUSE LLC
|
||||
# Copyright (c) 2025 SUSE LLC and contributors
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -16,7 +16,6 @@
|
||||
#
|
||||
|
||||
|
||||
#Compat macro for new _fillupdir macro introduced in Nov 2017
|
||||
%if ! %{defined _fillupdir}
|
||||
%define _fillupdir %{_localstatedir}/adm/fillup-templates
|
||||
%endif
|
||||
@@ -53,8 +52,6 @@ Patch100: autofs-5.1.1-suse-auto_master_default.patch
|
||||
Patch101: autofs-5.1.1-debuginfo-fix.patch
|
||||
# PATCH-EXTEND-OPENSUSE autofs-dbus-udisks-monitor.patch
|
||||
Patch102: autofs-5.1.1-dbus-udisks-monitor.patch
|
||||
# PATCH-FIX-OPENSUSE autofs-use-libldap_r-instead-of-libldap-for-thread-safety.patch [bsc#955477]
|
||||
Patch104: autofs-use-libldap_r-instead-of-libldap-for-thread-safety.patch
|
||||
# bsc#1175238 - Use /usr/etc/nsswitch.conf if /etc/nsswitch.conf is not available
|
||||
Patch106: autofs-nsswitch-usr-etc.patch
|
||||
# bsc#1207881 - Obsolete and incorrect manual page details for autofs(8)
|
||||
@@ -105,7 +102,6 @@ cp %{SOURCE5} .
|
||||
%patch -P 100 -p1
|
||||
%patch -P 101 -p1
|
||||
%patch -P 102 -p1
|
||||
%patch -P 104 -p1
|
||||
%patch -P 106 -p1
|
||||
%patch -P 108 -p1
|
||||
%patch -P 109 -p1
|
||||
@@ -133,8 +129,6 @@ SUSE_ASNEEDED=0
|
||||
install -d -m 755 %{buildroot}%{_sysconfdir}/auto.master.d
|
||||
install -D -m 644 %{SOURCE1} %{buildroot}%{_fillupdir}/sysconfig.autofs
|
||||
install -D -m 755 %{SOURCE7} %{buildroot}%{_prefix}/lib/NetworkManager/dispatcher.d/autofs
|
||||
ln -s %{_mandir}/man8/autofs.8.gz %{buildroot}/%{_mandir}/man8/rcautofs.8.gz
|
||||
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcautofs
|
||||
%if %{with_udisks}
|
||||
install -D -m 644 %{SOURCE42} %{buildroot}%{_datadir}/dbus-1/system.d/org.freedesktop.AutoMount.conf
|
||||
%endif
|
||||
@@ -181,7 +175,6 @@ rm -f %{buildroot}%{_sysconfdir}/sysconfig/autofs
|
||||
%{_mandir}/man5/*
|
||||
%{_mandir}/man8/*
|
||||
%{_sbindir}/automount
|
||||
%{_sbindir}/rcautofs
|
||||
%{_unitdir}/autofs.service
|
||||
|
||||
%changelog
|
||||
|
||||
Reference in New Issue
Block a user