From 3bf976bbd14eecbbc403781e83e786b5eec637f5487d32810148f75366416e7d Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 15 Jun 2022 12:27:00 +0000 Subject: [PATCH] Accepting request 982791 from home:scabrero:branches:network:ldap - Use pam rpm macros to avoid hardcoding the directory names; (bsc#1191047); - Do not take ownership of %_pam_confdir directory, it is owned by pam package OBS-URL: https://build.opensuse.org/request/show/982791 OBS-URL: https://build.opensuse.org/package/show/network:ldap/sssd?expand=0&rev=267 --- sssd.changes | 8 ++++++++ sssd.spec | 9 ++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/sssd.changes b/sssd.changes index 38479d4..fb3629c 100644 --- a/sssd.changes +++ b/sssd.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Jun 15 11:28:35 UTC 2022 - Samuel Cabrero + +- Use pam rpm macros to avoid hardcoding the directory names; + (bsc#1191047); +- Do not take ownership of %_pam_confdir directory, it is owned by + pam package + ------------------------------------------------------------------- Mon Jun 13 14:48:28 UTC 2022 - Jan Engelhardt diff --git a/sssd.spec b/sssd.spec index 420de02..9fb3446 100644 --- a/sssd.spec +++ b/sssd.spec @@ -383,7 +383,7 @@ autoreconf -fiv --with-syslog=journald \ --with-pid-path="%_rundir" \ --enable-nsslibdir="/%_lib" \ - --enable-pammoddir="/%_lib/security" \ + --enable-pammoddir="%_pam_moduledir" \ --with-ldb-lib-dir="%ldbdir" \ --with-selinux=yes \ --with-subid \ @@ -576,8 +576,7 @@ fi %config(noreplace) %_sysconfdir/sssd/sssd.conf %config(noreplace) %_sysconfdir/logrotate.d/sssd %dir %_sysconfdir/sssd/conf.d -%dir %_sysconfdir/pam.d/ -%config(noreplace) %_sysconfdir/pam.d/sssd-shadowutils +%config(noreplace) %_pam_confdir/sssd-shadowutils %dir %_datadir/%name/ %_datadir/%name/cfg_rules.ini %_datadir/%name/sssd.api.conf @@ -588,8 +587,8 @@ fi # sssd-client # /%_lib/libnss_sss.so.2 -/%_lib/security/pam_sss.so -/%_lib/security/pam_sss_gss.so +%_pam_moduledir/pam_sss.so +%_pam_moduledir/pam_sss_gss.so %_libdir/krb5/ %_libdir/%name/modules/sssd_krb5_localauth_plugin.so %_libdir/%name/modules/sssd_krb5_idp_plugin.so