From 4689a7b2dbda9d4a9328a203a515ce8b6a036847ad7e227600c0bb26314ad45b Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Wed, 22 Jan 2025 10:09:51 +0000
Subject: [PATCH] 
 [info=660ade3bb1e5650f8b379a95197017216f506e85d72c0b139b39a31cc7cc911a]

OBS-URL: https://build.opensuse.org/package/show/network:ldap/sssd?expand=0&rev=337
---
 _scmsync.obsinfo       |  4 ++--
 build.specials.obscpio |  2 +-
 sssd.spec              | 14 ++++++++------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo
index 2a3ecd3..c712526 100644
--- a/_scmsync.obsinfo
+++ b/_scmsync.obsinfo
@@ -1,4 +1,4 @@
-mtime: 1737535733
-commit: e6e6fdcbb8c81ae2cfdf1e19038a61c6014ac6a56c4c37eacfaa19f7abca3eda
+mtime: 1737540577
+commit: 660ade3bb1e5650f8b379a95197017216f506e85d72c0b139b39a31cc7cc911a
 url: https://src.opensuse.org/jengelh/sssd
 revision: master
diff --git a/build.specials.obscpio b/build.specials.obscpio
index 370cead..1c4c4c7 100644
--- a/build.specials.obscpio
+++ b/build.specials.obscpio
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:340801b76bf05ba6ff7f6234619e3d4d04639777fb6a08ee6dd7021e1fb7c01e
+oid sha256:6f0575798ff134a78f8aba61c3e56c255122f56545dc6525861bd3e85ca7f059
 size 256
diff --git a/sssd.spec b/sssd.spec
index 2107758..df29625 100644
--- a/sssd.spec
+++ b/sssd.spec
@@ -130,10 +130,6 @@ Obsoletes:      sssd-common < %version-%release
 %define permissions_path %_sysconfdir/permissions.d/
 %endif
 
-# Both SSSD and cifs-utils provide an idmap plugin for cifs.ko
-# %%_sysconfdir/cifs-utils/idmap-plugin should be a symlink to one of the 2 idmap plugins,
-# cifs-utils or sssd. The plugins are individually packaged and conflicts with each other
-# (https://bugzilla.suse.com/show_bug.cgi?id=1235789).
 %define cifs_idmap_plugin       %_sysconfdir/cifs-utils/idmap-plugin
 %define cifs_idmap_lib          %_libdir/cifs-utils/cifs_idmap_sss.so
 
@@ -252,13 +248,19 @@ UIDs/GIDs and SIDs.
 %package cifs-idmap-plugin
 Summary:        The sssd idmap plugin for cifs.idmap
 Group:          System/Libraries
+# Conflict as per https://bugzilla.suse.com/1235789
 Provides:       cifs-idmap-plugin
 Conflicts:      cifs-idmap-plugin
 
 %description cifs-idmap-plugin
-The cifs.idmap(8) userspace helper relies on a plugin to handle the ID mapping.
-This package contains the sssd ID mapping plugin.
+The cifs.idmap(8) userspace helper relies on a plugin to handle the
+ID mapping. This package contains the ID mapping plugin that will use
+sssd.
 
+In SUSE systems, only one such plugin can be installed at a time
+(either the one from sssd, or from cifs-utils).
+Without the plugin, file objects in a mounted share have UID/GID of
+the original mounting process.
 
 %package -n libsss_certmap0
 Summary:        FreeIPA ID mapping library