From 72957e6cab425242170d34b8108222e50cc3bf276c6fd2744b6d27bff70f174d Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 31 Oct 2023 11:18:57 +0000 Subject: [PATCH] - Default config is unworkable, just stop installing it altogether [boo#1216739] OBS-URL: https://build.opensuse.org/package/show/network:ldap/sssd?expand=0&rev=291 --- sssd.changes | 6 ++++++ sssd.spec | 9 +++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/sssd.changes b/sssd.changes index d5c86de..1b046d3 100644 --- a/sssd.changes +++ b/sssd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Oct 31 11:04:57 UTC 2023 - Jan Engelhardt + +- Default config is unworkable, just stop installing it altogether + [boo#1216739] + ------------------------------------------------------------------- Thu Sep 7 12:07:10 UTC 2023 - Jan Engelhardt diff --git a/sssd.spec b/sssd.spec index 6ceab64..03302f0 100644 --- a/sssd.spec +++ b/sssd.spec @@ -382,8 +382,6 @@ perl -i -lpe 's{%_bindir/python\b}{%_bindir/python3}' src/tools/sss_obfuscate b="%buildroot" # Copy some defaults -mkdir -pv "$b/%_sysconfdir/sssd" "$b/%_sysconfdir/sssd/conf.d" -install -m600 src/examples/sssd-example.conf "$b/%_sysconfdir/sssd/sssd.conf" install -d "$b/%_unitdir" %if 0%{?suse_version} > 1500 install -d "$b/%_distconfdir/logrotate.d" @@ -420,7 +418,9 @@ done %post /sbin/ldconfig # migrate config variable krb5_kdcip to krb5_server (bnc#851048) -/bin/sed -i -e 's,^krb5_kdcip =,krb5_server =,g' %_sysconfdir/sssd/sssd.conf +if [ -f "%_sysconfdir/sssd/sssd.conf" ]; then + /bin/sed -i -e 's,^krb5_kdcip =,krb5_server =,g' "%_sysconfdir/sssd/sssd.conf" +fi %service_add_post sssd.service # install SSSD cifs-idmap plugin as an alternative @@ -574,8 +574,6 @@ done %attr(755,root,root) %dir %sssdstatedir/mc/ %attr(700,root,root) %dir %sssdstatedir/keytabs/ %attr(750,root,root) %dir %_localstatedir/log/%name/ -%dir %_sysconfdir/sssd/ -%config(noreplace) %_sysconfdir/sssd/sssd.conf %if 0%{?suse_version} > 1500 %_distconfdir/logrotate.d/sssd %_pam_vendordir/sssd-shadowutils @@ -583,7 +581,6 @@ done %config(noreplace) %_sysconfdir/logrotate.d/sssd %config(noreplace) %_pam_confdir/sssd-shadowutils %endif -%dir %_sysconfdir/sssd/conf.d %dir %_datadir/%name/ %_datadir/%name/cfg_rules.ini %_datadir/%name/sssd.api.conf